Changeset 1994

Timestamp:

Oct 6, 2004, 4:01:44 PM (22 years ago)

Author:

evanalst

Message:

Add additional test for valid extName and extNum not equal to -1.

Location:

trunk/psLib/test

Files:

• astronomy/tst_psMetadata_01.c (modified) (4 diffs)
• astronomy/verified/tst_psMetadata_01.stderr (modified) (1 diff)
• astronomy/verified/tst_psMetadata_01.stdout (modified) (1 diff)
• collections/tst_psMetadata_01.c (modified) (4 diffs)

trunk/psLib/test/astronomy/tst_psMetadata_01.c

@@ -17 +17 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-06 01:08:17 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-07 02:01:44 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -188 +188 @@
     // 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", 0, "header_2.fits");
+    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);
@@ -225 +225 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum",
                             "FITS error while locating header 22: tried to move past end of file", 0);
-    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null when invalid ext given.");
+        return 10;
+    }
     printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true);
 
@@ -232 +236 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName",
                             "FITS error while locating header AARGH: illegal HDU number", 0);
-    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
+    metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null invalid extname give.");
+        return 11;
+    }
     printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
+
+
+    // Test I1 - Attempt to use a valid named extension with invalid extnum
+    printNegativeTestHeader(stdout, "psMetadata", "Test I1 - Read named hdr w/ invalid extnum",
+                            "If extName specified, extNum should be -1.", 0);
+    metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
+        return 12;
+    }
+    printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
 
 

trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr

@@ -11 +11 @@
 <DATE><TIME>|<HOST>|E|psMetadataReadHeader
     FITS error while locating header AARGH: illegal HDU number
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    If extName specified, extNum arguments should be -1.

trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout

@@ -173 +173 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test I1 - Read named hdr w/ invalid extnum}     *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: If extName specified, extNum should be -1.                 *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
 *            TestPoint: psMetadata{Test J - Free psMetadata}                       *
 *             TestType: Positive                                                   *

trunk/psLib/test/collections/tst_psMetadata_01.c

@@ -17 +17 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-06 01:08:17 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-07 02:01:44 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -188 +188 @@
     // 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", 0, "header_2.fits");
+    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);
@@ -225 +225 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum",
                             "FITS error while locating header 22: tried to move past end of file", 0);
-    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null when invalid ext given.");
+        return 10;
+    }
     printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true);
 
@@ -232 +236 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName",
                             "FITS error while locating header AARGH: illegal HDU number", 0);
-    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
+    metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null invalid extname give.");
+        return 11;
+    }
     printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
+
+
+    // Test I1 - Attempt to use a valid named extension with invalid extnum
+    printNegativeTestHeader(stdout, "psMetadata", "Test I1 - Read named hdr w/ invalid extnum",
+                            "If extName specified, extNum should be -1.", 0);
+    metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
+        return 12;
+    }
+    printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);