Index: trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1389)
+++ trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1394)
@@ -7,20 +7,14 @@
 *     Test B - Read 2nd hdr from complex FITS file
 *     Test C - Read named hdr from complex FITS file
-*     D
-*     E
-*     F
-*     G
-*     H
-*     I
-*     J
-*     K
-*     L
-*     M
-*     N
+*     Test D - Attempt to use null file descriptor
+*     Test E - Attempt to use two null inputs
+*     Test F - Attempt to use bad extNum/
+*     Test G - Attempt to use bad extNameTest
+*     Test H - Free psMetadataData
 *
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-05 02:25:23 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-05 20:55:34 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -31,25 +25,4 @@
 #include "psTest.h"
 #include <string.h>
-
-void printListInt(psList* list)
-{
-    int* data = NULL;
-    bool first = true;
-
-    psListSetIterator(list,PS_LIST_HEAD);
-    data = psListGetCurrent(list);
-
-    while ( data != NULL ) {
-        if (!first) {
-            printf(", %d",*(int*)data);
-        } else {
-            printf("%d",*(int*)data);
-            first = false;
-        }
-        data = psListGetNext(list);
-    }
-
-    printf(".\n");
-}
 
 static void printMetadata(psMetadata *metadata)
@@ -187,5 +160,5 @@
 
 
-    //Test C - Read named hdr from complex FITS file
+    // 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);
@@ -199,5 +172,33 @@
 
 
-    // Test - Free psMetadata
+    // Test D - Attempt to use null file descriptor
+    printNegativeTestHeader(stdout,"psMetadata", "Test D - Attempt to use null file descriptor",
+                            "Null FITS file descriptor not allowed", 0);
+    psMetadataFReadHeader(NULL, NULL, 1, NULL);
+    printFooter(stdout, "psMetadata", "Test D - Attempt to use null file descriptor", true);
+
+
+    // Test E - Attempt to use two null inputs
+    printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to use two null inputs",
+                            "Null extName and extNum = 0 not allowed", 0);
+    psMetadataFReadHeader(NULL, NULL, 0, fptr);
+    printFooter(stdout, "psMetadata", "Test E - Attempt to use two null inputs", true);
+
+
+    // Test F - Attempt to use bad extNum
+    printNegativeTestHeader(stdout,"psMetadata", "Test F - 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 F - Attempt to use bad extNum", true);
+
+
+    // Test G - Attempt to use bad extName
+    printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to use bad extName",
+                            "FITS error while locating header AARGH: illegal HDU number", 0);
+    psMetadataFReadHeader(metadata1, "AARGH", 0, fptr);
+    printFooter(stdout, "psMetadata", "Test F - Attempt to use bad extName", true);
+
+
+    // Test H - Free psMetadata
     printPositiveTestHeader(stdout, "psMetadata", "Test - Free psMetadata");
     psFree(metadata1);