Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2635)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2636)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-03 23:19:07 $
+*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-06 19:59:39 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -113,6 +113,6 @@
         }
         printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true);
-     
-     
+
+
         // Test C - Get next item at index
         printPositiveTestHeader(stdout, "psMetadata", "Test C - Get next item at index");
@@ -124,6 +124,6 @@
         }
         printFooter(stdout, "psMetadata", "Test C - Get next item at index", true);
-     
-     
+
+
         // Test D - Get next item at index and string
         printPositiveTestHeader(stdout, "psMetadata", "Test D - Get next item at index and string");
@@ -135,6 +135,6 @@
         }
         printFooter(stdout, "psMetadata", "Test D - Get next item at index and string", true);
-     
-     
+
+
         // Test E - Get previous item at index
         printPositiveTestHeader(stdout, "psMetadata", "Test E - Get previous item at index");
@@ -157,5 +157,5 @@
         metadata->list = tmpList;
         printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true);
-     
+
     */
     // Test F - Write metadata item to file
@@ -165,11 +165,36 @@
         printf("ERROR: Couldn't open file for writing\n");
     }
-    psMetadataItemPrint(fd, "S32 = %ld\n", item2);
-    psMetadataItemPrint(fd, "BOL = %ld\n", item3);
-    psMetadataItemPrint(fd, "F32 = %g\n", item5);
-    psMetadataItemPrint(fd, "F64 = %g\n", item6);
-    psMetadataItemPrint(fd, "STR = %s\n", item7);
-    psMetadataItemPrint(fd, "UNK = \n", item8);
+
+    if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 10;
+    }
+
+    if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 11;
+    }
+
+    if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 12;
+    }
+
+    if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 13;
+    }
+
+    if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 14;
+    }
+
+    if (psMetadataItemPrint(fd, "UNK = \n", item8) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 15;
+    }
     fclose(fd);
+
     fd = fopen("./tst_psMetadata05_OUT", "r");
     if(fd == NULL) {
@@ -226,6 +251,6 @@
         metadata->list = tmpList;
         printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
-     
-     
+
+
         // Test H - Attempt to use null metadata with getNext
         printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext",
@@ -242,8 +267,8 @@
         }
         metadata->list = tmpList;
-     
+
         printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true);
-     
-     
+
+
         // Test I - Attempt to use null metadata with getPrevious
         printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use null metadata with getPrevious",
@@ -251,5 +276,5 @@
         psMetadataGetPrevious(NULL, "myItem2", 0);
         printFooter(stdout, "psMetadata", "Test I - Attempt to use null metadata with getPrevious", true);
-     
+
     */
     // Test J - Attempt to use null file with itemPrint
Index: /trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2635)
+++ /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2636)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-03 23:19:07 $
+*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-06 19:59:39 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -113,6 +113,6 @@
         }
         printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true);
-     
-     
+
+
         // Test C - Get next item at index
         printPositiveTestHeader(stdout, "psMetadata", "Test C - Get next item at index");
@@ -124,6 +124,6 @@
         }
         printFooter(stdout, "psMetadata", "Test C - Get next item at index", true);
-     
-     
+
+
         // Test D - Get next item at index and string
         printPositiveTestHeader(stdout, "psMetadata", "Test D - Get next item at index and string");
@@ -135,6 +135,6 @@
         }
         printFooter(stdout, "psMetadata", "Test D - Get next item at index and string", true);
-     
-     
+
+
         // Test E - Get previous item at index
         printPositiveTestHeader(stdout, "psMetadata", "Test E - Get previous item at index");
@@ -157,5 +157,5 @@
         metadata->list = tmpList;
         printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true);
-     
+
     */
     // Test F - Write metadata item to file
@@ -165,11 +165,36 @@
         printf("ERROR: Couldn't open file for writing\n");
     }
-    psMetadataItemPrint(fd, "S32 = %ld\n", item2);
-    psMetadataItemPrint(fd, "BOL = %ld\n", item3);
-    psMetadataItemPrint(fd, "F32 = %g\n", item5);
-    psMetadataItemPrint(fd, "F64 = %g\n", item6);
-    psMetadataItemPrint(fd, "STR = %s\n", item7);
-    psMetadataItemPrint(fd, "UNK = \n", item8);
+
+    if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 10;
+    }
+
+    if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 11;
+    }
+
+    if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 12;
+    }
+
+    if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 13;
+    }
+
+    if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 14;
+    }
+
+    if (psMetadataItemPrint(fd, "UNK = \n", item8) == false) {
+        printf("ERROR: Return type should be trye\n");
+        return 15;
+    }
     fclose(fd);
+
     fd = fopen("./tst_psMetadata05_OUT", "r");
     if(fd == NULL) {
@@ -226,6 +251,6 @@
         metadata->list = tmpList;
         printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
-     
-     
+
+
         // Test H - Attempt to use null metadata with getNext
         printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext",
@@ -242,8 +267,8 @@
         }
         metadata->list = tmpList;
-     
+
         printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true);
-     
-     
+
+
         // Test I - Attempt to use null metadata with getPrevious
         printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use null metadata with getPrevious",
@@ -251,5 +276,5 @@
         psMetadataGetPrevious(NULL, "myItem2", 0);
         printFooter(stdout, "psMetadata", "Test I - Attempt to use null metadata with getPrevious", true);
-     
+
     */
     // Test J - Attempt to use null file with itemPrint