Index: /trunk/psLib/test/types/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_01.c (revision 7266) +++ /trunk/psLib/test/types/tst_psMetadata_01.c (revision 7267) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-26 21:13:33 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-06-01 21:59:05 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,10 +28,10 @@ #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) { @@ -41,19 +41,19 @@ printMetadataTable(metadata->hash); } - + 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) { @@ -68,10 +68,10 @@ } } - + 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_DATA_METADATA_MULTI: @@ -97,17 +97,17 @@ } printf("Key Comment: %s\n", metadataItem->comment); - + if(metadataItem->data.V && metadataItem->type==PS_DATA_METADATA_MULTI) { printMetadataList(metadataItem->data.V, " "); } } - +*/ psS32 main(psS32 argc, char* argv[]) { - psMetadata *metadata1 = NULL; - psMetadata *metadata2 = NULL; - psMetadata *metadata3 = NULL; - + /* psMetadata *metadata1 = NULL; + psMetadata *metadata2 = NULL; + psMetadata *metadata3 = NULL; + */ // Test A - Read 1st hdr from simple FITS file @@ -121,9 +121,10 @@ 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); - + /* printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file"); + // metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits"); + metadata1 = psFitsReadHeader(metadata1, "header_1.fits"); + printMetadata(metadata1); + printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true); + */ // Test B - Read 2nd hdr from complex FITS file @@ -167,93 +168,101 @@ */ - 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); - - // 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); - + /* printPositiveTestHeader(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file"); + // metadata2 = psMetadataReadHeader(metadata2, NULL, 2, "header_2.fits"); + metadata2 = psFitsReadHeader(metadata2, "header_2.fits"); + printMetadata(metadata2); + printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true); + + // 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"); + metadata3 = psFitsReadHeader(metadata3, "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); + psFitsReadHeader(NULL, 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"); + psFitsReadHeader(NULL, "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"); + psFitsReadHeader(NULL, "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"); + metadata1 = psFitsReadHeader(metadata1, "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"); + metadata1 = psFitsReadHeader(NULL, "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"); + metadata1 = psFitsReadHeader(metadata1, "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; }