Index: trunk/psLib/test/astronomy/tst_psDB.c =================================================================== --- trunk/psLib/test/astronomy/tst_psDB.c (revision 3690) +++ (revision ) @@ -1,893 +1,0 @@ -/** @file tst_psDB.c - * - * -*- mode: C; c-basic-indent: 4; tab-width: 8; indent-tabs-mode: nil -*- - * vim: set cindent ts=8 sw=4 expandtab: - * - * @brief Contains the tests for psDB.[ch] - * - * - * @author Aaron Culliney, MHPCC - * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "psTest.h" -#include "pslib_strict.h" - -#define STR_1 "hello world!" -#define STR_2 "foobar" -#define S32_1 1974 -#define S32_2 -18 -#define F32_1 3.14159 -#define F32_2 3.33 -#define F64_1 2.7182818 -#define F64_2 1.23456789 - -static psDB *_init_psDB( void ); -static psMetadata *_get_CreateTableMetadata( void ); -static psMetadata *_get_RowMetadataValues(const char *val0, psS32 val1, psF32 val2, psF64 val3); -static psMetadata *_get_RowMetadata( - const char *key0, const char *comm0, const char *val0, - const char *key1, const char *comm1, psS32 val1, - const char *key2, const char *comm2, psF32 val2, - const char *key3, const char *comm3, psF64 val3); -static psMetadata *_get_row( void ); -static psMetadata *_get_where( void ); -static psMetadata *_get_update_values(const char *val0, psS32 val1, psF32 val2, psF64 val3); -static void _print_row( psMetadata *row ); - -//static psS32 TPDBCreate( void ); -//static psS32 TPDBDrop( void ); -static psS32 TPDBInit( void ); -static psS32 TPDBChange( void ); -static psS32 TPDBCreateTable( void ); -static psS32 TPDBDropTable( void ); -static psS32 TPDBSelectColumn( void ); -static psS32 TPDBSelectColumnNum( void ); -static psS32 TPDBSelectRows( void ); -static psS32 TPDBInsertOneRow( void ); -static psS32 TPDBInsertRows( void ); -static psS32 TPDBDumpRows( void ); -static psS32 TPDBDumpCols( void ); -static psS32 TPDBUpdateRows( void ); -static psS32 TPDBDeleteRows( void ); - -testDescription tests[] = { - {TPDBInit, -1, "dbInit", 0, false}, - {TPDBChange, -2, "dbChange", 0, false}, - {TPDBCreateTable, -3, "dbCreateTable", 0, false}, - {TPDBDropTable, -4, "dbDropTable", 0, false}, - {TPDBSelectColumn, -5, "dbSelectColumn", 0, false}, - {TPDBSelectColumnNum, -6, "dbSelectColumnNum", 0, false}, - {TPDBSelectRows, -7, "dbSelectRows", 0, false}, - {TPDBInsertOneRow, -8, "dbInsertOneRow", 0, false}, - {TPDBInsertRows, -9, "dbInsertRows", 0, false}, - {TPDBDumpRows, -10, "dbDumpRows", 0, false}, - {TPDBDumpCols, -11, "dbDumpCols", 0, false}, - {TPDBUpdateRows, -12, "dbUpdateRows", 0, false}, - {TPDBDeleteRows, -13, "dbDeleteRows", 0, false}, - //{TPDBCreate, -14, "dbCreate", 0, false}, - //{TPDBDrop, -15, "dbDrop", 0, false}, - {NULL} - }; - -static const char *host = "localhost"; -static const char *user = "test"; -static const char *passwd = ""; -static const char *dbname = "test"; - -// internal method to initialize DB -psDB *_init_psDB( void ) -{ - psDB *dbh = NULL; - - psLogMsg( __func__, PS_LOG_INFO, "initialize database connection...\n" ); - - dbh = psDBInit(host, user, passwd, dbname); - if (dbh == NULL) { - psError(PS_ERR_UNKNOWN, true, "could not initialize DB connection in %s!", __func__ ); - } - - return dbh; -} - -psMetadata *_get_CreateTableMetadata( void ) -{ - return _get_RowMetadata( - "key_string", "comment-string", "90000", // XXX value used to determine size of field ... - "key_s32", "comment-s32", 0, // NOTE: values unused here - "key_f32", "comment-f32", 0.0, - "key_f64", "comment-f64", 0.0); -} - -psMetadata *_get_RowMetadataValues(const char *val0, psS32 val1, psF32 val2, psF64 val3) -{ - return _get_RowMetadata( - "key_string", "comment-string", val0, - "key_s32", "comment-s32", val1, - "key_f32", "comment-f32", val2, - "key_f64", "comment-f64", val3); -} - -psMetadata *_get_RowMetadata( - const char *key0, const char *comm0, const char *val0, - const char *key1, const char *comm1, psS32 val1, - const char *key2, const char *comm2, psF32 val2, - const char *key3, const char *comm3, psF64 val3) -{ - psMetadata *md = NULL; - psMetadataItem *str=NULL, *s32=NULL, *f32=NULL, *f64=NULL; - - md = psMetadataAlloc(); - if (md == NULL) { - psError(PS_ERR_UNKNOWN, true, "could not create psMetadata in %s!", __func__ ); - return NULL; - } - if (key0 != NULL) { - str = psMetadataItemAllocStr(key0, comm0, val0); - } - s32 = psMetadataItemAllocS32(key1, comm1, val1); - f32 = psMetadataItemAllocF32(key2, comm2, val2); - f64 = psMetadataItemAllocF64(key3, comm3, val3); - if ( ((key0 != NULL) && (str == NULL)) || (s32 == NULL) || (f32 == NULL) || (f64 == NULL)) { - psError(PS_ERR_UNKNOWN, true, "could not create psMetadataItem(s) in %s!", __func__ ); - return NULL; - } - if ( ((key0 != NULL) && !psMetadataAddItem(md, str, 0, 0)) || !psMetadataAddItem(md, s32, 0, 0) || - !psMetadataAddItem(md, f32, 0, 0) || !psMetadataAddItem(md, f64, 0, 0)) { - psError(PS_ERR_UNKNOWN, true, "could not add psMetadataItem(s) to psMetadata in %s!", __func__ ); - return NULL; - } - - if (str != NULL) { - psFree(str); - } - psFree(s32); - psFree(f32); - psFree(f64); - - return md; -} - -psMetadata *_get_row( void ) -{ - return _get_RowMetadata( - "key_string", "comment-string", STR_1, - "key_s32", "comment-s32", S32_1, - "key_f32", "comment-f32", F32_1, - "key_f64", "comment-f64", F64_1); -} - -psMetadata *_get_where( void ) -{ - psMetadata *md = NULL; - psMetadataItem *s32=NULL; - - md = psMetadataAlloc(); - if (md == NULL) { - psError(PS_ERR_UNKNOWN, true, "could not create psMetadata in %s!", __func__ ); - return NULL; - } - s32 = psMetadataItemAllocS32("key_s32", "", S32_1); - if (s32 == NULL) { - psError(PS_ERR_UNKNOWN, true, "could not create psMetadataItem in %s!", __func__ ); - return NULL; - } - if (!psMetadataAddItem(md, s32, 0, 0)) { - psError(PS_ERR_UNKNOWN, true, "could not add psMetadataItem(s) to psMetadata in %s!", __func__ ); - return NULL; - } - - psFree(s32); - return md; -} - -psMetadata *_get_update_values(const char *val0, psS32 val1, psF32 val2, psF64 val3) -{ - return _get_RowMetadataValues(val0, val1, val2, val3); -} - -void _print_row( psMetadata *row ) -{ - psMetadataIterator *iter=NULL; - psMetadataItem *item=NULL; - - iter = psMetadataIteratorAlloc(row, 0, NULL); - while ((item = psMetadataGetAndIncrement(iter)) != NULL) { - if (item->type == PS_META_STR) { - psLogMsg( __func__, PS_LOG_INFO, "[%s]=[%s]\n", item->name, item->data.V ); - } else if (item->type == PS_META_S32) { - psLogMsg( __func__, PS_LOG_INFO, "[%s]=[%d]\n", item->name, item->data.S32 ); - } else if (item->type == PS_META_F32) { - psLogMsg( __func__, PS_LOG_INFO, "[%s]=[%g]\n", item->name, item->data.F32 ); - } else if (item->type == PS_META_F64) { - psLogMsg( __func__, PS_LOG_INFO, "[%s]=[%g]\n", item->name, item->data.F64 ); - } - } - - psFree(iter); -} - -psS32 main(psS32 argc, char* argv[]) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( ! runTestSuite( stderr, "psDB", tests, argc, argv ) ); -} - -// Testpoint #XXX, initialize/break-down MySQL connection. -psS32 TPDBInit( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - - psLogMsg( __func__, PS_LOG_INFO, "psDBInit/psDBCleanup shall initialize/cleanup database connection.\n" ); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, psDBChange shall change databases. -psS32 TPDBChange( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBChange shall change to a new test database.\n" ); - - failed = ! psDBChange(dbh, dbname); - - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, psDBCreateTable shall create tables in the test database ... -psS32 TPDBCreateTable( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table1"; - psMetadata *md = _get_CreateTableMetadata(); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBCreateTable shall create a new table in the new test database.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, psDBDropTable shall create tables in the test database ... -psS32 TPDBDropTable( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table2"; - psMetadata *row=NULL, *md = _get_CreateTableMetadata(); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBDropTable shall create/drop a new table in the new test database.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - failed = ! psDBDropTable(dbh, table); - - // insert should fail ... - psLogMsg( __func__, PS_LOG_INFO, "psDBDropTable: insert should fail here...\n" ); - row = _get_row(); - if (psDBInsertOneRow(dbh, table, row)) { - psLogMsg( __func__, PS_LOG_INFO, "oops, insert unexpectedly succeeded!\n" ); - failed = 1; - } - psFree(row); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBSelectColumn shall write/select a column from a test table ... -psS32 TPDBSelectColumn( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table3"; - psArray *ary = NULL; - psMetadata *row=NULL, *md = _get_CreateTableMetadata(); - char *ptr=NULL; - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBSelectColumn shall select data from a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - ary = psDBSelectColumn(dbh, table, "key_string", 0); - if (ary == NULL) { - failed = 1; - } else { - ptr = psArrayGet(ary, 0); - psLogMsg( __func__, PS_LOG_INFO, "psDBSelectColumn: [%s]\n", ptr ); - - ptr = psArrayGet(ary, 1); - psLogMsg( __func__, PS_LOG_INFO, "psDBSelectColumn: [%s]\n", ptr ); - - ptr = psArrayGet(ary, 2); - psLogMsg( __func__, PS_LOG_INFO, "psDBSelectColumn: [%s]\n", ptr ); - - if (strcmp(ptr, STR_1)) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected string output!\n" ); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected string output.\n" ); - } - - psFree(ary); - } - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBSelectColumnNum shall write/select a column from a test table ... -psS32 TPDBSelectColumnNum( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table4"; - psVector *vec = NULL; - psMetadata *row=NULL, *md = _get_CreateTableMetadata(); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBSelectColumnNum shall select data from a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - vec = psDBSelectColumnNum(dbh, table, "key_s32", PS_TYPE_S32, 0); - if (vec == NULL) { - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "str=[%d]\n", (vec->data.S32)[0] ); - psLogMsg( __func__, PS_LOG_INFO, "str=[%d]\n", (vec->data.S32)[1] ); - psLogMsg( __func__, PS_LOG_INFO, "str=[%d]\n", (vec->data.S32)[2] ); - if ((vec->data.S32)[2] != S32_1) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected S32 output!\n" ); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected S32 output.\n" ); - } - psFree(vec); - } - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBSelectRows shall write/select data from a test table ... -psS32 TPDBSelectRows( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table5"; - psArray *ary = NULL; - psMetadata *where=NULL, *row=NULL, *md = _get_CreateTableMetadata(); - psMetadataItem *item = NULL; - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBSelectRows shall select data from a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - failed = ! psDBInsertOneRow(dbh, table, row); - psFree(row); - - if (!failed) { - where = _get_where(); - ary = psDBSelectRows(dbh, table, /*NULL*/where, 0); - psFree(where); - if (ary == NULL) { - failed = 1; - } else { - _print_row((psMetadata*)psArrayGet(ary, 0)); - _print_row((psMetadata*)psArrayGet(ary, 1)); - row = (psMetadata*)psArrayGet(ary, 2); - _print_row(row); - - item = psMetadataLookup(row, "key_s32"); - if (item == NULL) { - psLogMsg( __func__, PS_LOG_INFO, "oops, key_s32 not found!\n" ); - failed = 1; - } else if (item->data.S32 != S32_1) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected output (%d vs %d)!\n", - item->data.S32,S32_1); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected output.\n" ); - } - - psFree(ary); - } - } - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBInsertOneRow shall write a row of data into a test table ... -psS32 TPDBInsertOneRow( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table6"; - psMetadata *row=NULL, *md = _get_CreateTableMetadata(); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBInsertOneRow shall insert a row into a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - row = _get_row(); - failed = ! psDBInsertOneRow(dbh, table, row); - psFree(row); - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBInsertRows shall write rows of data into a test table ... -psS32 TPDBInsertRows( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table7"; - psArray *rowSet = NULL; - psMetadata *row=NULL, *md = _get_CreateTableMetadata(); - psMetadataItem *item=NULL; - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBInsertRows shall insert rows into a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - rowSet = psArrayAlloc(3); - rowSet->n = 0; - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - failed = ! psDBInsertRows(dbh, table, rowSet); - psFree(rowSet); - - // extra checks ... - rowSet = psDBDumpRows(dbh, table); - if (rowSet == NULL) { - failed = 1; - } else { - _print_row((psMetadata*)psArrayGet(rowSet, 0)); - _print_row((psMetadata*)psArrayGet(rowSet, 1)); - row = (psMetadata*)psArrayGet(rowSet, 2); - _print_row(row); - - item = psMetadataLookup(row, "key_s32"); - if ((item == NULL) || (item->data.S32 != S32_1)) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected output!\n" ); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected output.\n" ); - } - - psFree(rowSet); - } - - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBDumpRows shall dump all rows from a test table ... -psS32 TPDBDumpRows( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table8"; - psArray *ary = NULL; - psMetadata *row=NULL, *md = _get_CreateTableMetadata(); - psMetadataItem *item=NULL; - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBDumpRows shall dump all rows from a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - psDBInsertOneRow(dbh, table, row); - psFree(row); - - row = _get_row(); - failed = ! psDBInsertOneRow(dbh, table, row); - psFree(row); - - if (!failed) { - ary = psDBDumpRows(dbh, table); - if (ary == NULL) { - failed = 1; - } else { - - _print_row((psMetadata*)psArrayGet(ary, 0)); - _print_row((psMetadata*)psArrayGet(ary, 1)); - row = (psMetadata*)psArrayGet(ary, 2); - _print_row(row); - - item = psMetadataLookup(row, "key_s32"); - if ((item == NULL) || (item->data.S32 != S32_1)) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected output!\n" ); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected output.\n" ); - } - - psFree(ary); - } - } - - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBDumpCols shall dump all cols from a test table ... -psS32 TPDBDumpCols( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table9"; - psMetadata *meta=NULL, *md = _get_CreateTableMetadata(); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBDumpCols shall dump all cols from a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - meta = psDBDumpCols(dbh, table); - if (meta == NULL) { - failed = 1; - } else { - _print_row(meta); - psFree(meta); - } - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBUpdateRows shall update rows in a test table ... -psS32 TPDBUpdateRows( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table10"; - psArray *ary=NULL, *rowSet=NULL; - psMetadata *row=NULL, *where=NULL, *updates=NULL, *md = _get_CreateTableMetadata(); - psMetadataItem *item=NULL; - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBUpdateRows shall update rows in a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - rowSet = psArrayAlloc(3); - rowSet->n = 0; - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - failed = ! psDBInsertRows(dbh, table, rowSet); - if (!failed) { - where = _get_where(); - updates = _get_update_values(STR_2, S32_2, F32_2, F64_2); - failed = (psDBUpdateRows(dbh, table, where, updates) < 0); - - ary = psDBDumpRows(dbh, table); - if (ary == NULL) { - failed = 1; - } else { - - _print_row((psMetadata*)psArrayGet(ary, 0)); - _print_row((psMetadata*)psArrayGet(ary, 1)); - row = (psMetadata*)psArrayGet(ary, 2); - _print_row(row); - - item = psMetadataLookup(row, "key_s32"); - if ((item == NULL) || (item->data.S32 != S32_2)) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not find expected output!\n" ); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected output.\n" ); - } - - psFree(ary); - } - - psFree(updates); - psFree(where); - } - psFree(rowSet); - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, TPDBDeleteRows shall update rows in a test table ... -psS32 TPDBDeleteRows( void ) -{ - psS32 failed = 0; - psDB *dbh = NULL; - const char* table = "table11"; - psArray *ary=NULL, *rowSet=NULL; - psMetadata *where=NULL, *row=NULL, *md = _get_CreateTableMetadata(); - - dbh = _init_psDB(); - if (dbh == NULL) { - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psDBDeleteRows shall delete rows from a test table.\n" ); - - failed = ! psDBCreateTable(dbh, table, md); - if (!failed) { - rowSet = psArrayAlloc(3); - rowSet->n = 0; - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - row = _get_row(); - psArrayAdd(rowSet, 0, row); - psFree(row); - - failed = ! psDBInsertRows(dbh, table, rowSet); - if (!failed) { - where = _get_where(); - failed = (psDBDeleteRows(dbh, table, where) < 0); - - ary = psDBDumpRows(dbh, table); - if (ary == NULL) { - failed = 1; - } else { - if (ary->n > 0) { - psLogMsg( __func__, PS_LOG_INFO, "oops, did not delete stuff!\n" ); - failed = 1; - } else { - psLogMsg( __func__, PS_LOG_INFO, "found expected empty table.\n" ); - } - - psFree(ary); - } - - psFree(where); - } - psFree(rowSet); - psDBDropTable(dbh, table); - } - - psFree(md); - psDBCleanup(dbh); - - return failed; -} - -// Testpoint #XXX, psDBCreate shall create a new test database. -//psS32 TPDBCreate( void ) -//{ -// const char *test_db = "ps_test_db"; -// psS32 failed = 0; -// psDB *dbh = NULL; -// -// dbh = _init_psDB(); -// if (dbh == NULL) { -// return 1; -// } -// -// psLogMsg( __func__, PS_LOG_INFO, "psDBCreate shall create new new test database.\n" ); -// -// failed = ! psDBCreate(dbh, test_db); -// if (!failed) { -// psDBDrop(dbh, test_db); -// } -// -// psDBCleanup(dbh); -// -// return failed; -//} - -// Testpoint #XXX, psDBDrop shall create a new test database. -//psS32 TPDBDrop( void ) -//{ -// const char *test_db = "ps_test_db"; -// psS32 failed = 0; -// psDB *dbh = NULL; -// -// dbh = _init_psDB(); -// if (dbh == NULL) { -// return 1; -// } -// -// psLogMsg( __func__, PS_LOG_INFO, "psDBDrop shall create/drop a new new test database.\n" ); -// -// failed = psDBCreate(dbh, test_db); -// if (!failed) { -// failed = ! psDBDrop(dbh, test_db); -// } -// -// psDBCleanup(dbh); -// -// return failed; -//} - Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3690) +++ (revision ) @@ -1,172 +1,0 @@ -/** @file tst_psMetadataIO.c - * - * @brief Test driver for psMetadataIO functions - * - * This test driver contains the following tests for psMetadata: - * Test A - Read config file with overwrite set true - * Test B - Read config file with overwrite set false - * Test C - Read config file without auto-allocation of metadata - * Test D - Attempt to use null fileName argument - * Test E - Attempt to open nonexistant file - * Test F - Free psMetadata - * - * @author Ross Harman, MHPCC - * @author Robert DeSonia, MHPCC - * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem, char *spaces); -static void printMetadata(psMetadata *metadata); -static void printMetadataList(psList *metadataItemList, char* spaces); -static void printMetadataTable(psHash *mdTable); - -static void printMetadata(psMetadata *metadata) -{ - printf("Contents of metadata list:\n"); - printMetadataList(metadata->list, " "); - printf("\nContents of metadata table:\n"); - printMetadataTable(metadata->table); -} - -static void printMetadataList(psList *metadataItemList, char* spaces) -{ - psMetadataItem *entryChild = NULL; - - psListIterator* iter = psListIteratorAlloc(metadataItemList, PS_LIST_HEAD, true); - - while ( (entryChild=psListGetAndIncrement(iter)) != NULL) { - printMetadataItem(entryChild, spaces); - } - - psFree(iter); -} - -static void printMetadataTable(psHash *mdTable) -{ - psS32 i; - psHashBucket* ptr = NULL; - for(i=0; inbucket; i++) { - ptr = mdTable->buckets[i]; - while (ptr != NULL) { - printMetadataItem(ptr->data, " "); - ptr = ptr->next; - } - } -} - -static void printMetadataItem(psMetadataItem *metadataItem, char *spaces) -{ - char* vecStr; - - printf("%sKey Name: %8s ", spaces, metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_VEC: - vecStr = (char*)psVectorToString((psVector*)metadataItem->data.V, 15); - printf("Key Value: %15s ", vecStr); - psFree(vecStr); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: 0x%08x ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); - - if(metadataItem->data.V && metadataItem->type==PS_META_MULTI) { - printMetadataList(metadataItem->data.V, " "); - } -} - - -psS32 main(psS32 argc, char* argv[]) -{ - // Test A - Read config file with overwrite set true - printPositiveTestHeader(stdout, "psMetadata", "Test A - Read config file with overwrite set true"); - psMetadata *metadata1 = NULL; - psU32 failedLines1 = 0; - metadata1 = psMetadataParseConfig(metadata1, &failedLines1, "test.config", true); - printf("Failed lines: %d Expected: 6\n", failedLines1); - printMetadata(metadata1); - printFooter(stdout, "psMetadata", "Test A - Read config file with overwrite set true", true); - - - // Test B - Read config file with overwrite set false - printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false"); - psMetadata *metadata2 = NULL; - psS32 failedLines2 = 0; - metadata2 = psMetadataParseConfig(metadata2, &failedLines2, "test.config", false); - printf("Failed lines: %d Expected: 7 ", failedLines2); - printMetadata(metadata2); - printFooter(stdout, "psMetadata", "Test B - Read config file with overwrite set false", true); - - - // Test C - Read config file without auto-allocation of metadata - printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata"); - psMetadata *metadata3 = psMetadataAlloc(); - psS32 failedLines3 = 0; - metadata3 = psMetadataParseConfig(metadata3, &failedLines3, "test.config", true); - printf("Failed lines: %d Expected: 6 ", failedLines3); - printMetadata(metadata3); - printFooter(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata", true); - - - // Test D - Attempt to use null fileName argument - printNegativeTestHeader(stdout,"psMetadataIO", "Test D - Attempt to use null fileName argument", - "Null failedLines not allowed", 0); - psMetadataParseConfig(metadata1, &failedLines1, NULL, true); - printFooter(stdout, "psMetadata", "Test D - Attempt to use null fileName argument", true); - - - // Test E - Attempt to open nonexistant file - printNegativeTestHeader(stdout,"psMetadataIO", "Test E - Attempt to open nonexistant file", - "Error opening file", 0); - psMetadataParseConfig(metadata1, &failedLines1, "abcedfg", true); - printFooter(stdout, "psMetadata", "Test E - Attempt to open nonexistant file", true); - - - // Test F - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test F - Free psMetadata"); - psFree(metadata1); - psFree(metadata2); - psFree(metadata3); - if(psMemCheckLeaks(0, NULL, stdout,false)) { - psError(PS_ERR_UNKNOWN,true,"Memory leak detected"); - return 10; - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - } - printFooter(stdout, "psMetadata", "Test F - Free psMetadata", true); - - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3690) +++ (revision ) @@ -1,263 +1,0 @@ -/** @file tst_psMetadata_01.c -* -* @brief Test driver for psMetadata functions -* -* This test driver contains the following tests for psMetadata: -* Test A - Read 1st hdr from simple FITS file -* Test B - Read 2nd hdr from complex FITS file -* Test C - Read named hdr from complex FITS file -* Test D - Remove items with same name from all metadata -* Test E - Attempt to use null file descriptor -* Test F - Attempt to open nonexistant file -* Test G - Attempt to use two null inputs -* Test H - Attempt to use bad extNum -* Test I - Attempt to use bad extNameTest -* Test J - Read named hdr w/ invalid extnum -* Test K - Free psMetadata -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -* -*/ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem, char *spaces); -static void printMetadata(psMetadata *metadata); -static void printMetadataList(psList *metadataItemList, char* spaces); -static void printMetadataTable(psHash *mdTable); - -static void printMetadata(psMetadata *metadata) -{ - printf("Contents of metadata list:\n"); - printMetadataList(metadata->list, " "); - printf("\nContents of metadata table:\n"); - printMetadataTable(metadata->table); -} - -static void printMetadataList(psList *metadataItemList, char* spaces) -{ - psMetadataItem *entryChild = NULL; - - psListIterator* iter = psListIteratorAlloc(metadataItemList, PS_LIST_HEAD, true); - - while ( (entryChild=psListGetAndIncrement(iter)) != NULL) { - printMetadataItem(entryChild, spaces); - } - - psFree(iter); - -} - -static void printMetadataTable(psHash *mdTable) -{ - psS32 i; - psHashBucket* ptr = NULL; - for(i=0; inbucket; i++) { - ptr = mdTable->buckets[i]; - while (ptr != NULL) { - printMetadataItem(ptr->data, " "); - ptr = ptr->next; - } - } -} - -static void printMetadataItem(psMetadataItem *metadataItem, char *spaces) -{ - printf("%sKey Name: %8s ", spaces, metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: %d ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); - - if(metadataItem->data.V && metadataItem->type==PS_META_MULTI) { - printMetadataList(metadataItem->data.V, " "); - } -} - - -psS32 main(psS32 argc, char* argv[]) -{ - psMetadata *metadata1 = NULL; - psMetadata *metadata2 = NULL; - psMetadata *metadata3 = NULL; - - - // Test A - Read 1st hdr from simple FITS file - - /* Header contents for header_1.fits: - - SIMPLE = T / file does conform to FITS standard - BITPIX = 8 / number of bits per data pixel - NAXIS = 0 / number of data axes - HISTORY File modified by user 'harman' with fv on 2004-08-04T11:11:18 - END - */ - printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file"); - metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits"); - printMetadata(metadata1); - printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true); - - printf("ID=%d\n",(int)psMemGetId()); - - // Test B - Read 2nd hdr from complex FITS file - - /* Header contents for header_2.fits: - - SIMPLE = T / file does conform to FITS standard - BITPIX = -64 / number of bits per data pixel - NAXIS = 1 / number of data axes - NAXIS1 = 64 / length of data axis 1 - EXTEND = T / FITS dataset may contain extensions - COMMENT FITS (Flexible Image Transport System) format is defined in 'Astronomy - COMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H - END - - - XTENSION= 'IMAGE ' / IMAGE extension - BITPIX = -64 / number of bits per data pixel - NAXIS = 1 / number of data axes - NAXIS1 = 64 / length of data axis 1 - PCOUNT = 0 / required keyword; must = 0 - GCOUNT = 1 / required keyword; must = 1 - BITPIX = -64 / number of bits per data pixel - EXTNAME = 'MY_DATA_1' - HISTORY File modified by user 'harman' with fv on 2004-08-04T13:14:45 - HISTORY File modified by user 'harman' with fv on 2004-08-04T13:15:29 - HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:18 - HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:46 - END - - - XTENSION= 'IMAGE ' / IMAGE extension - BITPIX = -64 / number of bits per data pixel - NAXIS = 1 / number of data axes - NAXIS1 = 64 / length of data axis 1 - PCOUNT = 0 / required keyword; must = 0 - GCOUNT = 1 / required keyword; must = 1 - EXTNAME = 'MY_DATA_2' - HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:12 - HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:52 - END - - */ - printPositiveTestHeader(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file"); - metadata2 = psMetadataReadHeader(metadata2, NULL, 2, "header_2.fits"); - printMetadata(metadata2); - printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true); - - printf("ID=%d\n",(int)psMemGetId()); - - // Test C - Read named hdr from complex FITS file - printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file"); - metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", -1, "header_2.fits"); - printMetadata(metadata3); - printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true); - - - // Test D - Remove items with same name from all metadata - printPositiveTestHeader(stdout, "psMetadata", "Test D - Remove items with same name from all metadata"); - printf("Removed HISTORY from all metadata from prior test. Resulting metadata:\n\n"); - psMetadataRemove(metadata3, 0, "HISTORY"); - printMetadata(metadata3); - printFooter(stdout, "psMetadata", "Test D - Remove items with same name from all metadata", true); - - - // Test E - Attempt to use null file filename - printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null filename", - "Null fileName not allowed", 0); - psMetadataReadHeader(NULL, NULL, 1, NULL); - printFooter(stdout, "psMetadata", "Test E - Attempt to use null filename", true); - - - // Test F - Attempt to open nonexistant file - printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to open nonexistant file", - "FITS error while opening file: missing.dat...Couldn't close FITS file...", 0); - psMetadataReadHeader(NULL, NULL, 1, "missing.dat"); - printFooter(stdout, "psMetadata", "Test F - Attempt to open nonexistant file", true); - - - // Test G - Attempt to use two null inputs - printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use two null inputs", - "Null extName and extNum = 0 not allowed", 0); - psMetadataReadHeader(NULL, NULL, 0, "header_2.fits"); - printFooter(stdout, "psMetadata", "Test G - Attempt to use two null inputs", true); - - - // Test H - Attempt to use bad extNum - printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum", - "FITS error while locating header 22: tried to move past end of file", 0); - metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits"); - if (metadata1 != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null when invalid ext given."); - return 10; - } - printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true); - - - // Test I - Attempt to use bad extName - printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName", - "FITS error while locating header AARGH: illegal HDU number", 0); - metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits"); - if (metadata1 != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null invalid extname give."); - return 11; - } - printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true); - - - // Test J - Read named hdr w/ invalid extnum - printNegativeTestHeader(stdout, "psMetadata", "Test J - Read named hdr w/ invalid extnum", - "If extName specified, extNum should be -1.", 0); - metadata1 = psMetadataReadHeader(NULL, NULL, 0, "header_2.fits"); - if (metadata1 != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum"); - return 12; - } - printFooter(stdout, "psMetadata", "Test J - Read named hdr w/ invalid extnum", true); - - - // Test K - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test K - Free psMetadata"); - psFree(metadata1); - psFree(metadata2); - psFree(metadata3); - if(psMemCheckLeaks(0, NULL, stdout,false)) { - psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - } - printFooter(stdout, "psMetadata", "Test K - Free psMetadata", true); - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3690) +++ (revision ) @@ -1,145 +1,0 @@ -/** @file tst_psMetadata_02.c - * - * @brief Test driver for psMetadata functions - * - * This test driver contains the following tests for psMetadata: - * Test A - Allocate metadata items - * Test B - Attempt to create metadata item with null name - * Test C - Attempt to create metadata item with invalid type - * Test D - Allocate metadata - * Test E - Attempt to add metadata item to null metadata - * Test F - Attempt to add null metadata item to metadata - * Test G - Free psMetadata - * - * @author Ross Harman, MHPCC - * @author Robert DeSonia, MHPCC - * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem) -{ - printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: %d ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); -} - - -psS32 main( psS32 argc, char* argv[] ) -{ - psMetadataItem *item1 = NULL; - psMetadata *metadata = NULL; - psMetadataItem *item2 = NULL; - psMetadataItem *item3 = NULL; - psMetadataItem *item4 = NULL; - psMetadataItem *item5 = NULL; - psMetadataItem *badItem = NULL; - - - // Test A - Allocate metadata items - printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 111); - item3 = psMetadataItemAlloc("myItem3", PS_META_F32, "I am a single precision floating point", 222.222); - item4 = psMetadataItemAlloc("myItem4", PS_META_F64, "I am a double precision floating point", 333.333); - item5 = psMetadataItemAlloc("myItem5", PS_META_STR, "I am a string", "HELLO WORLD"); - printMetadataItem(item1); - printMetadataItem(item2); - printMetadataItem(item3); - printMetadataItem(item4); - printMetadataItem(item5); - printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true); - - - // Test B - Attempt to create metadata item with null name - printNegativeTestHeader(stdout,"psMetadata", "Test B - Attempt to create metadata item with null name", - "Null value for name not allowed", 0); - psLogMsg(__func__,PS_LOG_INFO,"Following should produce error for null name."); - badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD"); - if (badItem != NULL) { - psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item."); - return 10; - } - printFooter(stdout, "psMetadata", "Test B - Attempt to create metadata item with null name", true); - - - // Test C - Attempt to create metadata item with invalid type - printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type", - "Invalid psMetadataType: 6", 0); - badItem = psMetadataItemAlloc("badItem", -1, "I am bad", "Bad comment"); - printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true); - - - // Test D - Allocate metadata - printPositiveTestHeader(stdout, "psMetadata", "Test D - Allocate metadata"); - metadata = psMetadataAlloc(); - printFooter(stdout, "psMetadata", "Test D - Allocate metadata", true); - - - // Test E - Attempt add metadata item to null metadata - printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to add metadata item to null metadata", - "Null metadata collection not allowed", 0); - psMetadataAddItem(NULL, item1, PS_LIST_HEAD, PS_META_DEFAULT); - printFooter(stdout, "psMetadata", "Test E - Attempt to add metadata item to null metadata", true); - - - // Test F - Attempt add null metadata item to metadata - printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to add null metadata item to metadata", - "Null metadata item not allowed", 0); - psMetadataAddItem(metadata, NULL, PS_LIST_HEAD, PS_META_DEFAULT); - printFooter(stdout, "psMetadata", "Test F - Attempt to add null metadata item to metadata", true); - - - // Test G - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test G - Free psMetadata"); - psFree(item1); - psFree(item2); - psFree(item3); - psFree(item4); - psFree(item5); - psFree(badItem); - psFree(metadata); - if(psMemCheckLeaks(0, NULL, stdout,false) ) { - psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); - return 10; - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - } - printFooter(stdout, "psMetadata", "Test G - Free psMetadata", true); - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3690) +++ (revision ) @@ -1,241 +1,0 @@ -/** @file tst_psMetadata_03.c -* -* @brief Test driver for psMetadata functions -* -* This test driver contains the following tests for psMetadata: -* Test A - Allocate metadata and items -* Test B - Remove items from metadata by name -* Test C - Remove items from metadata by index -* Test D - Attempt to use null metadata -* Test E - Attempt to remove non-existant metadata item by name -* Test F - Attempt to remove non-existant metadata item by index -* Test G - Attempt to add item to an invalid metadata structure -* Test H - Attempt to add item to an invalid metadata structure -* Test I - Attempt to add item with a null name -* Test J - Attempt to add item to an invalid metadata structure -* Test K - Free psMetadata -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -* -*/ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem) -{ - printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: %d ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); -} - - -psS32 main( psS32 argc, char* argv[] ) -{ - psMetadataItem *item1 = NULL; - psMetadataItem *item2 = NULL; - psMetadataItem *item3 = NULL; - psMetadataItem *item4 = NULL; - psMetadataItem *errItem = NULL; - psMetadata *metadata = NULL; - psMetadata *errMetadata = NULL; - psHash *mdTable = NULL; - psList *mdList = NULL; - char *errName = NULL; - - // Test A - Allocate metadata and items - printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); - metadata = psMetadataAlloc(); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55); - item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); - item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); - errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99); - printMetadataItem(item1); - printMetadataItem(item2); - printMetadataItem(item3); - printMetadataItem(item4); - printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true); - - - // Test B - Remove items from metadata by name - printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name"); - if(!psMetadataAddItem(metadata, item1, PS_LIST_HEAD, PS_META_DEFAULT)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name."); - return 10; - } - if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_META_S32, "I am S32 integer",77)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name."); - return 11; - } - if (!psMetadataRemove(metadata, 0, "myItem1")) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name."); - return 12; - } - if (!psMetadataRemove(metadata, 0, "myItem2")) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name."); - return 13; - } - printFooter(stdout, "psMetadata", "Test B - Remove items from metadata by name", true); - - - // Test C - Remove items from metadata by index - printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index"); - if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD, PS_META_DEFAULT) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index."); - return 14; - } - if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_META_S32, "I am S32 integer",88) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index."); - return 15; - } - if( ! psMetadataRemove(metadata, 0, NULL) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index."); - return 16; - } - if ( ! psMetadataRemove(metadata, 0, NULL ) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index."); - return 17; - } - printFooter(stdout, "psMetadata", "Test C - Remove items from metadata by index", true); - - - // Test D - Attempt to use null metadata - printNegativeTestHeader(stdout,"psMetadata", "Test D - Attempt to use null metadata", - "Null metadata collection not allowed", 0); - if ( psMetadataRemove(NULL, 0, NULL) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing from null metadata."); - return 18; - } - printFooter(stdout, "psMetadata", "Test D - Attempt to use null metadata", true); - - - // Test E - Attempt to remove non-existant metadata item by name - printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to remove non-existant metadata item by name", - "Couldn't find metadata item. Name: AARGH", 0); - if( psMetadataRemove(metadata, 0, "AARGH") ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item."); - return 19; - } - printFooter(stdout, "psMetadata", "Test E - Attempt to remove non-existant metadata item by name", true); - - - // Test F - Attempt to remove non-existant metadata item by index - printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to remove non-existant metadata item by index", - "Couldn't find metadata item in list. Index: 22", 0); - if( psMetadataRemove(metadata, 22, NULL) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item."); - return 20; - } - printFooter(stdout, "psMetadata", "Test E - Attempt to remove non-existant metadata item by index", true); - - - // Test G - Attempt to add item to an invalid metadata structure - printNegativeTestHeader(stdout,"psMetadata","Test G - Attempt to add item to metadata w/o hash table", - "Couldn't add item to invalid metadata structure.",0); - errMetadata = psMetadataAlloc(); - mdTable = errMetadata->table; - errMetadata->table = NULL; - if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD, PS_META_DEFAULT) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); - return 21; - } - if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table."); - return 31; - } - errMetadata->table = mdTable; - printFooter(stdout,"psMetadata","Test G - Attempt to add item to invalid metadata w/o hash table", true); - - // Test H - Attempt to add item to an invalid metadata structure - printNegativeTestHeader(stdout,"psMetadata","Test H - Attempt to add item to metadata w/o link list", - "Couldn't add item to invalid metadata structure.",0); - mdList = errMetadata->list; - errMetadata->list = NULL; - if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD, PS_META_DEFAULT) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list."); - return 22; - } - if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list."); - return 32; - } - errMetadata->list = mdList; - printFooter(stdout,"psMetadata","Test H - Attempt to add item to invalid metadata w/o link list", true); - - // Test I - Attempt to add item with a null name - printNegativeTestHeader(stdout,"psMetadata","Test I - Attempt to add item with null name", - "Couldn't add item with null name.",0); - errName = errItem->name; - errItem->name = NULL; - if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD, PS_META_DEFAULT) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false with item with null name."); - return 23; - } - errItem->name = errName; - printFooter(stdout,"psMetadata","Test I - Attempt to add item with null name", true); - - // Test J - Attempt to add item to an invalid metadata structure - printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o hash table", - "Couldn't add item to invalid metadata structure.",0); - mdTable = errMetadata->table; - errMetadata->table = NULL; - if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); - return 24; - } - errMetadata->table = mdTable; - printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o hash table", true); - - // Test K - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test K - Free psMetadata"); - psFree(metadata); - psFree(item1); - psFree(item2); - psFree(item3); - psFree(item4); - psFree(errItem); - psFree(errMetadata); - if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { - psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); - return 25; - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - } - printFooter(stdout, "psMetadata", "Test K - Free psMetadata", true); - - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3690) +++ (revision ) @@ -1,292 +1,0 @@ - -/** @file tst_psMetadata_04.c -* -* @brief Test driver for psMetadata functions -* -* This test driver contains the following tests for psMetadata: -* Test A - Allocate metadata and items -* Test B - Lookup metadata item by name -* Test C - Attempt to use null metadata -* Test D - Attempt to use null key -* Test E - Attempt to lookup non-existant metadata item -* Test F - Lookup metadata item by index -* Test G - Lookup metadata item and return psS32 value -* Test H - Lookup metadata item and return psF64 value -* Test I - Lookup metadata item and return psVector pointer -* Test J - Attempt to use null metadata -* Test K - Attempt to get non-existant metadata item -* Test L - Attempt to look up with an invalid metadata object -* Test M - Attempt get item with an invalid metadata object -* Test N - Attempt get value of non-existant metadata item -* Test O - Free psMetadata -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -* -*/ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem) -{ - printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: %d ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); -} - - -psS32 main( psS32 argc, char* argv[] ) -{ - psBool status = 0; - psMetadataItem *item1 = NULL; - psMetadataItem *item2 = NULL; - psMetadataItem *item3 = NULL; - psMetadataItem *item4 = NULL; - psMetadataItem *item5 = NULL; - psMetadataItem *item6 = NULL; - psMetadataItem *item = NULL; - psMetadata *metadata = NULL; - psHash* tmpTable = NULL; - psList* tmpList = NULL; - - - // Test A - Allocate metadata and items - printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); - psVector *vec = psVectorAlloc(5, PS_TYPE_S32); - metadata = psMetadataAlloc(); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55); - item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); - item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); - item5 = psMetadataItemAlloc("myItem5", PS_META_F64, "I am a double", 3.14); - item6 = psMetadataItemAlloc("myItem6", PS_META_VEC, "I am a vector", vec); - printMetadataItem(item1); - printMetadataItem(item2); - printMetadataItem(item3); - printMetadataItem(item4); - printMetadataItem(item5); - psMetadataAddItem(metadata, item1, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item2, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item3, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item4, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item5, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item6, PS_LIST_HEAD, PS_META_DEFAULT); - psFree(vec); - printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true); - - - // Test B - Lookup metadata item by name - printPositiveTestHeader(stdout, "psMetadata", "Test B - Lookup metadata item by name"); - item = psMetadataLookup(metadata, "myItem2"); - printf("Found item named %s\n", item->name); - if(item == NULL) { - printf("ERROR: Item should not be null\n"); - return 10; - } - printFooter(stdout, "psMetadata", "Test B - Lookup metadata item by name", true); - - - // Test C - Attempt to use null metadata - printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to use null metadata", - "Null metadata collection not allowed", 0); - if ( psMetadataLookup(NULL, "myItem2") != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return NULL with null metadata."); - return 11; - } - printFooter(stdout, "psMetadata", "Test C - Attempt to use null metadata", true); - - - // Test D - Attempt to use null key - printNegativeTestHeader(stdout,"psMetadata", "Test D - Attempt to use null key", - "Null key name not allowed", 0); - if ( psMetadataLookup(metadata, NULL) != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with null key."); - return 12; - } - printFooter(stdout, "psMetadata", "Test D - Attempt to use null key", true); - - - // Test E - Attempt to lookup non-existant metadata item - printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to lookup non-existant metadata item", - "Couldn't find metadata item. Name: AARGH", 0); - if ( psMetadataLookup(metadata, "AARGH") != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with a non-existant item."); - return 13; - } - printFooter(stdout, "psMetadata", "Test E - Attempt to lookup non-existant metadata item", true); - - - // Test F - Lookup metadata item by index - printPositiveTestHeader(stdout, "psMetadata", "Test F - Lookup metadata item by index"); - item = psMetadataGet(metadata, 0); - printf("Found item named %s\n", item->name); - if(item == NULL) { - printf("ERROR: Item should not be null\n"); - return 14; - } - printFooter(stdout, "psMetadata", "Test F - Lookup metadata item by index", true); - - // Test G - Lookup metadata item and return psS32 value - printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value"); - psS32 valueS32 = 0; - valueS32 = psMetadataLookupS32(&status, metadata, "myItem2"); - if(valueS32 != 55) { - printf("ERROR: Bad value, %d, Expected 55\n", valueS32); - return 15; - } else if(! status) { - printf("ERROR: Bad status, %d\n", status); - return 15; - } - printFooter(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value", true); - - // Test H - Lookup metadata item and return psF64 value - printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value"); - psF64 valueF64 = 0.0; - valueF64 = psMetadataLookupF64(&status, metadata, "myItem5"); - if(fabs(valueF64-3.14) > FLT_EPSILON) { - printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64); - return 16; - } else if(! status) { - printf("ERROR: Bad status, %d\n", status); - return 16; - } - printFooter(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value", true); - - // Test I - Lookup metadata item and return psVector pointer - printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer"); - psVector *valueVec = NULL; - valueVec = psMetadataLookupPtr(&status, metadata, "myItem6"); - if(valueVec != vec) { - printf("ERROR: Bad vector pointer\n"); - return 17; - } else if(! status) { - printf("ERROR: Bad status, %d\n", status); - return 17; - } - printFooter(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer", true); - - - // Test J - Attempt to use null metadata - printNegativeTestHeader(stdout,"psMetadata", "Test J - Attempt to use null metadata", - "Null metadata collection not allowed", 0); - item = psMetadataGet(NULL, 0); - if ( item != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure"); - return 18; - } - printFooter(stdout, "psMetadata", "Test J - Attempt to use null metadata", true); - - - // Test K - Attempt to get non-existant metadata item - printNegativeTestHeader(stdout,"psMetadata", "Test K - Attempt to get non-existant metadata item", - "Couldn't find metadata item with given index. Index: 22", 0); - if ( psMetadataGet(metadata, 22) != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item"); - return 19; - } - printFooter(stdout, "psMetadata", "Test K - Attempt to get non-existant metadata item", true); - - // Test L - Attempt to look up with an invalid metadata object - printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata", - "Lookup item with invalid metadata object.", 0 ); - tmpTable = metadata->table; - metadata->table = NULL; - if ( psMetadataLookup(metadata,"myItem2") != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object"); - return 20; - } - metadata->table = tmpTable; - printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true); - - // Test M - Attempt get item with an invalid metadata object - printNegativeTestHeader(stdout,"psMetadata","Test M - Attempt to get item with an invalid metadata", - "Get item with invalid metadata object.", 0 ); - tmpList = metadata->list; - metadata->list = NULL; - if ( psMetadataGet(metadata,0) != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object"); - return 21; - } - metadata->list = tmpList; - printFooter(stdout, "psMetadata","Test M - Attempt to get item with invalid metadata object",true); - - // Test N - Attempt get psS32 value of non-existant metadata item - printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item"); - valueS32 = psMetadataLookupS32(&status, metadata, "myItem22"); - if(status) { - printf("ERROR: Bad status, %d, \n", status); - return 22; - } - printFooter(stdout, "psMetadata","Test N - Attempt get psS32 value of non-existant metadata item",true); - - // Test O - Attempt get psF64 value of non-existant metadata item - printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item"); - valueF64 = psMetadataLookupF64(&status, metadata, "myItem22"); - if(status) { - printf("ERROR: Bad status, %d, \n", status); - return 23; - } - printFooter(stdout, "psMetadata","Test O - Attempt get psF64 value of non-existant metadata item",true); - - // Test P - Attempt get psVector value of non-existant metadata item - printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item"); - valueVec = psMetadataLookupPtr(&status, metadata, "myItem22"); - if(status) { - printf("ERROR: Bad status, %d, \n", status); - return 24; - } - printFooter(stdout, "psMetadata","Test P - Attempt get psVector value of non-existant metadata item",true); - - // Test Q - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata"); - psFree(metadata); - psFree(item1); - psFree(item2); - psFree(item3); - psFree(item4); - psFree(item5); - psFree(item6); - if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { - psError(PS_ERR_UNKNOWN, true,"memory leaks detected."); - return 23; - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - return 24; - } - printFooter(stdout, "psMetadata", "Test Q - Free psMetadata", true); - - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3690) +++ (revision ) @@ -1,342 +1,0 @@ - - -/** @file tst_psMetadata_05.c -* -* @brief Test driver for psMetadata functions -* -* This test driver contains the following tests for psMetadata: -* Test A - Allocate metadata and items -* Test B - Set iterator at second index -* Test C - Get next item at index -* Test D - Get next item at index and string -* Test E - Get previous item at index -* Test F - Write metadata item to file -* Test G - Attempt to use null metadata with setIterator -* Test H - Attempt to use null metadata with getNext -* Test I - Attempt to use null metadata with getPrevious -* Test J - Attempt to use null file with itemPrint -* Test K - Attempt to use null format with itemPrint -* Test L - Attempt to use null item with itemPrint -* Test M - Free psMetadata -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -* -*/ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem) -{ - printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: %d ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); -} - - -psS32 main( psS32 argc, char* argv[] ) -{ - psMetadataItem *item1 = NULL; - psMetadataItem *item2 = NULL; - psMetadataItem *item3 = NULL; - psMetadataItem *item4 = NULL; - psMetadataItem *item5 = NULL; - psMetadataItem *item6 = NULL; - psMetadataItem *item7 = NULL; - // psMetadataItem *item8 = NULL; - psMetadata *metadata = NULL; - FILE *fd = NULL; - - // Test A - Allocate metadata and items - printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); - metadata = psMetadataAlloc(); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55); - item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); - item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); - item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14); - item6 = psMetadataItemAlloc("myItem6", PS_META_F64,"I am a double", 6.28); - item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS"); - // item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown"); - printMetadataItem(item1); - printMetadataItem(item2); - printMetadataItem(item3); - printMetadataItem(item4); - psMetadataAddItem(metadata, item1, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item2, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item3, PS_LIST_HEAD, PS_META_DEFAULT); - psMetadataAddItem(metadata, item4, PS_LIST_HEAD, PS_META_DEFAULT); - printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true); - - /* - // Test B - Set iterator at second index - printPositiveTestHeader(stdout, "psMetadata", "Test B - Set iterator at second index"); - if (!psMetadataSetIterator(metadata, 2)) { - psError(PS_ERR_UNKNOWN,true,"Failed to set iterator"); - return 100; - } - printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true); - - - // Test C - Get next item at index - printPositiveTestHeader(stdout, "psMetadata", "Test C - Get next item at index"); - item = psMetadataGetNext(metadata, NULL, 2); - if(item == NULL) { - printf("ERROR: Item should not be null\n"); - } else { - printf("Found item named %s\n", item->name); - } - printFooter(stdout, "psMetadata", "Test C - Get next item at index", true); - - - // Test D - Get next item at index and string - printPositiveTestHeader(stdout, "psMetadata", "Test D - Get next item at index and string"); - item = psMetadataGetNext(metadata, "myItem1", 1); - if(item == NULL) { - printf("ERROR: Item should not be null\n"); - } else { - printf("Found item named %s\n", item->name); - } - printFooter(stdout, "psMetadata", "Test D - Get next item at index and string", true); - - - // Test E - Get previous item at index - printPositiveTestHeader(stdout, "psMetadata", "Test E - Get previous item at index"); - item = psMetadataGetPrevious(metadata, NULL, 1); - if(item == NULL) { - printf("ERROR: Item should not be null\n"); - } else { - printf("Found item named %s\n", item->name); - } - if( psMetadataGetPrevious(metadata,"myItem3",1) == NULL) { - psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return an item from metadata."); - return 45; - } - tmpList = metadata->list; - metadata->list = NULL; - if ( psMetadataGetPrevious(metadata,NULL,1) != NULL) { - psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return null for invalid metadata."); - return 50; - } - metadata->list = tmpList; - printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true); - - */ - // Test F - Write metadata item to file - printPositiveTestHeader(stdout, "psMetadata", "Test F - Write metadata item to file"); - fd = fopen("temp/tst_psMetadata05_OUT", "w"); - if(fd == NULL) { - printf("ERROR: Couldn't open file for writing\n"); - } - - if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) { - printf("ERROR: Return type should be true\n"); - return 10; - } - - if (psMetadataItemPrint(fd, "S32 = %+06.1f\n", item2) == false) { - printf("ERROR: Return type should be true\n"); - return 10; - } - - if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) { - printf("ERROR: Return type should be true\n"); - return 11; - } - - if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) { - printf("ERROR: Return type should be true\n"); - return 12; - } - - if (psMetadataItemPrint(fd, "F32 = % #i\n", item5) == false) { - printf("ERROR: Return type should be true\n"); - return 12; - } - - if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) { - printf("ERROR: Return type should be true\n"); - return 13; - } - - if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) { - printf("ERROR: Return type should be true\n"); - return 14; - } - // psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message"); - // if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) { - // printf("ERROR: Return type should be false\n"); - // fclose(fd); - // return 15; - // } - fclose(fd); - - fd = fopen("temp/tst_psMetadata05_OUT", "r"); - if(fd == NULL) { - printf("ERROR: Couldn't open file for reading\n"); - } - - char line[256]; - char truth1[] = "S32 = 55"; - fgets(line, 256, fd); - if(strncmp(line, truth1, 8)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth1); - } - - char truth1b[] = "S32 = +055.0"; - fgets(line, 256, fd); - if(strncmp(line, truth1b, 12)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth1b); - } - - char truth2[] = "BOL = 0"; - fgets(line, 256, fd); - if(strncmp(line, truth2, 7)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth2); - } - - char truth3[] = "F32 = 3.14"; - fgets(line, 256, fd); - if(strncmp(line, truth3, 10)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth3); - } - - char truth3b[] = "F32 = 3"; - fgets(line, 256, fd); - if(strncmp(line, truth3b, 8)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth3b); - } - - char truth4[] = "F64 = 6.28"; - fgets(line, 256, fd); - if(strncmp(line, truth4, 10)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth4); - } - - char truth5[] = "STR = GNIRTS"; - fgets(line, 256, fd); - if(strncmp(line, truth5, 12)) { - printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth5); - } - - fclose(fd); - printFooter(stdout, "psMetadata", "Test F - Write metadata item to file", true); - /* - // Test G - Attempt to use null metadata with setIterator - printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use null metadata with setIterator", - "Null metadata collection not allowed", 0); - if( psMetadataSetIterator(NULL, 0)) { - psError(PS_ERR_UNKNOWN,true,"Set iterator did not detect invalid parameter."); - return 101; - } - tmpList = metadata->list; - metadata->list = NULL; - if( psMetadataSetIterator(metadata,0)) { - psError(PS_ERR_UNKNOWN,true,"Set iterator did not detect null list."); - return 102; - } - metadata->list = tmpList; - printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true); - - - // Test H - Attempt to use null metadata with getNext - printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext", - "Null metadata collection not allowed", 0); - if( psMetadataGetNext(NULL, "myItem2", 0) != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for null metadata."); - return 40; - } - tmpList = metadata->list; - metadata->list = NULL; - if ( psMetadataGetNext(metadata, "myItem2", 0) != NULL ) { - psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for invalid metadata."); - return 41; - } - metadata->list = tmpList; - - printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true); - - - // Test I - Attempt to use null metadata with getPrevious - printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use null metadata with getPrevious", - "Null metadata collection not allowed", 0); - psMetadataGetPrevious(NULL, "myItem2", 0); - printFooter(stdout, "psMetadata", "Test I - Attempt to use null metadata with getPrevious", true); - - */ - // Test J - Attempt to use null file with itemPrint - printNegativeTestHeader(stdout,"psMetadata", "Test J - Attempt to use null file with itemPrint", - "Null file descriptor not allowed", 0); - psMetadataItemPrint(NULL, "Item value: %ld", item2); - printFooter(stdout, "psMetadata", "Test J - Attempt to use null file with itemPrint", true); - - - // Test K - Attempt to use null format with itemPrint - printNegativeTestHeader(stdout,"psMetadata", "Test K - Attempt to use null format with itemPrint", - "Null format not allowed", 0); - psMetadataItemPrint(fd, NULL, item2); - printFooter(stdout, "psMetadata", "Test K - Attempt to use null format with itemPrint", true); - - - // Test L - Attempt to use null item with itemPrint - printNegativeTestHeader(stdout,"psMetadata", "Test L - Attempt to use null item with itemPrint", - "Null metadata not allowed", 0); - psMetadataItemPrint(fd, "Item value: %ld", NULL); - printFooter(stdout, "psMetadata", "Test L - Attempt to use null item with itemPrint", true); - - - // Test M - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test M - Free psMetadata"); - psFree(metadata); - psFree(item1); - psFree(item2); - psFree(item3); - psFree(item4); - psFree(item5); - psFree(item6); - psFree(item7); - // psFree(item8); - if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { - psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); - return 50; - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - return 51; - } - printFooter(stdout, "psMetadata", "Test M - Free psMetadata", true); - - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3690) +++ (revision ) @@ -1,166 +1,0 @@ - -/** @file tst_psMetadata_06.c -* -* @brief Test driver for psMetadata functions -* -* This test driver contains the following tests for psMetadata: -* Test A - Allocate metadata and items -* Test B - Add leaf node on top of existing leaf node -* Test C - Add leaf node to existing folder node -* Test D - Add folder node on top of existing leaf node -* Test E - Free psMetadata -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -* -*/ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -static void printMetadataItem(psMetadataItem *metadataItem) -{ - printf("Key Name: %8s ", metadataItem->name); - printf("Key mdType: 0x%08x ", metadataItem->type); - - switch (metadataItem->type) { - case PS_META_MULTI: - printf("Key Value: %17c", ' '); - break; - case PS_META_LIST: - printf("Key Value: %15s ", "psList"); - break; - case PS_META_BOOL: - printf("Key Value: %15d ", metadataItem->data.B); - break; - case PS_META_S32: - printf("Key Value: %15d ", metadataItem->data.S32); - break; - case PS_META_F32: - printf("Key Value: %15.3f ", metadataItem->data.F32); - break; - case PS_META_F64: - printf("Key Value: %15.3f ", metadataItem->data.F64); - break; - case PS_META_STR: - printf("Key Value: %15s ", (char*)metadataItem->data.V); - break; - default: - printf("Bad type: %d ", metadataItem->type); - } - printf("Key Comment: %s\n", metadataItem->comment); -} - - -psS32 main( psS32 argc, char* argv[] ) -{ - psMetadataItem *item1a = NULL; - psMetadataItem *item1b = NULL; - psMetadataItem *item1c = NULL; - psMetadataItem *item2a = NULL; - psMetadataItem *item2b = NULL; - psMetadata *metadata = NULL; - - - // Test A - Allocate metadata and items - printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata and items"); - item1a = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item1b = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 111); - item1c = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 222); - item2a = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 333); - item2b = psMetadataItemAlloc("myItem2", PS_META_LIST, "I am a list", NULL); - metadata = psMetadataAlloc(); - printMetadataItem(item1a); - printMetadataItem(item1b); - printMetadataItem(item1c); - printMetadataItem(item2a); - printMetadataItem(item2b); - printFooter(stdout, "psMetadata", "Test A - Allocate metadata and items", true); - - - // Test B - Add leaf node on top of existing leaf node - printPositiveTestHeader(stdout, "psMetadata", "Test B - replace an item in the metadata"); - if(!psMetadataAddItem(metadata, item1a, PS_LIST_HEAD, PS_META_DEFAULT)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top."); - return 20; - } - psMetadataItem* tempItem = psMetadataLookup(metadata, item1a->name); - if (tempItem != item1a) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem didn't add the metadata entry."); - return 20; - } - - if (!psMetadataAddItem(metadata, item1b, PS_LIST_HEAD, PS_META_REPLACE)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top."); - return 21; - } - - tempItem = psMetadataLookup(metadata, item1a->name); - if (tempItem != item1b) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem didn't replace the metadata entry."); - return 21; - } - - printFooter(stdout, "psMetadata", "Test B - replace an item in the metadata", true); - - - // Test C - Add leaf node to existing folder node - printPositiveTestHeader(stdout, "psMetadata", "Test C - add duplicate-key metadata item"); - if (!psMetadataAddItem(metadata, item1c, PS_LIST_HEAD, PS_META_DUPLICATE_OK)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem return false for adding a not to existing node."); - return 22; - } - - tempItem = psMetadataLookup(metadata, item1a->name); - if (tempItem == NULL || tempItem->type != PS_META_MULTI) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem didn't add additional metadata entry of same key."); - return 22; - } - printFooter(stdout, "psMetadata", "Test C - add duplicate-key metadata item", true); - - - // Test D - Add folder node on top of existing leaf node - printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node"); - if (!psMetadataAddItem(metadata, item2a, PS_LIST_HEAD, PS_META_DEFAULT)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node to existing leaf node."); - return 23; - } - if (!psMetadataAddItem(metadata, item2b, PS_LIST_HEAD, PS_META_DUPLICATE_OK)) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a nod to existing leaf node."); - return 24; - } - printFooter(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node", true); - tempItem = psMetadataLookup(metadata, item1a->name); - if (tempItem == NULL || tempItem->type != PS_META_MULTI) { - psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem didn't add additional metadata entry of same key."); - return 24; - } - - - // Test E - Free psMetadata - printPositiveTestHeader(stdout, "psMetadata", "Test E - Free psMetadata"); - psFree(item1a); - psFree(item1b); - psFree(item1c); - psFree(item2a); - psFree(item2b); - psFree(metadata); - if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { - psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); - return 25; - } - psMemCheckCorruption(0); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - } - printFooter(stdout, "psMetadata", "Test E - Free psMetadata", true); - - - return 0; -} Index: trunk/psLib/test/astronomy/tst_psMetadata_07.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 3690) +++ (revision ) @@ -1,46 +1,0 @@ -/** @file tst_psMetadata_07.c -* -* @brief Test driver for psMetadataIO functions -* -* This test driver contains the following tests for psMetadata: -* Test A - Read an XML config file -* Test B - Free data -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -* -*/ -#include "config.h" -#include "pslib_strict.h" -#include "psTest.h" - -int main(int argc, char* argv[]) -{ - // Test A - Read an XML config file - printPositiveTestHeader(stdout, "psMetadata", "Test A - Read an XML config file"); - int res = 0; - psU32 nFail = 0; - psMetadata *md = NULL; - md = psMetadataParseConfigXml(md, &nFail, XML_CONFIG_FILE, true); - if (nFail != 0) { - printf("psMetadataParseConfigXml returned error %d\n", res); - } - - psFree(md); - printFooter(stdout, "psMetadata", "Test A - Read an XML config file", true); - - // Test B - Free data - printPositiveTestHeader(stdout, "psMetadata", "Test B - Free data"); - psMemCheckLeaks(0, NULL, stdout, false); - psS32 nBad = psMemCheckCorruption(0); - if(nBad) { - printf("ERROR: Found %d bad memory blocks\n", nBad); - } - printFooter(stdout, "psMetadata", "Test B - Free data", true); - - return 0; -}