Changeset 2981

Timestamp:

Jan 13, 2005, 11:45:13 AM (22 years ago)

Author:

evanalst

Message:

Update the test driver for print invalid metadata type.

Location:

trunk/psLib/test

Files:

• astronomy/tst_psMetadata_05.c (modified) (2 diffs)
• astronomy/verified/tst_psMetadata_05.stderr (modified) (1 diff)
• collections/tst_psMetadata_05.c (modified) (2 diffs)

trunk/psLib/test/astronomy/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-06 19:59:39 $
+*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-01-13 21:45:13 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -167 +167 @@
 
     if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 10;
     }
 
     if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 11;
     }
 
     if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 12;
     }
 
     if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 13;
     }
 
     if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 14;
     }
-
-    if (psMetadataItemPrint(fd, "UNK = \n", item8) == false) {
-        printf("ERROR: Return type should be trye\n");
+    psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message");
+    if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) {
+        printf("ERROR: Return type should be false\n");
+        fclose(fd);
         return 15;
     }

trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr

@@ +1 @@
+<DATE><TIME>|<HOST>|I|main
+    Attempt to print item of invalid type, should generate error message
 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
     Specified psMetadataType, 10, is not supported.

trunk/psLib/test/collections/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-06 19:59:39 $
+*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-01-13 21:45:13 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -167 +167 @@
 
     if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 10;
     }
 
     if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 11;
     }
 
     if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 12;
     }
 
     if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 13;
     }
 
     if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) {
-        printf("ERROR: Return type should be trye\n");
+        printf("ERROR: Return type should be true\n");
         return 14;
     }
-
-    if (psMetadataItemPrint(fd, "UNK = \n", item8) == false) {
-        printf("ERROR: Return type should be trye\n");
+    psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message");
+    if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) {
+        printf("ERROR: Return type should be false\n");
+        fclose(fd);
         return 15;
     }