Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2038)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2039)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-08 00:48:01 $
+*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-09 03:05:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -71,12 +71,17 @@
 {
     long data;
+    psF32 fpdata;
     psMetadataItem *item1 = NULL;
     psMetadataItem *item2 = NULL;
     psMetadataItem *item3 = NULL;
     psMetadataItem *item4 = NULL;
+    psMetadataItem *item5 = NULL;
+    psMetadataItem *item6 = NULL;
+    psMetadataItem *item7 = NULL;
+    psMetadataItem *item8 = NULL;
     psMetadataItem *item = NULL;
     psMetadata *metadata = NULL;
     FILE *fd = NULL;
-
+    char str[7];
 
     // Test A - Allocate metadata and items
@@ -87,4 +92,8 @@
     item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
     item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
+    item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14);
+    item6 = psMetadataItemAlloc("myItem6", PS_META_F64, "I am a double", 6.28);
+    item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS");
+    item8 = psMetadataItemAlloc("myItem8", PS_META_UNKNOWN, "I am unknown");
     printMetadataItem(item1);
     printMetadataItem(item2);
@@ -143,5 +152,10 @@
         printf("ERROR: Couldn't open file for writing\n");
     }
-    psMetadataItemPrint(fd, "%ld", item2);
+    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);
     printFooter(stdout, "psMetadata", "Test F - Write metadata item to file", true);
     fclose(fd);
@@ -150,10 +164,25 @@
         printf("ERROR: Couldn't open file for reading\n");
     }
-    fscanf(fd, "%ld", &data);
-    fclose(fd);
+    fscanf(fd, "S32 = %ld\n", &data);
     if(data != 55) {
         printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 55.\n", data);
     }
-
+    fscanf(fd, "BOL = %ld\n", &data);
+    if(data != 0) {
+        printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 0.\n", data);
+    }
+    fscanf(fd, "F32 = %g\n", &fpdata);
+    if ( (fpdata <= 3.1) || (fpdata >= 3.2) ) {
+        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 3.14.\n", fpdata);
+    }
+    fscanf(fd, "F64 = %g\n", &fpdata);
+    if ( (fpdata <= 6.2) || ( fpdata >= 6.3) ) {
+        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 6.28.\n", fpdata);
+    }
+    fscanf(fd, "STR = %s\n", str);
+    if ( strcmp(str,"GNIRTS") != 0 ) {
+        printf("ERROR: Data is file is not as expected. Value: %s. Should be: GNIRTS.\n", str);
+    }
+    fclose(fd);
 
     // Test G - Attempt to use null metadata with setIterator
@@ -206,4 +235,8 @@
     psFree(item3);
     psFree(item4);
+    psFree(item5);
+    psFree(item6);
+    psFree(item7);
+    psFree(item8);
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2038)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2039)
@@ -1,2 +1,6 @@
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
+    Invalid psMetadataType: 11
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+     Invalid psMetadataType to print: 11
 <DATE><TIME>|<HOST>|E|psMetadataSetIterator
     Null metadata collection not allowed
Index: /trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2038)
+++ /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2039)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-08 00:48:01 $
+*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-09 03:05:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -71,12 +71,17 @@
 {
     long data;
+    psF32 fpdata;
     psMetadataItem *item1 = NULL;
     psMetadataItem *item2 = NULL;
     psMetadataItem *item3 = NULL;
     psMetadataItem *item4 = NULL;
+    psMetadataItem *item5 = NULL;
+    psMetadataItem *item6 = NULL;
+    psMetadataItem *item7 = NULL;
+    psMetadataItem *item8 = NULL;
     psMetadataItem *item = NULL;
     psMetadata *metadata = NULL;
     FILE *fd = NULL;
-
+    char str[7];
 
     // Test A - Allocate metadata and items
@@ -87,4 +92,8 @@
     item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
     item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
+    item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14);
+    item6 = psMetadataItemAlloc("myItem6", PS_META_F64, "I am a double", 6.28);
+    item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS");
+    item8 = psMetadataItemAlloc("myItem8", PS_META_UNKNOWN, "I am unknown");
     printMetadataItem(item1);
     printMetadataItem(item2);
@@ -143,5 +152,10 @@
         printf("ERROR: Couldn't open file for writing\n");
     }
-    psMetadataItemPrint(fd, "%ld", item2);
+    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);
     printFooter(stdout, "psMetadata", "Test F - Write metadata item to file", true);
     fclose(fd);
@@ -150,10 +164,25 @@
         printf("ERROR: Couldn't open file for reading\n");
     }
-    fscanf(fd, "%ld", &data);
-    fclose(fd);
+    fscanf(fd, "S32 = %ld\n", &data);
     if(data != 55) {
         printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 55.\n", data);
     }
-
+    fscanf(fd, "BOL = %ld\n", &data);
+    if(data != 0) {
+        printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 0.\n", data);
+    }
+    fscanf(fd, "F32 = %g\n", &fpdata);
+    if ( (fpdata <= 3.1) || (fpdata >= 3.2) ) {
+        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 3.14.\n", fpdata);
+    }
+    fscanf(fd, "F64 = %g\n", &fpdata);
+    if ( (fpdata <= 6.2) || ( fpdata >= 6.3) ) {
+        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 6.28.\n", fpdata);
+    }
+    fscanf(fd, "STR = %s\n", str);
+    if ( strcmp(str,"GNIRTS") != 0 ) {
+        printf("ERROR: Data is file is not as expected. Value: %s. Should be: GNIRTS.\n", str);
+    }
+    fclose(fd);
 
     // Test G - Attempt to use null metadata with setIterator
@@ -206,4 +235,8 @@
     psFree(item3);
     psFree(item4);
+    psFree(item5);
+    psFree(item6);
+    psFree(item7);
+    psFree(item8);
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);