Changeset 3445

Timestamp:

Mar 17, 2005, 9:44:44 AM (21 years ago)

Author:

desonia

Message:

updated test to force psMetadataItemPrint to cast float<->int before printing.

Location:

trunk/psLib/test

Files:

• astronomy/tst_psMetadata_05.c (modified) (5 diffs)
• collections/tst_psMetadata_05.c (modified) (5 diffs)

trunk/psLib/test/astronomy/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.23 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-17 19:44:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -164 +164 @@
     }
 
+    if (psMetadataItemPrint(fd, "S32 = %+06.1f\n", item2) == false) {
+        printf("ERROR: Return type should be true\n");
+        return 10;
+    }
+
     if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
         printf("ERROR: Return type should be true\n");
@@ -170 +175 @@
 
     if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
+        printf("ERROR: Return type should be true\n");
+        return 12;
+    }
+
+    if (psMetadataItemPrint(fd, "F32 = % #i\n", item5) == false) {
         printf("ERROR: Return type should be true\n");
         return 12;
@@ -203 +213 @@
     }
 
+    char truth1b[] = "S32 = +055.0";
+    fgets(line, 256, fd);
+    if(strncmp(line, truth1b, 12)) {
+        printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth1b);
+    }
+
     char truth2[] = "BOL = 0";
     fgets(line, 256, fd);
@@ -213 +229 @@
     if(strncmp(line, truth3, 10)) {
         printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth3);
+    }
+
+    char truth3b[] = "F32 =  3";
+    fgets(line, 256, fd);
+    if(strncmp(line, truth3b, 8)) {
+        printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth3b);
     }
 

trunk/psLib/test/collections/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.23 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-17 19:44:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -164 +164 @@
     }
 
+    if (psMetadataItemPrint(fd, "S32 = %+06.1f\n", item2) == false) {
+        printf("ERROR: Return type should be true\n");
+        return 10;
+    }
+
     if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
         printf("ERROR: Return type should be true\n");
@@ -170 +175 @@
 
     if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
+        printf("ERROR: Return type should be true\n");
+        return 12;
+    }
+
+    if (psMetadataItemPrint(fd, "F32 = % #i\n", item5) == false) {
         printf("ERROR: Return type should be true\n");
         return 12;
@@ -203 +213 @@
     }
 
+    char truth1b[] = "S32 = +055.0";
+    fgets(line, 256, fd);
+    if(strncmp(line, truth1b, 12)) {
+        printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth1b);
+    }
+
     char truth2[] = "BOL = 0";
     fgets(line, 256, fd);
@@ -213 +229 @@
     if(strncmp(line, truth3, 10)) {
         printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth3);
+    }
+
+    char truth3b[] = "F32 =  3";
+    fgets(line, 256, fd);
+    if(strncmp(line, truth3b, 8)) {
+        printf("ERROR: Data in file is not as expected. Value: %s. Should be: %s\n", line, truth3b);
     }