Changeset 2977 for trunk/psLib/test/collections/tst_psMetadata_04.c

Timestamp:

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

Author:

desonia

Message:

the definition of 'status' changed for psMetadataLookupXXX.

File:

• trunk/psLib/test/collections/tst_psMetadata_04.c (modified) (8 diffs)

trunk/psLib/test/collections/tst_psMetadata_04.c

@@ -23 +23 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-07 22:59:11 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-01-13 21:19:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
 psS32 main( psS32 argc, char* argv[] )
 {
-    psU32 status = 0;
+    psBool status = 0;
     psMetadataItem *item1 = NULL;
     psMetadataItem *item2 = NULL;
@@ -165 +165 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value");
     psS32 valueS32 = 0;
-    status = 0;
     valueS32 = psMetadataLookupS32(metadata, "myItem2", &status);
     if(valueS32 != 55) {
         printf("ERROR: Bad value, %d, Expected 55\n", valueS32);
         return 15;
-    } else if(status != 0) {
+    } else if(! status) {
         printf("ERROR: Bad status, %d\n", status);
         return 15;
@@ -179 +178 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value");
     psF64 valueF64 = 0.0;
-    status = 0;
     valueF64 = psMetadataLookupF64(metadata, "myItem5", &status);
     if(fabs(valueF64-3.14) > FLT_EPSILON) {
         printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64);
         return 16;
-    } else if(status != 0) {
+    } else if(! status) {
         printf("ERROR: Bad status, %d\n", status);
         return 16;
@@ -193 +191 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer");
     psVector *valueVec = NULL;
-    status = 0;
     valueVec = psMetadataLookupPtr(metadata, "myItem6", &status);
     if(valueVec != vec) {
         printf("ERROR: Bad vector pointer\n");
         return 17;
-    } else if(status != 0) {
+    } else if(! status) {
         printf("ERROR: Bad status, %d\n", status);
         return 17;
@@ -251 +248 @@
     // Test N - Attempt get psS32 value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
-    status = 0;
     valueS32 = psMetadataLookupS32(metadata, "myItem22", &status);
-    if(status != 1) {
+    if(status) {
         printf("ERROR: Bad status, %d, \n", status);
         return 22;
@@ -261 +257 @@
     // Test O - Attempt get psF64 value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
-    status = 0;
     valueF64 = psMetadataLookupF64(metadata, "myItem22", &status);
-    if(status != 1) {
+    if(status) {
         printf("ERROR: Bad status, %d, \n", status);
         return 23;
@@ -271 +266 @@
     // Test P - Attempt get psVector value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item");
-    status = 0;
     valueVec = psMetadataLookupPtr(metadata, "myItem22", &status);
-    if(status != 1) {
+    if(status) {
         printf("ERROR: Bad status, %d, \n", status);
         return 24;