Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2428)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2429)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-11-22 20:54:50 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-24 20:16:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -110,5 +110,8 @@
     // Test B - Set iterator at second index
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Set iterator at second index");
-    psMetadataSetIterator(metadata, 2);
+    if ( !psMetadataSetIterator(metadata, 2)) {
+        psError(PS_ERR_UNKNOWN,true,"Failed to set iterator");
+        return 100;
+    }
     printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true);
 
@@ -201,8 +204,14 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use null metadata with setIterator",
                             "Null metadata collection not allowed", 0);
-    psMetadataSetIterator(NULL, 0);
+    if( psMetadataSetIterator(NULL, 0)) {
+        psError(PS_ERR_UNKNOWN,true,"Set iterator did not detect invalid parameter.");
+        return 101;
+    }
     tmpList = metadata->list;
     metadata->list = NULL;
-    psMetadataSetIterator(metadata,0);
+    if( psMetadataSetIterator(metadata,0)) {
+        psError(PS_ERR_UNKNOWN,true,"Set iterator did not detect null list.");
+        return 102;
+    }
     metadata->list = tmpList;
     printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
Index: /trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2428)
+++ /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2429)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-11-22 20:54:50 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-11-24 20:16:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -110,5 +110,8 @@
     // Test B - Set iterator at second index
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Set iterator at second index");
-    psMetadataSetIterator(metadata, 2);
+    if ( !psMetadataSetIterator(metadata, 2)) {
+        psError(PS_ERR_UNKNOWN,true,"Failed to set iterator");
+        return 100;
+    }
     printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true);
 
@@ -201,8 +204,14 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use null metadata with setIterator",
                             "Null metadata collection not allowed", 0);
-    psMetadataSetIterator(NULL, 0);
+    if( psMetadataSetIterator(NULL, 0)) {
+        psError(PS_ERR_UNKNOWN,true,"Set iterator did not detect invalid parameter.");
+        return 101;
+    }
     tmpList = metadata->list;
     metadata->list = NULL;
-    psMetadataSetIterator(metadata,0);
+    if( psMetadataSetIterator(metadata,0)) {
+        psError(PS_ERR_UNKNOWN,true,"Set iterator did not detect null list.");
+        return 102;
+    }
     metadata->list = tmpList;
     printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);