Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 1621)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 1622)
@@ -8,14 +8,15 @@
 *     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 use two null inputs
-*     Test G - Attempt to use bad extNum/
-*     Test H - Attempt to use bad extNameTest
-*     Test I - Free psMetadataData
+*     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 - Free psMetadataData
 *
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-12 01:08:39 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-25 20:22:15 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -117,10 +118,7 @@
 int main(int argc, char* argv[])
 {
-    int status = 0;
-    char fitsErr[ 256 ];
     psMetadata *metadata1 = NULL;
     psMetadata *metadata2 = NULL;
     psMetadata *metadata3 = NULL;
-    fitsfile *fptr;
 
 
@@ -136,9 +134,5 @@
     */
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file");
-    fits_open_file(&fptr, "header_1.fits", READONLY, &status);
-    fits_get_errstatus( status, fitsErr );
-    status = 0;
-    printf("FITS file open status: %s\n\n",fitsErr);
-    metadata1 = psMetadataFReadHeader(metadata1, NULL, 1, fptr);
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits");
     printMetadata(metadata1);
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
@@ -187,9 +181,5 @@
     */
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file");
-    fits_open_file(&fptr, "header_2.fits", READONLY, &status);
-    fits_get_errstatus( status, fitsErr );
-    status = 0;
-    printf("FITS file open status: %s\n\n",fitsErr);
-    metadata2 = psMetadataFReadHeader(metadata2, NULL, 2, fptr);
+    metadata2 = psMetadataReadHeader(metadata2, NULL, 2, "header_2.fits");
     printMetadata(metadata2);
     printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
@@ -198,9 +188,5 @@
     // Test C - Read named hdr from complex FITS file
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
-    fits_open_file(&fptr, "header_2.fits", READONLY, &status);
-    fits_get_errstatus( status, fitsErr );
-    status = 0;
-    printf("FITS file open status: %s\n\n",fitsErr);
-    metadata3 = psMetadataFReadHeader(metadata3, "MY_DATA_2", 0, fptr);
+    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", 0, "header_2.fits");
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
@@ -215,34 +201,41 @@
 
 
-    // Test E - Attempt to use null file descriptor
-    printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null file descriptor",
-                            "Null FITS file descriptor not allowed", 0);
-    psMetadataFReadHeader(NULL, NULL, 1, NULL);
-    printFooter(stdout, "psMetadata", "Test E - Attempt to use null file descriptor", true);
-
-
-    // Test F - Attempt to use two null inputs
-    printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to use two null inputs",
+    // 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);
-    psMetadataFReadHeader(NULL, NULL, 0, fptr);
-    printFooter(stdout, "psMetadata", "Test F - Attempt to use two null inputs", true);
-
-
-    // Test G - Attempt to use bad extNum
-    printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use bad extNum",
+    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);
-    psMetadataFReadHeader(metadata1, NULL, 22, fptr);
-    printFooter(stdout, "psMetadata", "Test G - Attempt to use bad extNum", true);
-
-
-    // Test H - Attempt to use bad extName
-    printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extName",
+    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    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);
-    psMetadataFReadHeader(metadata1, "AARGH", 0, fptr);
-    printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extName", true);
-
-
-    // Test I- Free psMetadata
-    printPositiveTestHeader(stdout, "psMetadata", "Test I - Free psMetadata");
+    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
+    printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
+
+
+    // Test J - Free psMetadata
+    printPositiveTestHeader(stdout, "psMetadata", "Test J - Free psMetadata");
     psFree(metadata1);
     psFree(metadata2);
@@ -254,5 +247,5 @@
         printf("ERROR: Found %d bad memory blocks\n", nBad);
     }
-    printFooter(stdout, "psMetadata", "Test I - Free psMetadata", true);
+    printFooter(stdout, "psMetadata", "Test J - Free psMetadata", true);
 
     return 0;
Index: /trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1621)
+++ /trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1622)
@@ -8,14 +8,15 @@
 *     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 use two null inputs
-*     Test G - Attempt to use bad extNum/
-*     Test H - Attempt to use bad extNameTest
-*     Test I - Free psMetadataData
+*     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 - Free psMetadataData
 *
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-12 01:08:39 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-25 20:22:15 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -117,10 +118,7 @@
 int main(int argc, char* argv[])
 {
-    int status = 0;
-    char fitsErr[ 256 ];
     psMetadata *metadata1 = NULL;
     psMetadata *metadata2 = NULL;
     psMetadata *metadata3 = NULL;
-    fitsfile *fptr;
 
 
@@ -136,9 +134,5 @@
     */
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file");
-    fits_open_file(&fptr, "header_1.fits", READONLY, &status);
-    fits_get_errstatus( status, fitsErr );
-    status = 0;
-    printf("FITS file open status: %s\n\n",fitsErr);
-    metadata1 = psMetadataFReadHeader(metadata1, NULL, 1, fptr);
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits");
     printMetadata(metadata1);
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
@@ -187,9 +181,5 @@
     */
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file");
-    fits_open_file(&fptr, "header_2.fits", READONLY, &status);
-    fits_get_errstatus( status, fitsErr );
-    status = 0;
-    printf("FITS file open status: %s\n\n",fitsErr);
-    metadata2 = psMetadataFReadHeader(metadata2, NULL, 2, fptr);
+    metadata2 = psMetadataReadHeader(metadata2, NULL, 2, "header_2.fits");
     printMetadata(metadata2);
     printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
@@ -198,9 +188,5 @@
     // Test C - Read named hdr from complex FITS file
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
-    fits_open_file(&fptr, "header_2.fits", READONLY, &status);
-    fits_get_errstatus( status, fitsErr );
-    status = 0;
-    printf("FITS file open status: %s\n\n",fitsErr);
-    metadata3 = psMetadataFReadHeader(metadata3, "MY_DATA_2", 0, fptr);
+    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", 0, "header_2.fits");
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
@@ -215,34 +201,41 @@
 
 
-    // Test E - Attempt to use null file descriptor
-    printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use null file descriptor",
-                            "Null FITS file descriptor not allowed", 0);
-    psMetadataFReadHeader(NULL, NULL, 1, NULL);
-    printFooter(stdout, "psMetadata", "Test E - Attempt to use null file descriptor", true);
-
-
-    // Test F - Attempt to use two null inputs
-    printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to use two null inputs",
+    // 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);
-    psMetadataFReadHeader(NULL, NULL, 0, fptr);
-    printFooter(stdout, "psMetadata", "Test F - Attempt to use two null inputs", true);
-
-
-    // Test G - Attempt to use bad extNum
-    printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use bad extNum",
+    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);
-    psMetadataFReadHeader(metadata1, NULL, 22, fptr);
-    printFooter(stdout, "psMetadata", "Test G - Attempt to use bad extNum", true);
-
-
-    // Test H - Attempt to use bad extName
-    printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extName",
+    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    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);
-    psMetadataFReadHeader(metadata1, "AARGH", 0, fptr);
-    printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extName", true);
-
-
-    // Test I- Free psMetadata
-    printPositiveTestHeader(stdout, "psMetadata", "Test I - Free psMetadata");
+    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
+    printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
+
+
+    // Test J - Free psMetadata
+    printPositiveTestHeader(stdout, "psMetadata", "Test J - Free psMetadata");
     psFree(metadata1);
     psFree(metadata2);
@@ -254,5 +247,5 @@
         printf("ERROR: Found %d bad memory blocks\n", nBad);
     }
-    printFooter(stdout, "psMetadata", "Test I - Free psMetadata", true);
+    printFooter(stdout, "psMetadata", "Test J - Free psMetadata", true);
 
     return 0;