Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2048)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2049)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-09 03:11:45 $
+*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-12 01:40:32 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -84,4 +84,5 @@
     FILE *fd = NULL;
     char str[7];
+    psList* tmpList = NULL;
 
     // Test A - Allocate metadata and items
@@ -143,4 +144,15 @@
         printf("Found item named %s\n", item->name);
     }
+    if( psMetadataGetPrevious(metadata,"myItem3",1) == NULL) {
+        psError(__func__,"psMetadataGetPrevious did not return an item from metadata.");
+        return 45;
+    }
+    tmpList = metadata->list;
+    metadata->list = NULL;
+    if ( psMetadataGetPrevious(metadata,NULL,1) != NULL) {
+        psError(__func__,"psMetadataGetPrevious did not return null for invalid metadata.");
+        return 50;
+    }
+    metadata->list = tmpList;
     printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true);
 
@@ -190,4 +202,8 @@
                             "Null metadata collection not allowed", 0);
     psMetadataSetIterator(NULL, 0);
+    tmpList = metadata->list;
+    metadata->list = NULL;
+    psMetadataSetIterator(metadata,0);
+    metadata->list = tmpList;
     printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
 
@@ -196,5 +212,16 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext",
                             "Null metadata collection not allowed", 0);
-    psMetadataGetNext(NULL, "myItem2", 0);
+    if( psMetadataGetNext(NULL, "myItem2", 0) != NULL ) {
+        psError(__func__,"psMetadataGetNext did not return null for null metadata.");
+        return 40;
+    }
+    tmpList = metadata->list;
+    metadata->list = NULL;
+    if ( psMetadataGetNext(metadata, "myItem2", 0) != NULL ) {
+        psError(__func__,"psMetadataGetNext did not return null for invalid metadata.");
+        return 41;
+    }
+    metadata->list = tmpList;
+
     printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true);
 
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2048)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2049)
@@ -1,10 +1,16 @@
 <DATE><TIME>|<HOST>|E|psMetadataItemAllocV
     Invalid psMetadataType: 11
+<DATE><TIME>|<HOST>|E|psMetadataGetPrevious
+    Null metadata list not allowed
 <DATE><TIME>|<HOST>|E|psMetadataItemPrint
      Invalid psMetadataType to print: 11
 <DATE><TIME>|<HOST>|E|psMetadataSetIterator
     Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataSetIterator
+    Null metadata list not allowed
 <DATE><TIME>|<HOST>|E|psMetadataGetNext
     Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGetNext
+    Null metadata list not allowed
 <DATE><TIME>|<HOST>|E|psMetadataGetPrevious
     Null metadata collection not allowed
Index: /trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2048)
+++ /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2049)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-09 03:11:45 $
+*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-12 01:40:32 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -84,4 +84,5 @@
     FILE *fd = NULL;
     char str[7];
+    psList* tmpList = NULL;
 
     // Test A - Allocate metadata and items
@@ -143,4 +144,15 @@
         printf("Found item named %s\n", item->name);
     }
+    if( psMetadataGetPrevious(metadata,"myItem3",1) == NULL) {
+        psError(__func__,"psMetadataGetPrevious did not return an item from metadata.");
+        return 45;
+    }
+    tmpList = metadata->list;
+    metadata->list = NULL;
+    if ( psMetadataGetPrevious(metadata,NULL,1) != NULL) {
+        psError(__func__,"psMetadataGetPrevious did not return null for invalid metadata.");
+        return 50;
+    }
+    metadata->list = tmpList;
     printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true);
 
@@ -190,4 +202,8 @@
                             "Null metadata collection not allowed", 0);
     psMetadataSetIterator(NULL, 0);
+    tmpList = metadata->list;
+    metadata->list = NULL;
+    psMetadataSetIterator(metadata,0);
+    metadata->list = tmpList;
     printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
 
@@ -196,5 +212,16 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext",
                             "Null metadata collection not allowed", 0);
-    psMetadataGetNext(NULL, "myItem2", 0);
+    if( psMetadataGetNext(NULL, "myItem2", 0) != NULL ) {
+        psError(__func__,"psMetadataGetNext did not return null for null metadata.");
+        return 40;
+    }
+    tmpList = metadata->list;
+    metadata->list = NULL;
+    if ( psMetadataGetNext(metadata, "myItem2", 0) != NULL ) {
+        psError(__func__,"psMetadataGetNext did not return null for invalid metadata.");
+        return 41;
+    }
+    metadata->list = tmpList;
+
     printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true);