Index: /trunk/psLib/test/types/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadataIO.c (revision 7376) +++ /trunk/psLib/test/types/tst_psMetadataIO.c (revision 7377) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-05-25 23:58:57 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-06-07 01:39:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,5 +29,4 @@ static psS32 testMetadataParseConfig3(void); static psS32 testMetadataParseConfig4(void); -static psS32 testMetadataPrint(void); testDescription tests[] = { @@ -37,5 +36,4 @@ {testMetadataParseConfig3,3,"psMetadataConfigParse3",0,false}, {testMetadataParseConfig4,4,"psMetadataConfigParse4",0,false}, - {testMetadataPrint,666,"psMetadataPrint",0,false}, {NULL} }; @@ -50,5 +48,4 @@ static psBool checkItemType(psMetadataItem* mdItem, psS32 expectedType, char* configFile); static psBool checkItemComment(psMetadataItem* mdItem, char* expectedComment, char* configFile); -static psMetadata *setupMeta(void); #define ERROR_TOL 0.0001 @@ -239,18 +236,4 @@ 0, 0, 0, 24 }; - -static psMetadata *setupMeta(void) -{ - psMetadata *md = NULL; - md = psMetadataAlloc(); - - psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true); - psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55); - psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14); - psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28); - psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS"); - - return md; -} static void writeMetadata(psMetadata* metadata, char* indentStr) @@ -1037,10 +1020,2 @@ } -psS32 testMetadataPrint(void) -{ - psMetadata *meta = NULL; - meta = setupMeta(); - psMetadataPrint(meta, 0); - psFree(meta); - return 0; -} Index: /trunk/psLib/test/types/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_01.c (revision 7376) +++ /trunk/psLib/test/types/tst_psMetadata_01.c (revision 7377) @@ -3,21 +3,8 @@ * @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 dRob, MHPCC * -* @author Ross Harman, MHPCC -* -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-06-06 22:54:22 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-06-07 01:39:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,7 +17,9 @@ static psS32 testMetadataItemCopy(void); +static psS32 testMetadataPrint(void); testDescription tests[] = { {testMetadataItemCopy, 666, "psMetadataItemCopy()", 0, false}, + {testMetadataPrint,667,"psMetadataPrint",0,false}, {NULL} }; @@ -42,4 +31,18 @@ return ( !runTestSuite(stderr,"psMetadata_01",tests,argc,argv) ); +} + +static psMetadata *setupMeta(void) +{ + psMetadata *md = NULL; + md = psMetadataAlloc(); + + psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true); + psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55); + psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14); + psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28); + psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS"); + + return md; } @@ -80,5 +83,4 @@ psMetadataAddF32(metadata, PS_LIST_TAIL, "item02", 0, NULL, 3.14); item = psMetadataItemAlloc("metaItem2", PS_DATA_METADATA, "newMeta", metadata); - // item->data.md = psMetadataCopy(item->data.md, metadata); item2 = psMetadataItemCopy(item); if (item2 == NULL || item2->data.md == NULL) { @@ -108,2 +110,10 @@ } +psS32 testMetadataPrint(void) +{ + psMetadata *meta = NULL; + meta = setupMeta(); + psMetadataPrint(meta, 0); + psFree(meta); + return 0; +} Index: /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr (revision 7376) +++ /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr (revision 7377) @@ -182,11 +182,2 @@ ---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse4} | tst_psMetadataIO.c) -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_psMetadataIO.c * -* TestPoint: psMetadataConfigParse{psMetadataPrint} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (psMetadataConfigParse{psMetadataPrint} | tst_psMetadataIO.c) - Index: /trunk/psLib/test/types/verified/tst_psMetadataIO.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadataIO.stdout (revision 7376) +++ /trunk/psLib/test/types/verified/tst_psMetadataIO.stdout (revision 7377) @@ -221,7 +221,2 @@ c STR z END -item1 (I am a boolean): True -item2 (I am a integer): 55 -item3 (I am a float): 3.140000 -item4 (I am a double): 6.280000 -item5 (I am a string): GNIRTS Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stderr =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_01.stderr (revision 7376) +++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stderr (revision 7377) @@ -12,2 +12,11 @@ ---> TESTPOINT PASSED (psMetadata_01{psMetadataItemCopy()} | tst_psMetadata_01.c) +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMetadata_01.c * +* TestPoint: psMetadata_01{psMetadataPrint} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psMetadata_01{psMetadataPrint} | tst_psMetadata_01.c) + Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout (revision 7376) +++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout (revision 7377) @@ -0,0 +1,5 @@ +item1 (I am a boolean): True +item2 (I am a integer): 55 +item3 (I am a float): 3.140000 +item4 (I am a double): 6.280000 +item5 (I am a string): GNIRTS