Index: trunk/psLib/test/fileUtils/.cvsignore =================================================================== --- trunk/psLib/test/fileUtils/.cvsignore (revision 3690) +++ (revision ) @@ -1,17 +1,0 @@ -.deps -.libs -Makefile -Makefile.in -tmpImages -temp -tst_psLookupTable_01 -tst_psDB -tst_psFits -multi.fits -table.fits -table10.dat -table2.dat -table3.dat -tableF32.dat -tableU8.dat -tableS32.dat Index: trunk/psLib/test/fileUtils/Makefile.am =================================================================== --- trunk/psLib/test/fileUtils/Makefile.am (revision 3690) +++ (revision ) @@ -1,42 +1,0 @@ -#Makefile for dataIO functions of psLib -# -EXTRA_DIST = verified - -EXTRA_PROGRAMS = tst_psDB - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/astronomy \ - -I$(top_srcdir)/src/collections \ - -I$(top_srcdir)/src/dataManip \ - -I$(top_srcdir)/src/dataIO \ - -I$(top_srcdir)/src/image \ - -I$(top_srcdir)/src/sysUtils \ - $(all_includes) - -AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) -AM_CFLAGS = -DUTC_DAT_FILE="\"$(top_srcdir)/share/pslib/tai_utc.dat\"" - -TESTS = \ - tst_psLookupTable_01 \ - tst_psFits \ - @TST_PSDB@ - -check_PROGRAMS = $(TESTS) - -check_DATA = table10.dat table2.dat table3.dat tableF32.dat tableS32.dat tableU8.dat - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified - -tests: $(check_DATA) $(TESTS) - -CLEANFILES = $(TESTS) $(check_DATA) multi.fits table.fits temp/* - -tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c -tst_psFits_SOURCES = tst_psFits.c -tst_psDB_SOURCES = tst_psDB.c - -%.dat: verified/%.dat - cp $? $@ - -test: check Index: trunk/psLib/test/fileUtils/tst_psDB.c =================================================================== --- trunk/psLib/test/fileUtils/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/fileUtils/tst_psFits.c =================================================================== --- trunk/psLib/test/fileUtils/tst_psFits.c (revision 3690) +++ (revision ) @@ -1,1456 +1,0 @@ -/** @file tst_psFits.c -* -* @brief Contains the tests for psFits.[ch] -* -* -* @author Robert DeSonia, MHPCC -* -* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:42 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -*/ - -#include -#include -#include -#include - -#include "psTest.h" -#include "pslib_strict.h" - -#define GENIMAGE(img,c,r,TYP, valueFcn) \ -img = psImageAlloc(c,r,PS_TYPE_##TYP); \ -for (psU32 row=0;rowdata.TYP[row]; \ - for (psU32 col=0;coldata[row] = header; - } - - psFitsWriteTable(fitsFile, NULL, table, "table-1"); - - psFree(table); - psFree(fitsFile); - - return ! psMemCheckLeaks(15,NULL,stderr,false); -} - -psS32 tst_psFitsAlloc( void ) -{ - - if (! makeMulti() ) { - return 1; - } - - psFits* fitsFile = psFitsAlloc(multiFilename); - - if (fitsFile == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - int extNum = psFitsGetExtNum(fitsFile); - if (extNum != 0) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc was not queued to the PHU, but to extension #%d.", - extNum); - return 2; - } - - psFree(fitsFile); - - // make sure the file doesn't already exist. - if (access("new.fits", F_OK) == 0) { - if (remove - ("new.fits") != 0) { - psError(PS_ERR_UNKNOWN, false, - "Couldn't delete the new.fits file."); - return 3; - } - } - - fitsFile = psFitsAlloc("new.fits"); - - if (fitsFile == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 4; - } - - psFree(fitsFile); - - // now, if psFitsAlloc actually created the file, I shouldn't error in removing it. - if (remove - ("new.fits") != 0) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc seemed to not have created a new file."); - return 5; - } - - - return 0; -} - -psS32 tst_psFitsMoveExtName( void ) -{ - - if (! makeMulti() ) { - return 1; - } - - psFits* fits = psFitsAlloc(multiFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - int numHDUs = psFitsGetSize(fits); - - if (numHDUs < 2) { - psError(PS_ERR_UNKNOWN,true, - "The 'multi' FITS file does not have multiple HDUs."); - return 2; - } - - char extName[80]; - psRegion region = {0,0,0,0}; - - for (int lcv = 0; lcv < numHDUs; lcv++) { - snprintf(extName,80,"ext-%d",lcv); - // try to move to the named extension. - if (! psFitsMoveExtName(fits, extName) ) { - psError(PS_ERR_UNKNOWN, false, - "Failed to move to ext-%d.", - lcv); - return 3; - } - - // check to see if I can retrieve the name back from the psFits object. - char* nameFromFile = psFitsGetExtName(fits); - if (strcmp(nameFromFile,extName) != 0) { // hey, it didn't move? - psError(PS_ERR_UNKNOWN, false, - "Failed to retrieve the extension name back ('%s' vs '%s'", - nameFromFile, extName); - return 3; - } - psFree(nameFromFile); - - // check that the image is associated to the extension moved, i.e., - // did we really move to the proper extension? - psImage* image = psFitsReadImage(NULL, fits,region,0); - - if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "The image pixel 0,0 of ext-%d was %g, expected %d.", - lcv,image->data.F32[0][0],lcv); - return 4; - } - psFree(image); - } - - for (int lcv = numHDUs-1; lcv >= 0; lcv--) { - snprintf(extName,80,"ext-%d",lcv); - // try to move to the named extension. - if (! psFitsMoveExtName(fits, extName) ) { - psError(PS_ERR_UNKNOWN, false, - "Failed to move to ext-%d.", - lcv); - return 5; - } - - // check to see if I can retrieve the name back from the psFits object. - char* nameFromFile = psFitsGetExtName(fits); - if (strcmp(nameFromFile,extName) != 0) { // hey, it didn't move? - psError(PS_ERR_UNKNOWN, false, - "Failed to retrieve the extension name back ('%s' vs '%s'", - nameFromFile, extName); - return 5; - } - psFree(nameFromFile); - - // check that the image is associated to the extension moved, i.e., - // did we really move to the proper extension? - psImage* image = psFitsReadImage(NULL, fits,region,0); - - if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "The image pixel 0,0 of ext-%d was %g, expected %d.", - lcv,image->data.F32[0][0],lcv); - return 6; - } - psFree(image); - } - - // check to see if given a bogus extension name, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - if (psFitsMoveExtName(fits, "bogus") || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Moving to non-existant HDU didn't fail."); - return 7; - } - - // check to see if given a NULL psFits, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - if (psFitsMoveExtName(NULL, "bogus") || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Operation of NULL psFits didn't fail."); - return 8; - } - - // check to see if given a NULL extname, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - if (psFitsMoveExtName(fits, NULL) || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Operation of NULL extname didn't fail."); - return 9; - } - - psFree(fits); - - return 0; -} - -psS32 tst_psFitsMoveExtNum( void ) -{ - - if (! makeMulti() ) { - return 1; - } - - psFits* fits = psFitsAlloc(multiFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - int numHDUs = psFitsGetSize(fits); - - // as a side test, let's make sure psFitsGetSize can handle NULL. - psLogMsg(__func__,PS_LOG_INFO, - "Following should be an error."); - psErrorClear(); - if (psFitsGetSize(NULL) != 0 || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN,true, - "The 'multi' FITS file does not have multiple HDUs."); - return 2; - } - - if (numHDUs != 8) { - psError(PS_ERR_UNKNOWN,true, - "The 'multi' FITS file does not have multiple HDUs."); - return 2; - } - - psRegion region = {0,0,0,0}; - - // test absolute positioning - for (int lcv = 0; lcv < numHDUs; lcv++) { - // try to move to the extension - if (! psFitsMoveExtNum(fits, lcv, false) ) { - psError(PS_ERR_UNKNOWN, false, - "Failed to move to extension %d.", - lcv); - return 3; - } - - // check to see if I can retrieve the number back from the psFits object. - if (psFitsGetExtNum(fits) != lcv) { // hey, it didn't move? - psError(PS_ERR_UNKNOWN, false, - "Failed to retrieve the extension number back (%d vs %d)", - psFitsGetExtNum(fits), lcv); - return 5; - } - - // check that the image is associated to the extension moved, i.e., - // did we really move to the proper extension? - psImage* image = psFitsReadImage(NULL, fits,region,0); - - if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "The image pixel 0,0 of ext-%d was %g, expected %d.", - lcv,image->data.F32[0][0],lcv); - return 4; - } - psFree(image); - } - - for (int lcv = numHDUs-1; lcv >= 0; lcv--) { - // try to move to the extension - if (! psFitsMoveExtNum(fits, lcv, false) ) { - psError(PS_ERR_UNKNOWN, false, - "Failed to move to extension %d.", - lcv); - return 5; - } - - // check that the image is associated to the extension moved, i.e., - // did we really move to the proper extension? - psImage* image = psFitsReadImage(NULL, fits,region,0); - - if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "The image pixel 0,0 of ext-%d was %g, expected %d.", - lcv,image->data.F32[0][0],lcv); - return 6; - } - psFree(image); - } - - // test relative positioning - psFitsMoveExtNum(fits,0,false); - for (int lcv = 1; lcv < numHDUs; lcv++) { - // try to move to the extension - if (! psFitsMoveExtNum(fits, 1, true) ) { - psError(PS_ERR_UNKNOWN, false, - "Failed to move to extension %d.", - lcv); - return 13; - } - - // check to see if I can retrieve the number back from the psFits object. - if (psFitsGetExtNum(fits) != lcv) { // hey, it didn't move? - psError(PS_ERR_UNKNOWN, false, - "Failed to retrieve the extension number back (%d vs %d)", - psFitsGetExtNum(fits), lcv); - return 13; - } - - // check that the image is associated to the extension moved, i.e., - // did we really move to the proper extension? - psImage* image = psFitsReadImage(NULL, fits,region,0); - - if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "The image pixel 0,0 of ext-%d was %g, expected %d.", - lcv,image->data.F32[0][0],lcv); - return 14; - } - psFree(image); - } - - for (int lcv = numHDUs-2; lcv >= 0; lcv--) { - // try to move to the extension - if (! psFitsMoveExtNum(fits, -1, true) ) { - psError(PS_ERR_UNKNOWN, false, - "Failed to move to extension %d.", - lcv); - return 15; - } - - // check to see if I can retrieve the number back from the psFits object. - if (psFitsGetExtNum(fits) != lcv) { // hey, it didn't move? - psError(PS_ERR_UNKNOWN, false, - "Failed to retrieve the extension number back (%d vs %d)", - psFitsGetExtNum(fits), lcv); - return 15; - } - - // check that the image is associated to the extension moved, i.e., - // did we really move to the proper extension? - psImage* image = psFitsReadImage(NULL, fits,region,0); - - if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "The image pixel 0,0 of ext-%d was %g, expected %d.", - lcv,image->data.F32[0][0],lcv); - return 16; - } - psFree(image); - } - - // check to see if given a negative extension number, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - psErrorClear(); - if (psFitsMoveExtNum(fits, -1, false) || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Moving to negative HDU didn't fail."); - return 21; - } - - // check to see if relative positioning beyond PHU, it errors. - psFitsMoveExtNum(fits,0,false); - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - psErrorClear(); - if (psFitsMoveExtNum(fits, -1, true) || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Moving to negative HDU didn't fail."); - return 22; - } - - - // check to see if given a extension greater than the total #HDUs, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - psErrorClear(); - if (psFitsMoveExtNum(fits, numHDUs, false) || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Moving to a HDU beyond the file's contents didn't fail."); - return 31; - } - - // check to see if relative positioning beyond PHU, it errors. - psFitsMoveExtNum(fits,numHDUs-1,false); - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - psErrorClear(); - if (psFitsMoveExtNum(fits, 1, true) || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Moving to negative HDU didn't fail."); - return 32; - } - - // check to see if given a NULL psFits, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error."); - psErrorClear(); - if (psFitsMoveExtNum(NULL, 0, false) || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, false, - "Operation of NULL psFits didn't fail."); - return 40; - } - - psFree(fits); - - return 0; -} - -static psS32 tst_psFitsReadHeader( void ) -{ - if (! makeMulti() ) { - return 1; - } - - psFits* fits = psFitsAlloc(multiFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - int numHDUs = psFitsGetSize(fits); - - if (numHDUs < 8) { - psError(PS_ERR_UNKNOWN,true, - "The 'multi' FITS file does not have multiple HDUs."); - return 2; - } - - char extname[80]; - for (int hdunum = 0; hdunum < numHDUs; hdunum++) { - snprintf(extname,80,"ext-%d",hdunum); - - psFitsMoveExtNum(fits,hdunum,false); - - psMetadata* header = psFitsReadHeader(NULL,fits); - if (header == NULL) { - psError(PS_ERR_UNKNOWN, false, - "Failed to read header"); - return 3; - } - - psMetadata* header2 = psMetadataAlloc(); - header2 = psFitsReadHeader(header2,fits); - if (header2 == NULL) { - psError(PS_ERR_UNKNOWN, false, - "Failed to read header"); - return 11; - } - - if (header->list->size < 1 || header->list->size != header2->list->size) { - psError(PS_ERR_UNKNOWN, true, - "Reading the header given a NULL input psMetadata differed " - "from giving an existing psMetadata."); - return 12; - } - - // check for the extra metadata items - psS32 intItem = psMetadataLookupS32(NULL,header, "MYINT"); - psF32 fltItem = psMetadataLookupF32(NULL,header, "MYFLT"); - psF64 dblItem = psMetadataLookupF64(NULL,header, "MYDBL"); - psMetadataItem* boolItem = psMetadataLookup(header, "MYBOOL"); - char* strItem = psMetadataLookupPtr(NULL, header, "MYSTR"); - - if (intItem != hdunum) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psS32 metadata item from file."); - return 20; - } - - if (fabsf(fltItem - 1.0f/(float)(1+hdunum)) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psF32 metadata item from file. Got %f vs %f", - fltItem,1.0f/(float)(1+hdunum)); - return 21; - } - - if (abs(dblItem - 1.0/(double)(1+hdunum)) > DBL_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psF64 metadata item from file. Got %g vs %g", - dblItem, 1.0/(double)(1+hdunum)); - return 22; - } - - if (boolItem == NULL || - boolItem->type != PS_META_BOOL) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psBool metadata item from file."); - return 23; - } - - if (strItem == NULL || strncmp(strItem,extname,strlen(extname)) != 0) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve string metadata item from file. Got '%s' vs '%s' (%d)", - strItem,extname,strlen(extname)); - return 24; - } - - psFree(header); - psFree(header2); - } - - psLogMsg(__func__,PS_LOG_INFO,"following should be an error (input psFits = NULL)"); - psMetadata* header = psFitsReadHeader(NULL,NULL); - - if (header != NULL || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, true, - "psFitsReadHeader didn't error on a NULL psFits."); - return 30; - } - - - psFree(fits); - - return 0; -} - -static psS32 tst_psFitsReadHeaderSet( void ) -{ - if (! makeMulti() ) { - return 1; - } - - psFits* fits = psFitsAlloc(multiFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - int numHDUs = psFitsGetSize(fits); - - if (numHDUs < 8) { - psError(PS_ERR_UNKNOWN,true, - "The 'multi' FITS file does not have multiple HDUs."); - return 2; - } - - // move to the middle - psFitsMoveExtNum(fits,numHDUs/2, false); - - psHash* headerSet = psFitsReadHeaderSet(NULL, fits); - - if (headerSet == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeaderSet returned NULL unexpectedly."); - return 3; - } - - if (psFitsGetExtNum(fits) != numHDUs/2) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeaderSet changed the CHU."); - return 4; - } - - char extname[80]; - for (int i = 0; i < numHDUs; i++) { - if (i == 0) { - snprintf(extname, 80, "PHU"); - } else { - snprintf(extname, 80, "ext-%d", i); - } - - psMetadata* header = psHashLookup(headerSet, extname); - - if (header == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeader returned NULL unexpectedly for HDU#%d.", - i); - return 5; - } - - psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT"); - - if (intItem != i) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeader for HDU#%d had a MYINT of %d, expected %d.", - intItem, i); - return 6; - } - - } - - psHash* set2 = psHashAlloc(20); - - if (psFitsReadHeaderSet(set2,NULL) != NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeaderSet returned non-NULL given a NULL psFits."); - return 10; - } - - psHash* set3 = psHashAlloc(20); - psFitsReadHeaderSet(set3,fits); - - if (set3 == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeaderSet returned NULL unexpectedly."); - return 11; - } - - for (int i = 0; i < numHDUs; i++) { - if (i == 0) { - snprintf(extname, 80, "PHU"); - } else { - snprintf(extname, 80, "ext-%d", i); - } - - psMetadata* header = psHashLookup(set3, extname); - - if (header == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeader returned NULL unexpectedly for HDU#%d.", - i); - return 5; - } - - psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT"); - - if (intItem != i) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadHeader for HDU#%d had a MYINT of %d, expected %d.", - intItem, i); - return 6; - } - - } - - - - psFree(headerSet); - psFree(set3); - // set2 should have been freed by psFitsReadHeaderSet upon an error. - - psFree(fits); - - return 0; -} - -static psS32 tst_psFitsReadTable( void ) -{ - - - if (! makeTable()) { - return 1; - } - - psFits* fits = psFitsAlloc(tableFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - psFitsMoveExtNum(fits,1,false); - - psArray* table = psFitsReadTable(fits); - - if (table == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTable returned NULL unexpectedly."); - return 2; - } - - if (table->n != tableNumRows) { - psError(PS_ERR_UNKNOWN, false, - "Expected %d rows, but read %d.", - tableNumRows, table->n); - return 3; - } - - - for (int row = 0; row < table->n; row++) { - psMetadata* rowData = table->data[row]; - - psS32 intItem = psMetadataLookupS32(NULL, rowData, "MYINT"); - psF32 fltItem = psMetadataLookupF32(NULL, rowData, "MYFLT"); - psF64 dblItem = psMetadataLookupF64(NULL, rowData, "MYDBL"); - psBool boolItem = psMetadataLookupBool(NULL, rowData, "MYBOOL"); - - if (intItem != row) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psS32 metadata item from file (row=%d). Got %d vs %d", - row, intItem, row); - return 20; - } - - if (fabsf(fltItem - 1.0f/(float)(1+row)) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psF32 metadata item from file (row=%d). Got %f vs %f", - row, fltItem,1.0f/(float)(1+row)); - return 21; - } - - if (abs(dblItem - 1.0/(double)(1+row)) > DBL_EPSILON) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psF64 metadata item from file (row=%d). Got %g vs %g", - row, dblItem, 1.0/(double)(1+row)); - return 22; - } - - if ( boolItem != ((row&0x01) == 0)) { - psError(PS_ERR_UNKNOWN, true, - "Failed to retrieve psBool metadata item from file (row=%d). Got %d vs %d", - row, boolItem, ((row&0x01) == 0)); - return 23; - } - } - - psFree(table); - psFree(fits); - - psArray* nullTest = psFitsReadTable(NULL); - - if (nullTest != NULL || psErrorGetStackSize() != 1) { - psError(PS_ERR_UNKNOWN, true, - "psFitsReadTable returned non-NULL when given NULL."); - return 30; - } - - return 0; -} - -static psS32 tst_psFitsReadTableColumnNum( void ) -{ - if (! makeTable()) { - return 1; - } - - psFits* fits = psFitsAlloc(tableFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - psFitsMoveExtNum(fits,1,false); - - // read the column data via number - psVector* colData; - psElemType type[4] = {PS_TYPE_S32, PS_TYPE_F32, PS_TYPE_F32, PS_TYPE_BOOL}; - psElemType altType[4] = {PS_TYPE_S64, PS_TYPE_F64, PS_TYPE_F64, PS_TYPE_BOOL}; - char* colname[4] = {"MYINT","MYFLT","MYDBL","MYBOOL"}; - psF64 expectedValues[4][10] = { - {0,1,2,3,4,5,6,7,8,9}, - {1.0,1.0/2.0,1.0/3.0,1.0/4.0,1.0/5.0,1.0/6.0,1.0/7.0,1.0/8.0,1.0/9.0}, - {1.0,1.0/2.0,1.0/3.0,1.0/4.0,1.0/5.0,1.0/6.0,1.0/7.0,1.0/8.0,1.0/9.0}, - {1.0,0.0,1.0,0.0,1.0,0.0,1.0,0.0,1.0,0.0} - }; - - for (int col = 0; col < 4; col++) { - colData = psFitsReadTableColumnNum(fits,colname[col]); - if (colData == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum returned NULL for col=%d", - col); - return 2; - } - if (colData->type.type != type[col] && - colData->type.type != altType[col]) { - char* typeRead; - char* typeExpected; - PS_TYPE_NAME(typeRead, colData->type.type); - PS_TYPE_NAME(typeExpected, type[col]); - - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum returned different type, %s vs %s, for col=%d", - typeRead, typeExpected, col); - return 3; - } - if (colData->n != tableNumRows) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum returned different number of rows, %d vs %d, for col=%d", - colData->n, tableNumRows, col); - return 4; - } - for (int row = 0; row < tableNumRows; row++) { - if (abs(p_psVectorGetElementF64(colData,row) - expectedValues[col][row]) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum returned unexpected values (%g vs %g) for col=%d", - p_psVectorGetElementF64(colData,row), expectedValues[col][row], col); - return 5; - } - } - psFree(colData); - } - - psWarning("Following should be an error."); - psErrorClear(); - psVector* data = psFitsReadTableColumnNum(NULL,colname[0]); - psErr* err = psErrorLast(); - if (data != NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum did not return NULL with NULL psFits"); - return 6; - } - if (err->code != PS_ERR_BAD_PARAMETER_NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum did not error with NULL psFits"); - return 7; - } - psFree(err); - - psWarning("Following should be an error."); - psErrorClear(); - data = psFitsReadTableColumnNum(fits,"BOGUS"); - err = psErrorLast(); - if (data != NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum did not return NULL with bogus column name."); - return 8; - } - if (err->code != PS_ERR_IO) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumnNum did not error with bogus column name."); - return 9; - } - psFree(err); - - psFree(fits); - - return 0; -} - -static psS32 tst_psFitsReadTableColumn( void ) -{ - if (! makeTable()) { - return 1; - } - - psFits* fits = psFitsAlloc(tableFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 1; - } - - psFitsMoveExtNum(fits,1,false); - - // read the column data via number - psArray* colData; - char* colname[4] = {"MYINT","MYFLT","MYDBL","MYBOOL"}; - psF64 expectedValues[4][10] = { - {0,1,2,3,4,5,6,7,8,9}, - {1.0,1.0/2.0,1.0/3.0,1.0/4.0,1.0/5.0,1.0/6.0,1.0/7.0,1.0/8.0,1.0/9.0}, - {1.0,1.0/2.0,1.0/3.0,1.0/4.0,1.0/5.0,1.0/6.0,1.0/7.0,1.0/8.0,1.0/9.0}, - {1.0,0.0,1.0,0.0,1.0,0.0,1.0,0.0,1.0,0.0} - }; - - for (int col = 0; col < 4; col++) { - colData = psFitsReadTableColumn(fits,colname[col]); - if (colData == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn returned NULL for col=%d", - col); - return 2; - } - if (colData->n != tableNumRows) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn returned different number of rows, %d vs %d, for col=%d", - colData->n, tableNumRows, col); - return 4; - } - if (col < 3) { - for (int row = 0; row < tableNumRows; row++) { - if (abs(atof((char*)colData->data[row]) - expectedValues[col][row]) > 0.0001) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn returned unexpected values (%g vs %g) for col=%d", - atof((char*)colData->data[row]), expectedValues[col][row], col); - return 5; - } - } - } - psFree(colData); - } - - psWarning("Following should be an error."); - psErrorClear(); - psArray* data = psFitsReadTableColumn(NULL,"MYINT"); - psErr* err = psErrorLast(); - if (data != NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn did not return NULL with NULL psFits"); - return 6; - } - if (err->code != PS_ERR_BAD_PARAMETER_NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn did not error with NULL psFits"); - return 7; - } - psFree(err); - - psWarning(__func__,"Following should be an error."); - psErrorClear(); - data = psFitsReadTableColumn(fits,"BOGUS"); - err = psErrorLast(); - if (data != NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn did not return NULL with col=\"BOGUS\""); - return 8; - } - if (err->code != PS_ERR_IO) { - psError(PS_ERR_UNKNOWN, false, - "psFitsReadTableColumn did not error with col=\"BOGUS\""); - return 9; - } - psFree(err); - - psFree(fits); - - return 0; -} - -static psS32 tst_psFitsUpdateTable( void ) -{ - psErr* err; - - if (! makeTable()) { - return 1; - } - - psFits* fits = psFitsAlloc(tableFilename); - - if (fits == NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsAlloc returned NULL on existing file."); - return 2; - } - - psFitsMoveExtNum(fits,1,false); - - // change the data in the file, going past by one (implicit new row of data) - for (int row = 0; row < tableNumRows+1; row++) { - psMetadata* md = psMetadataAlloc(); - psMetadataAddF32(md,PS_LIST_TAIL,"MYFLT","",(float)row/-10.0); - psMetadataAddF64(md,PS_LIST_TAIL,"MYDBL","",(double)row/-100.0); - psMetadataAddS32(md,PS_LIST_TAIL,"MYINT","",-row); - - if (! psFitsUpdateTable(fits,md,row)) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable returned false, but expected true for row=%d.", - row); - return 3; - } - psFree(md); - } - - for (int row = 0; row < tableNumRows+1; row++) { - psMetadata* md = psFitsReadTableRow(fits, row); - if (abs(psMetadataLookupF32(NULL,md,"MYFLT") - (float)row/-10.0) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not change the float value for row=%d.", - row); - return 4; - } - if (abs(psMetadataLookupF64(NULL,md,"MYDBL") - (float)row/-100.0) > FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not change the double value for row=%d.", - row); - return 5; - } - if (psMetadataLookupS32(NULL,md,"MYINT") != -row) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not change the integer value for row=%d.", - row); - return 6; - } - psFree(md); - } - - psMetadata* md = psMetadataAlloc(); - psMetadataAddF32(md,PS_LIST_TAIL,"BOGUS","",-1.0f); - psWarning("Following should be a warning."); - psErrorClear(); - if (! psFitsUpdateTable(fits,md,0)) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not return false with bogus column data"); - return 10; - } - psFree(md); - - md = psMetadataAlloc(); - psMetadataAddF32(md,PS_LIST_TAIL,"MYFLT","",-1.0f); - psMetadataAddF64(md,PS_LIST_TAIL,"MYDBL","",-2.0); - psMetadataAddS32(md,PS_LIST_TAIL,"MYINT","",-3); - - psWarning("Following should be an error."); - psErrorClear(); - if (psFitsUpdateTable(NULL,md,0)) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not return false with NULL psFits"); - return 20; - } - err = psErrorLast(); - if (err->code != PS_ERR_BAD_PARAMETER_NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not error with NULL psFits"); - return 21; - } - psFree(err); - - psWarning("Following should be an error."); - psErrorClear(); - if (psFitsUpdateTable(fits,NULL,0)) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not return false with NULL psMetadata"); - return 22; - } - err = psErrorLast(); - if (err->code != PS_ERR_BAD_PARAMETER_NULL) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not error with NULL psMetadata"); - return 23; - } - psFree(err); - - psWarning("Following should be an error."); - psErrorClear(); - if (psFitsUpdateTable(fits,md,-1)) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not return false with row=-1"); - return 24; - } - err = psErrorLast(); - if (err->code != PS_ERR_IO) { - psError(PS_ERR_UNKNOWN, false, - "psFitsUpdateTable did not error with row=-1"); - return 25; - } - - psFree(err); - psFree(md); - psFree(fits); - - return 0; -} - -psS32 testImageRead(void) -{ - psS32 N = 256; - psS32 M = 128; - - /* - This function shall open the specified FITS file, read the specified data - and place the data into a psImage structure. This function shall generate - an error message and return NULL if any of the input parameters are out of - range, image file doesn't exist or image is zero or one dimensional. - - Verify the returned psImage structure contains expected values, if the input - parameter filename specifies an available FITS file with known 2dimensional - data, input parameters col, row, ncol, nrow, z specify data range with the - FITS file. Cases should include 1x1, Nx1, 1xN, NxN and MxN sub images and - total FITS file image. (done in macro) - - Verify the returned psImage structure is equal to the input parameter - 'output', if specified. (done in macro) - - */ - - /* generate FITS file to read */ - - #define testReadTypeSize(m, n, readM0, readN0, readM, readN, TYP, filename) \ - { \ - psImage* img = NULL; \ - psImage* img2 = NULL; \ - psImage* img3 = NULL; \ - psImage* img4 = NULL; \ - /* psImagimge* img_ref = NULL; */ \ - \ - GENIMAGE(img,m,n,TYP,row+2*col); \ - img2 = psImageCopy(img2,img,PS_TYPE_##TYP); \ - GENIMAGE(img3,m,n,TYP,row+2*col); \ - psImageClip(img3,32.0,32.0,120.0,120.0); \ - img4 = psImageCopy(img4,img3,PS_TYPE_##TYP); \ - remove(filename); \ - psFits* fits = psFitsAlloc(filename); \ - psRegion region = {0,0,0,0}; \ - if (! psFitsWriteImage(fits, NULL, img, 2, "primary")) { \ - psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \ - return 1; \ - } \ - if (! psFitsUpdateImage(fits,img3, region, 1)) { \ - psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \ - return 2; \ - } \ - if (! psFitsWriteImage(fits,NULL, img3, 2, "extension")) { \ - psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \ - return 3; \ - } \ - if (! psFitsUpdateImage(fits,img,region, 1)) { \ - psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \ - return 4; \ - } \ - psFree(img); \ - psFree(fits); \ - img = NULL; \ - psFree(img3); \ - img3 = NULL; \ - fits = psFitsAlloc(filename); \ - psRegion reg = {readM0, readM, readN0, readN}; \ - img = psFitsReadImage(img, fits, reg, 0); \ - img3 = psFitsReadImage(img3, fits, reg, 1); \ - if (img3 == NULL) { \ - psError(PS_ERR_UNKNOWN, true,"Failed to read test image %s",filename); \ - return 6; \ - } \ - for (psU32 row = readN0; row < readN; row++) { \ - ps##TYP* imgRow = img->data.TYP[row-readN0]; \ - ps##TYP* img2Row = img2->data.TYP[row]; \ - ps##TYP* img3Row = img3->data.TYP[row-readN0]; \ - ps##TYP* img4Row = img4->data.TYP[row]; \ - for (psU32 col = readM0; col < readM; col++) { \ - if (fabsf(imgRow[col-readM0]-img2Row[col]) > FLT_EPSILON) { \ - psError(PS_ERR_UNKNOWN, true,"Image changed in I/O operation at %d,%d,0 (%.2f vs %.2f) for %s", \ - col,row,(psF32)imgRow[col-readM0],(psF32)img2Row[col],filename); \ - return 7; \ - } \ - if (fabsf(img3Row[col-readM0]-img4Row[col]) > FLT_EPSILON) { \ - psError(PS_ERR_UNKNOWN, true,"Image changed in I/O operation at %d,%d,1 (%.2f vs %.2f) for %s", \ - col,row,(psF32)img3Row[col-readM0],(psF32)img4Row[col],filename); \ - return 8; \ - } \ - } \ - } \ - psFree(img); \ - img = NULL; \ - psFree(img3); \ - img3 = NULL; \ - psFitsMoveExtNum(fits,1, false); \ - img3 = psFitsReadImage(img3, fits, reg, 0); \ - img = psFitsReadImage(img, fits, reg, 1); \ - if (img == NULL) { \ - psError(PS_ERR_UNKNOWN, true,"Failed to read test image %s",filename); \ - return 9; \ - } \ - for (psU32 row = readN0; row < readN; row++) { \ - ps##TYP* imgRow = img->data.TYP[row-readN0]; \ - ps##TYP* img2Row = img2->data.TYP[row]; \ - ps##TYP* img3Row = img3->data.TYP[row-readN0]; \ - ps##TYP* img4Row = img4->data.TYP[row]; \ - for (psU32 col = readM0; col < readM; col++) { \ - if (fabsf(imgRow[col-readM0]-img2Row[col]) > FLT_EPSILON) { \ - psError(PS_ERR_UNKNOWN, true,"Image changed in I/O operation at %d,%d,0 (%.2f vs %.2f) for %s", \ - col,row,(psF32)imgRow[col-readM0],(psF32)img2Row[col],filename); \ - return 10; \ - } \ - if (fabsf(img3Row[col-readM0]-img4Row[col]) > FLT_EPSILON) { \ - psError(PS_ERR_UNKNOWN, true,"Image changed in I/O operation at %d,%d,1 (%.2f vs %.2f) for %s", \ - col,row,(psF32)img3Row[col-readM0],(psF32)img4Row[col],filename); \ - return 11; \ - } \ - } \ - } \ - psFree(img); \ - psFree(img2); \ - psFree(img3); \ - psFree(img4); \ - psFree(fits); \ - } - - #define testReadType(TYP,filename) \ - testReadTypeSize(1,1,0,0,0,0,TYP,"tmpImages/1x1_" filename); \ - testReadTypeSize(M,1,M/4,0,M*3/4,0,TYP,"tmpImages/Mx1_" filename); \ - testReadTypeSize(1,N,0,N/4,0,N*3/4,TYP,"tmpImages/1xN_" filename); \ - testReadTypeSize(M,N,M/4,N/4,M*3/4,N*3/4,TYP,"tmpImages/MxN_" filename); - - mkdir("tmpImages",0777); - - testReadTypeSize(1,1,0,0,0,0,U8,"tmpImages/1x1_" "U8.fits"); - testReadTypeSize(M,1,M/4,0,M*3/4,0,U8,"tmpImages/Mx1_" "U8.fits"); - testReadTypeSize(1,N,0,N/4,0,N*3/4,U8,"tmpImages/1xN_" "U8.fits"); - testReadTypeSize(M,N,M/4,N/4,M*3/4,N*3/4,U8,"tmpImages/MxN_" "U8.fits"); - - - testReadType(U8,"U8.fits"); - testReadType(S8,"S8.fits"); // Not a requirement - testReadType(S16,"S16.fits"); - testReadType(U16,"U16.fits"); // Not a requirement - testReadType(S32,"S32.fits"); - testReadType(U32,"U32.fits"); // Not a requirement - testReadType(F32,"F32.fits"); - testReadType(F64,"F64.fits"); - - return 0; -} - -psS32 testImageWrite(void) -{ - psImage* img = NULL; - psImage* img2 = NULL; - psS32 m = 64; - psS32 n = 96; - - /* - This function shall write the specified section within a psImage structure - to a FITS file. If the specifiedfile exists, then data should overwrite the - section to write. If the specified file doesn't exist, it shall be created. - If an extenstion is specified, then a basic primary header data unit shall - be created. - */ - - /* - Verify a FITS file named filename is generated and contains expected - values, if the input parameter input contains known data values, input - parameters col, row, ncol, nrow specify a valid data region within psImage - structure. - - Verify a FITS file named filename is generated and contains a primary - header data unit with extension with expected values, if the input - parameter input contains known data values, input parameters col, row, - ncol, nrow specify a valid data region within psImage structure and - extname and/or extnum specify an extenstion to write. - - N.B. : these are done in testImageRead tests, see above. - */ - - /* - Verify a FITS file named filename is overwritten and contains - expected values, if the input parameter input contains known data values, - input parameters col, row, ncol, nrow specify a valid data region within - psImage structure. - */ - - GENIMAGE(img,m,n,F32,0); - GENIMAGE(img2,m,n,F32,row+2*col); - mkdir("tmpImages",0777); - remove - ("tmpImages/writeTest.fits"); - psRegion region = { - 0,0,0,0 - }; - psFits* fits = psFitsAlloc("tmpImages/writeTest.fits"); - - if (! psFitsWriteImage(fits, NULL, img,1,NULL)) { - psError(PS_ERR_UNKNOWN, true,"Couldn't write writeTest.fits."); - return 14; - } - if (! psFitsUpdateImage(fits, img2, region, 0)) { - psError(PS_ERR_UNKNOWN, true,"Couldn't update writeTest.fits."); - return 15; - } - psFree(img); - psFree(img2); - - // Did it really overwrite the pixel values? Let's read it in and see. - psFree(fits); - fits = psFitsAlloc("tmpImages/writeTest.fits"); - img = psFitsReadImage(NULL, fits, region, 0); - if (img == NULL) { - psError(PS_ERR_UNKNOWN, true,"Could not read in writeTest.fits."); - return 16; - } - for (psU32 row=0;rowdata.F32[row]; - for (psU32 col=0;col FLT_EPSILON) { - psError(PS_ERR_UNKNOWN, true,"The image values were not overwritten at %d,%d (%.2f vs %.2f)", - col,row,imgRow[col],(row+2*col)); - return 17; - } - } - } - - psFree(img); - - /* - Verify false is returned and program execution is not stopped, if the input image - is null. - */ - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message because input image is null."); - if ( psFitsWriteImage(fits,NULL,NULL, 1, NULL) ) { - psError(PS_ERR_UNKNOWN, true,"psImageWriteSection did not return false when input image is NULL."); - return 20; - } - - psFree(fits); - - return 0; -} - Index: trunk/psLib/test/fileUtils/tst_psLookupTable_01.c =================================================================== --- trunk/psLib/test/fileUtils/tst_psLookupTable_01.c (revision 3690) +++ (revision ) @@ -1,621 +1,0 @@ -/** @file tst_psLookupTable_01.c -* -* @brief Test driver for psLookupTable functions -* -* This test driver contains the following tests for psLookupTable functions: -* testLookupAlloc - test allocation and freeing of psLookupTable -* testLookupRead - test different files and types within files -* being read correctly and some failure cases -* testLookupTableInterpolate - test the interpolation function -* testLookupTableInterpolateAll - test interpolation of all row values -* -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:42 $ -* -* Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii -* -*/ - -#include "pslib_strict.h" -#include "psTest.h" -#include - -static psS32 testLookupTableAlloc(void); -static psS32 testLookupTableRead(void); -static psS32 testLookupTableInterpolate(void); -static psS32 testLookupTableInterpolateAll(void); - -const psF64 errorTol_psF64 = 1.0e-4; -const psF64 tableU8_validFrom = 0; -const psF64 tableU8_validTo = 3; -const psS32 tableU8_size = 4; -const psS32 tableU8_index[] = - { - 0, 1, 2, 3 - }; -const psU16 tableU8_val1[] = - { - 2, 4, 6, 8 - }; -const psU32 tableU8_val2[] = - { - 4, 8, 12, 16 - }; -const psU64 tableU8_val3[] = - { - 8, 16, 24, 32 - }; -const psS8 tableU8_val4[] = - { - 0, -1, -2, -3 - }; -const psS16 tableU8_val5[] = - { - -2, -4, -6, -8 - }; -const psS32 tableU8_val6[] = - { - -4, -8, -12, -16 - }; -const psS64 tableU8_val7[] = - { - -8, -16, -24, -32 - }; -const psF32 tableU8_val8[] = - { - -0.5, 0.0, 0.5,0.75 - }; -const psF64 tableU8_val9[] = - { - -1.5,-1.0,-0.25,1.75 - }; - -const psF64 tableS32_validFrom = -1; -const psF64 tableS32_validTo = 33; -const psS32 tableS32_size = 4; -const psS32 tableS32_index[] = - { - -1,11,22,33 - }; - -const psF64 tableF32_validFrom = -10.05; -const psF64 tableF32_validTo = 3500.67; -const psF64 tableF32_size = 4; -const psF32 tableF32_index[] = - { - -10.05,1.009,23.45,3500.67 - }; - -const psF64 table10_validFrom = 1; -const psF64 table10_validTo = 10; -const psS32 table10_size = 10; -const psU8 table10_index[] = - { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 - }; -const psU16 table10_val1[] = - { - 4, 6, 8, 10, 12, 14, 16, 18, 20, 22 - }; -const psU32 table10_val2[] = - { - 8, 12, 16, 20, 24, 28, 32, 36, 40, 44 - }; -const psU64 table10_val3[] = - { - 16, 24, 32, 64, 128, 256, 512, 1024, 2048, 4096 - }; -const psS8 table10_val4[] = - { - -1, -2, -3, -4, -5, -6, -7, -8, -9, -10 - }; -const psS16 table10_val5[] = - { - -4, -6, -8, -10, -12, -14, -16, -18, -20, -22 - }; -const psS32 table10_val6[] = - { - -8, -12, -16, -20, -24, -28, -32, -36, -40, -44 - }; -const psS64 table10_val7[] = - { - -16, -24, -32, -64, -128, -256, -512,-1024,-2048,-4096 - }; -const psF32 table10_val8[] = - { - -2.25,-1.5,-0.75, 0.0, 0.75, 1.50, 2.25, 3.00, 3.75, 4.50 - }; -const psF64 table10_val9[] = - { - -2.67,0.66, 3.99,7.32,10.65,13.98,17.31,20.64,23.97,27.30 - }; -const psF64 interpolVal1[] = - { - 12.5, 25, 160, -5.25, -12.5, -25, -160, 0.9375, 11.4825 - }; -const psF64 interpolVal2[] = - { - 12, 24, 128, -5, -12, -24, -128, 0.75, 10.65 - }; -const psF64 interpolVal3[] = - { - 4, 8, 16, -1, -4, -8, -16, -2.25, -2.67 - }; - -testDescription tests[] = { - {testLookupTableAlloc,999,"psLookupTableAlloc",0,false}, - {testLookupTableRead,998,"psLookupTableRead",0,false}, - {testLookupTableInterpolate,997,"psLookupTableInterpolate",0,false}, - {testLookupTableInterpolateAll,996,"psLookupTableInterpolateAll",0,false}, - {NULL} - }; - -psS32 main(psS32 argc, char* argv[]) -{ - psLogSetLevel(PS_LOG_INFO); - - if ( ! runTestSuite(stderr,"psLookupTable",tests,argc,argv)) { - return 1; - } - return 0; -} - -psS32 testLookupTableAlloc(void) -{ - psLookupTable* table1 = NULL; - - // Allocate lookup table with valid parameters - table1 = psLookupTableAlloc("tableF32.dat", tableF32_validFrom, tableF32_validTo); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Null lookup table generated from valid parameters"); - return 1; - } - if(strcmp(table1->fileName,"tableF32.dat") != 0) { - psError(PS_ERR_UNKNOWN,true,"File name not properly stored in psLookupTable structure."); - return 2; - } - - if( (fabs(table1->validFrom - tableF32_validFrom) > FLT_EPSILON) || - (fabs(table1->validTo-tableF32_validTo) > FLT_EPSILON) ) { - psError(PS_ERR_UNKNOWN,true,"Members validTo or validFrom not set properly"); - return 3; - } - psFree(table1); - - // Allocate lookup table with invalid filename - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid file name"); - table1 = psLookupTableAlloc(NULL,0,3); - if(table1 != NULL) { - psError(PS_ERR_UNKNOWN,true,"Null file name accepted by psLookupTableAlloc"); - return 4; - } - - return 0; -} - -psS32 testLookupTableRead(void) -{ - psLookupTable* table1 = NULL; - - // Allocate table using table with psU8 index and valid types and index-values - table1 = psLookupTableAlloc("tableU8.dat", 0, 100.5); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with tableU8.dat"); - return 1; - } - // Read table with index U8 - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to read table from file tableU8.dat"); - return 2; - } - // Verify the validFrom and validTo are updated properly - if( (fabs(table1->validFrom - tableU8_validFrom) > FLT_EPSILON) || - (fabs(table1->validTo - tableU8_validTo) > FLT_EPSILON) ) { - psError(PS_ERR_UNKNOWN,true,"ValidFrom or validTo not set properly"); - return 3; - } - // Verify index and all values in table read properly - for(psS32 i=0; i < tableU8_size; i++) { - if(table1->index->data.U8[i] != tableU8_index[i]) { - psError(PS_ERR_UNKNOWN,true,"Index values do not match: index[%d]=%d expected %d",i, - table1->index->data.U8[i], tableU8_index[i]); - return 3*i; - } - if(((psVector*)table1->values->data[0])->data.U16[i] != tableU8_val1[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 1 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[0])->data.U16[i], tableU8_val1[i]); - return 3*i+1; - } - if(((psVector*)table1->values->data[1])->data.U32[i] != tableU8_val2[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 2 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[1])->data.U32[i], tableU8_val2[i]); - return 3*i+2; - } - if(((psVector*)table1->values->data[2])->data.U64[i] != tableU8_val3[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 3 do not match: value[%d]=%lld expected %lld",i, - ((psVector*)table1->values->data[2])->data.U64[i], tableU8_val3[i]); - return 3*i+3; - } - if(((psVector*)table1->values->data[3])->data.S8[i] != tableU8_val4[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 4 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[3])->data.S8[i], tableU8_val4[i]); - return 3*i+4; - } - if(((psVector*)table1->values->data[4])->data.S16[i] != tableU8_val5[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 5 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[4])->data.S16[i], tableU8_val5[i]); - return 3*i+5; - } - if(((psVector*)table1->values->data[5])->data.S32[i] != tableU8_val6[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 6 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[5])->data.S32[i], tableU8_val6[i]); - return 3*i+6; - } - if(((psVector*)table1->values->data[6])->data.S64[i] != tableU8_val7[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 7 do not match: value[%d]=%lld expected %lld",i, - ((psVector*)table1->values->data[6])->data.S64[i], tableU8_val7[i]); - return 3*i+7; - } - if(fabs(((psVector*)table1->values->data[7])->data.F32[i] - tableU8_val8[i]) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Value in column 8 do not match: value[%d]=%g expected %g",i, - ((psVector*)table1->values->data[7])->data.F32[i], tableU8_val8[i]); - return 3*i+8; - } - if(fabs(((psVector*)table1->values->data[8])->data.F64[i] - tableU8_val9[i]) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Value in column 9 do not match: value[%d]=%g expected %g",i, - ((psVector*)table1->values->data[8])->data.F32[i], tableU8_val9[i]); - return 3*i+9; - } - } - psFree(table1); - - // Allocate table using table with psS32 index and valid types and index-values - table1 = psLookupTableAlloc("tableS32.dat", -110, 1000.5); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with tableS32.dat"); - return 1; - } - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to read table from file tableS32.dat"); - return 2; - } - if( (fabs(table1->validFrom - tableS32_validFrom) > FLT_EPSILON) || - (fabs(table1->validTo - tableS32_validTo) > FLT_EPSILON) ) { - psError(PS_ERR_UNKNOWN,true,"ValidFrom or validTo not set properly"); - return 3; - } - for(psS32 i=0; i < tableS32_size; i++) { - if(table1->index->data.S32[i] != tableS32_index[i]) { - psError(PS_ERR_UNKNOWN,true,"Index values do not match: index[%d]=%d expected %d",i, - table1->index->data.S32[i], tableS32_index[i]); - return 4*i; - } - } - psFree(table1); - - // Allocate table using table with psF32 index and valid types and index-values - table1 = psLookupTableAlloc("tableF32.dat", -1100, 5500.5); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with tableF32.dat"); - return 1; - } - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to read table from file tableF32.dat"); - return 2; - } - if( (fabs(table1->validFrom - tableF32_validFrom) > errorTol_psF64) || - (fabs(table1->validTo - tableF32_validTo) > errorTol_psF64) ) { - psError(PS_ERR_UNKNOWN,true,"ValidFrom or validTo not set properly"); - return 3; - } - for(psS32 i=0; i < tableS32_size; i++) { - if(fabsf(table1->index->data.F32[i] - tableF32_index[i]) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Index values do not match: index[%d]=%d expected %d",i, - table1->index->data.F32[i], tableF32_index[i]); - return 4*i; - } - } - psFree(table1); - - // Allocate table using psU8 index but with unsorted rows and verify the list is - // sorted properly after being read - table1 = psLookupTableAlloc("table10.dat",1,2); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with table10.dat"); - return 1; - } - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to read table with table10.dat"); - return 2; - } - // Verify the validFrom and validTo are updated properly - if( (fabs(table1->validFrom - table10_validFrom) > FLT_EPSILON) || - (fabs(table1->validTo - table10_validTo) > FLT_EPSILON) ) { - psError(PS_ERR_UNKNOWN,true,"ValidFrom or validTo not set properly"); - return 3; - } - // Verify index and all values in table read properly - for(psS32 i=0; i < table10_size; i++) { - if(table1->index->data.U8[i] != table10_index[i]) { - psError(PS_ERR_UNKNOWN,true,"Index values do not match: index[%d]=%d expected %d",i, - table1->index->data.U8[i], table10_index[i]); - return 3*i; - } - if(((psVector*)table1->values->data[0])->data.U16[i] != table10_val1[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 1 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[0])->data.U16[i], table10_val1[i]); - return 3*i+1; - } - if(((psVector*)table1->values->data[1])->data.U32[i] != table10_val2[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 2 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[1])->data.U32[i], table10_val2[i]); - return 3*i+2; - } - if(((psVector*)table1->values->data[2])->data.U64[i] != table10_val3[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 3 do not match: value[%d]=%lld expected %lld",i, - ((psVector*)table1->values->data[2])->data.U64[i], table10_val3[i]); - return 3*i+3; - } - if(((psVector*)table1->values->data[3])->data.S8[i] != table10_val4[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 4 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[3])->data.S8[i], table10_val4[i]); - return 3*i+4; - } - if(((psVector*)table1->values->data[4])->data.S16[i] != table10_val5[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 5 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[4])->data.S16[i], table10_val5[i]); - return 3*i+5; - } - if(((psVector*)table1->values->data[5])->data.S32[i] != table10_val6[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 6 do not match: value[%d]=%d expected %d",i, - ((psVector*)table1->values->data[5])->data.S32[i], table10_val6[i]); - return 3*i+6; - } - if(((psVector*)table1->values->data[6])->data.S64[i] != table10_val7[i]) { - psError(PS_ERR_UNKNOWN,true,"Value in column 7 do not match: value[%d]=%lld expected %lld",i, - ((psVector*)table1->values->data[6])->data.S64[i], table10_val7[i]); - return 3*i+7; - } - if(fabs(((psVector*)table1->values->data[7])->data.F32[i] - table10_val8[i]) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Value in column 8 do not match: value[%d]=%g expected %g",i, - ((psVector*)table1->values->data[7])->data.F32[i], table10_val8[i]); - return 3*i+8; - } - if(fabs(((psVector*)table1->values->data[8])->data.F64[i] - table10_val9[i]) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Value in column 9 do not match: value[%d]=%g expected %g",i, - ((psVector*)table1->values->data[8])->data.F32[i], table10_val9[i]); - return 3*i+9; - } - } - psFree(table1); - - // Allocate table using table with invalid type in type row but valid index-values - table1 = psLookupTableAlloc("table2.dat",0,99.99); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with table2.dat"); - return 3; - } - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message about invalid type"); - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to read table from file table2.dat"); - return 4; - } - psFree(table1); - - // Allocate table using table with invalid value - table1 = psLookupTableAlloc("table3.dat",0,75.0); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with table3.dat"); - return 5; - } - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message about invalid value"); - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to read table from file table3.dat"); - return 6; - } - psFree(table1); - - // Attempt to read for non-existant file - table1 = psLookupTableAlloc("nonexistantFile.dat",0,100); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unable to allocate table with non-existant file"); - return 3; - } - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg about opening file"); - table1 = psLookupTableRead(table1); - if(table1 == NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned NULL when table should have been returned"); - return 4; - } - - // Attempt to read table with NULL specified file - psFree((char*)table1->fileName); - table1->fileName = NULL; - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg about NULL file name"); - if(psLookupTableRead(table1) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Did not return NULL with table specifying NULL file name"); - return 5; - } - psFree(table1); - - // Attempt to read table with NULL table - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg about NULL table"); - if(psLookupTableRead(NULL) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Did not return NULL with NULL table."); - return 6; - } - - return 0; -} - -psS32 testLookupTableInterpolate(void) -{ - psLookupStatusType status = 0; - psLookupTable* table1 = NULL; - psF64 out1 = 0; - - // Interpolate values within the list and verify return values - table1 = psLookupTableAlloc("table10.dat",0,20); - table1 = psLookupTableRead(table1); - for(psS32 i = 0; i < table1->numRows-1; i++ ) { - out1 = psLookupTableInterpolate(table1, 5.25, i, &status); - if( fabs(out1-interpolVal1[i]) > errorTol_psF64) { - psError(PS_ERR_UNKNOWN,true,"Did not return expected value. %lg expected %lg",out1,interpolVal1[i]); - return 3*i; - } - } - for(psS32 i = 0; i < table1->numRows-1; i++ ) { - out1 = psLookupTableInterpolate(table1, 5.0, i, &status); - if( fabs(out1-interpolVal2[i]) > errorTol_psF64) { - psError(PS_ERR_UNKNOWN,true,"Did not return expected value. %lg expected %lg",out1,interpolVal2[i]); - return 4*i; - } - } - - // Interpolate value just below the lowest index value - out1 = psLookupTableInterpolate(table1,0,0, &status); - if ( fabs(out1- NAN) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NAN returned %lf",out1); - return 5; - } - if ( status != PS_LOOKUP_PAST_TOP) { - psError(PS_ERR_UNKNOWN,true,"Did not return status PAST TOP"); - return 6; - } - - // Interpolate value just above the highest index value - out1 = psLookupTableInterpolate(table1,11,0, &status); - if ( fabs(out1-NAN) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NAN returned %lf",out1); - return 7; - } - if ( status != PS_LOOKUP_PAST_BOTTOM) { - psError(PS_ERR_UNKNOWN,true,"Did not return status PAST BOTTOM"); - return 8; - } - - // Interpolate value with a column number greater than the table has - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error out of range."); - out1 = psLookupTableInterpolate(table1, 5, 100, &status); - if ( fabs(out1-NAN) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NAN returned %lf",out1); - return 9; - } - if ( status != PS_LOOKUP_ERROR ) { - psError(PS_ERR_UNKNOWN,true,"Did not return status LOOKUP ERROR"); - return 10; - } - - // Interpolate with NULL table - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error NULL table"); - out1 = psLookupTableInterpolate(NULL,5,0,&status); - if( fabs(out1-NAN) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NAN returned %lf",out1); - return 11; - } - if ( status != PS_LOOKUP_ERROR ) { - psError(PS_ERR_UNKNOWN,true,"Did not return status LOOKUP ERROR"); - return 12; - } - - // Interpolate with status NULL - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error NULL status"); - out1 = psLookupTableInterpolate(table1,5,0,NULL); - if ( fabs(out1-NAN) > FLT_EPSILON ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NAN returned %lf",out1); - return 13; - } - - psFree(table1); - - return 0; -} - -psS32 testLookupTableInterpolateAll(void) -{ - psLookupTable* table1 = NULL; - psVector* interpValues; - psVector* statusVector; - - // Interpolate values within the list and verify return values - table1 = psLookupTableAlloc("table10.dat",0,20); - table1 = psLookupTableRead(table1); - statusVector = psVectorAlloc(table1->numCols,PS_TYPE_U32); - interpValues = psLookupTableInterpolateAll(table1,5.25, statusVector); - if(interpValues == NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned vector is NULL."); - return 1; - } - for(psS32 i = 0; i < table1->numRows-1; i++ ) { - if( fabs(interpValues->data.F64[i]-interpolVal1[i]) > errorTol_psF64) { - psError(PS_ERR_UNKNOWN,true,"Did not return expected value. %lg expected %lg", - interpValues->data.F64[i],interpolVal1[i]); - return 2*i; - } - } - for(psS32 j = 0; j < table1->numCols; j++) { - if(statusVector->data.U32[j] != PS_LOOKUP_SUCCESS) { - psError(PS_ERR_UNKNOWN,true,"Return status not success for col=%d status=%d", - j,statusVector->data.U32[j]); - return 3*j; - } - } - psFree(statusVector); - psFree(interpValues); - - // Interpolate values with index outside table - statusVector = psVectorAlloc(table1->numCols,PS_TYPE_U32); - interpValues = psLookupTableInterpolateAll(table1,0,statusVector); - if(interpValues == NULL) { - psError(PS_ERR_UNKNOWN,true,"Did return NULL"); - return 4; - } - - for(psS32 i = 0; i < table1->numRows-1; i++ ) { - if( fabs(interpValues->data.F64[i]-interpolVal3[i]) > errorTol_psF64) { - psError(PS_ERR_UNKNOWN,true,"Did not return expected value. %lg expected %lg", - interpValues->data.F64[i],interpolVal3[i]); - return 2*i; - } - } - - for(psS32 j = 0; j < table1->numCols; j++) { - if(statusVector->data.S32[j] != PS_LOOKUP_PAST_TOP) { - psError(PS_ERR_UNKNOWN,true,"Return status did not indicate passed top for col=%d status=%d", - j,statusVector->data.U32[j]); - return 3*j; - } - } - psFree(interpValues); - psFree(statusVector); - - // Interpolate values with NULL table - statusVector = psVectorAlloc(table1->numCols,PS_TYPE_S32); - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL table"); - interpValues = psLookupTableInterpolateAll(NULL,5,statusVector); - if(interpValues != NULL ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL table"); - return 5; - } - psFree(statusVector); - - // Interpolate values with NULL status vector - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL status vector"); - interpValues = psLookupTableInterpolateAll(table1,5,NULL); - if(interpValues != NULL ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL status vector"); - return 6; - } - psFree(table1); - - return 0; -} - Index: trunk/psLib/test/fileUtils/verified/table10.dat =================================================================== --- trunk/psLib/test/fileUtils/verified/table10.dat (revision 3690) +++ (revision ) @@ -1,14 +1,0 @@ -# Table with valid types and index-values -# -psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 -6 14 28 256 -6 -14 -28 -256 1.50 13.98 -10 22 44 4096 -10 -22 -44 -4096 4.50 27.30 -1 4 8 16 -1 -4 -8 -16 -2.25 -2.67 -3 8 16 32 -3 -8 -16 -32 -0.75 3.99 -9 20 40 2048 -9 -20 -40 -2048 3.75 23.97 -2 6 12 24 -2 -6 -12 -24 -1.5 0.66 -7 16 32 512 -7 -16 -32 -512 2.250 17.31 -4 10 20 64 -4 -10 -20 -64 0.00 7.32 -5 12 24 128 -5 -12 -24 -128 0.75 10.65 -8 18 36 1024 -8 -18 -36 -1024 3.00 20.64 -# Index: trunk/psLib/test/fileUtils/verified/table2.dat =================================================================== --- trunk/psLib/test/fileUtils/verified/table2.dat (revision 3690) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with invalid type in the type row but with valid index-values -# -psU8 psU16 psU32 psU64 psXS8 psS16 psS32 psS64 psF32 psF64 -0 2 4 8 0 -2 -4 -8 -0.5 -1.5 -1 4 8 16 -1 -4 -8 -16 0.0 -1.0 -2 6 12 24 -2 -6 -12 -24 0.5 -0.25 -3 8 16 32 -3 -8 -16 -32 0.75 1.75 -# Index: trunk/psLib/test/fileUtils/verified/table3.dat =================================================================== --- trunk/psLib/test/fileUtils/verified/table3.dat (revision 3690) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 -0 2 4 8 0 -2 -4 -8 -0.5 -1.5 -1) 4= 8; 1(6 -1_ -4$ -8@ -16{ 0.0[ -1.0] -2 6 12 24 -2 -6 -12 -24 0.5 -0.25 -3 8 16 32 -3 -8 -16 -32 0.75 1.75 -# Index: trunk/psLib/test/fileUtils/verified/tableF32.dat =================================================================== --- trunk/psLib/test/fileUtils/verified/tableF32.dat (revision 3690) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psF32 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psU8 psF64 --10.05 2 4 8 0 -2 -4 -8 5 -1.5 -1.009 4 8 16 -1 -4 -8 -16 0 -1.0 -23.45 6 12 24 -2 -6 -12 -24 5 -0.25 -3500.67 8 16 32 -3 -8 -16 -32 75 1.75 -# Index: trunk/psLib/test/fileUtils/verified/tableS32.dat =================================================================== --- trunk/psLib/test/fileUtils/verified/tableS32.dat (revision 3690) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psS32 psU16 psU32 psU64 psS8 psS16 psU8 psS64 psF32 psF64 --1 2 4 8 0 -2 99 -8 -0.5 -1.5 -11 4 8 16 -1 -4 100 -16 0.0 -1.0 -22 6 12 24 -2 -6 101 -24 0.5 -0.25 -33 8 16 32 -3 -8 102 -32 0.75 1.75 -# Index: trunk/psLib/test/fileUtils/verified/tableU8.dat =================================================================== --- trunk/psLib/test/fileUtils/verified/tableU8.dat (revision 3690) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 -0 2 4 8 0 -2 -4 -8 -0.5 -1.5 -1 4 8 16 -1 -4 -8 -16 0.0 -1.0 -2 6 12 24 -2 -6 -12 -24 0.5 -0.25 -3 8 16 32 -3 -8 -16 -32 0.75 1.75 -# Index: trunk/psLib/test/fileUtils/verified/tst_psDB.stderr =================================================================== --- trunk/psLib/test/fileUtils/verified/tst_psDB.stderr (revision 3690) +++ (revision ) @@ -1,305 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_psDB.c * -* TestPoint: psDB{dbInit} * -* TestType: Positive * -\**********************************************************************************/ - -