Changeset 9900 for trunk/psLib

Timestamp:

Nov 7, 2006, 2:01:20 PM (20 years ago)

Author:

drobbin

Message:

Updated testing to conform to changes in psMetadataPrint return status.

File:

• trunk/psLib/test/types/tap_psMetadata_printing.c (modified) (12 diffs)

trunk/psLib/test/types/tap_psMetadata_printing.c

@@ -149 +149 @@
     psMetadataAddVector(md, PS_LIST_TAIL, "vector15", 0, "I am a F64-vector", vec);
 
-    psImage *image = psImageAlloc(1, 1, PS_TYPE_S32);
-    psImageSet(image, 0, 0, 1);
-    psMetadataAddImage(md, PS_LIST_TAIL, "image1", 0, "I am an Image", image);
-
-    psHash *hash = psHashAlloc(1);
-    psHashAdd(hash, "hash", image);
-    psMetadataAddHash(md, PS_LIST_TAIL, "hash1", 0, "I am a Hash", hash);
-
-    psLookupTable *lookup = psLookupTableAlloc("table2.dat", "%s", 0);
-    psMetadataAddLookupTable(md, PS_LIST_TAIL, "lookup", 0, "I am a LookupTable", lookup);
-
-    psArray *array = psArrayAlloc(1);
-    psArraySet(array, 0, image);
-    psMetadataAddArray(md, PS_LIST_TAIL, "array", 0, "I am an Array", array);
-
-    psFree(array);
-    psFree(lookup);
-    psFree(image);
-    psFree(hash);
+    /*    psImage *image = psImageAlloc(1, 1, PS_TYPE_S32);
+        psImageSet(image, 0, 0, 1);
+        psMetadataAddImage(md, PS_LIST_TAIL, "image1", 0, "I am an Image", image);
+     
+        psHash *hash = psHashAlloc(1);
+        psHashAdd(hash, "hash", image);
+        psMetadataAddHash(md, PS_LIST_TAIL, "hash1", 0, "I am a Hash", hash);
+     
+        psLookupTable *lookup = psLookupTableAlloc("table2.dat", "%s", 0);
+        psMetadataAddLookupTable(md, PS_LIST_TAIL, "lookup", 0, "I am a LookupTable", lookup);
+     
+        psArray *array = psArrayAlloc(1);
+        psArraySet(array, 0, image);
+        psMetadataAddArray(md, PS_LIST_TAIL, "array", 0, "I am an Array", array);
+     
+        psFree(array);
+        psFree(lookup);
+        psFree(image);
+        psFree(hash);
+    */
     psFree(region);
     psFree(list);
@@ -180 +181 @@
 {
     diag("  >>Test 1:  psMetadataPrint");
-    FILE *fd = fopen("psMetadataPrint.out", "w");
+    FILE *fd = fopen("psMetadataPrint.out", "w+");
     FILE *fd_read = fopen("Makefile", "r");
     psMetadata *md = NULL;
@@ -190 +191 @@
     psMetadataAddUnknown(md2, PS_LIST_TAIL, "unknown", 0, "", sphere);
 
+    psImage *image = psImageAlloc(1, 1, PS_TYPE_S32);
+    psImageSet(image, 0, 0, 1);
+    psMetadataAddImage(md2, PS_LIST_TAIL, "image1", 0, "I am an Image", image);
+
+    psHash *hash = psHashAlloc(1);
+    psHashAdd(hash, "hash", image);
+    psMetadataAddHash(md2, PS_LIST_TAIL, "hash1", 0, "I am a Hash", hash);
+
+    psLookupTable *lookup = psLookupTableAlloc("table2.dat", "%s", 0);
+    psMetadataAddLookupTable(md2, PS_LIST_TAIL, "lookup", 0, "I am a LookupTable", lookup);
+
+    psArray *array = psArrayAlloc(1);
+    psArraySet(array, 0, image);
+    psMetadataAddArray(md2, PS_LIST_TAIL, "array", 0, "I am an Array", array);
+
+    psFree(array);
+    psFree(lookup);
+    psFree(image);
+    psFree(hash);
+
     //Return false for NULL psMetadata input
     {
         ok( !psMetadataPrint(NULL, NULL, 0),
-            "psMetadataPrint:  return false for NULL psMetadata input.");
+            "psMetadataPrint:            return false for NULL psMetadata input.");
     }
     //Return false for read-only file descriptor
     {
         ok ( !psMetadataPrint(fd_read, md, 0),
-             "psMetadataPrint:  return false for read-only file descriptor.");
+             "psMetadataPrint:            return false for read-only file descriptor.");
     }
     fclose(fd_read);
     //Error and then return true for unprintable datatype (sphere) and DATA_UNKNOWN
     {
-        ok ( psMetadataPrint(NULL, md2, 0),
-             "psMetadataPrint:  return true for metadata with unknown datatype.");
+        ok ( !psMetadataPrint(NULL, md2, 0),
+             "psMetadataPrint:            return false for metadata with unknown datatype.");
     }
     psFree(md2);
@@ -214 +235 @@
     {
         ok ( !psMetadataPrint(NULL, md2, 2),
-             "psMetadataPrint:  return false for metadata with unknown vector-type.");
+             "psMetadataPrint:            return false for metadata with unknown vector-type.");
     }
     psFree(vector);
@@ -225 +246 @@
     {
         ok ( psMetadataPrint(NULL, md2, 0),
-             "psMetadataPrint:  return true for NULL file pointer.");
+             "psMetadataPrint:            return true for NULL file pointer.");
     }
     psFree(md2);
@@ -231 +252 @@
     {
         ok ( psMetadataPrint(fd, md, 0),
-             "psMetadataPrint:  return true for file='psMetadataPrint.out'.");
+             "psMetadataPrint:            return true for file='psMetadataPrint.out'.");
     }
 
@@ -237 +258 @@
     {
         fclose(fd);
+        remove
+            ("psMetadataPrint.out");
         psFree(sphere);
         psFree(md);
@@ -258 +281 @@
     {
         ok( !psMetadataItemPrint(NULL, "%s", item1),
-            "psMetadataItemPrint:  return false for NULL FILE*.");
+            "psMetadataItemPrint:        return false for NULL FILE*.");
     }
     //Return false for NULL format paramter
     {
         ok( !psMetadataItemPrint(fd, NULL, item1),
-            "psMetadataItemPrint:  return false for NULL format.");
+            "psMetadataItemPrint:        return false for NULL format.");
     }
     //Return false for NULL metadataItem
     {
         ok( !psMetadataItemPrint(fd, "%s", NULL),
-            "psMetadataItemPrint:  return false for NULL psMetadataItem.");
+            "psMetadataItemPrint:        return false for NULL psMetadataItem.");
     }
     //Return false for incorrect format parameter
     {
         ok( !psMetadataItemPrint(fd, "sos \n", item1),
-            "psMetadataItemPrint:  return false for incorrect format.");
+            "psMetadataItemPrint:       return false for incorrect format.");
     }
     //Return false for type that doesn't match format (ie, %s for f32 value)
     {
         ok( !psMetadataItemPrint(fd, "%s", item2),
-            "psMetadataItemPrint:  return false for item that doesn't match format.");
+            "psMetadataItemPrint:       return false for item that doesn't match format.");
     }
 
@@ -284 +307 @@
     {
         ok( !psMetadataItemPrint(fd, "%z", item1),
-            "psMetadataItemPrint:  return false for incorrect format.");
+            "psMetadataItemPrint:       return false for incorrect format.");
     }
 
@@ -291 +314 @@
     {
         ok( psMetadataItemPrint(fd, "%.3f\n", item2),
-            "psMetadataItemPrint:  return true for format with .3 modifier.");
+            "psMetadataItemPrint:       return true for format with .3 modifier.");
     }
     //Return true for valid string input
     {
         ok( psMetadataItemPrint(fd, "%s\n", item3),
-            "psMetadataItemPrint:  return true for valid string case w/s.");
+            "psMetadataItemPrint:       return true for valid string case w/s.");
     }
     //Return true for valid ptr input
     {
         ok( psMetadataItemPrint(fd, "%p\n", item3),
-            "psMetadataItemPrint:  return true for valid ptr case w/p.");
+            "psMetadataItemPrint:       return true for valid ptr case w/p.");
     }
 
@@ -307 +330 @@
     {
         ok( psMetadataItemPrint(fd, "%d\n", item4),
-            "psMetadataItemPrint:  return true for valid case w/d.");
+            "psMetadataItemPrint:       return true for valid case w/d.");
     }
     //Return true for format = %i, type = int
     {
         ok( psMetadataItemPrint(fd, "%i\n", item4),
-            "psMetadataItemPrint:  return true for valid case w/i.");
+            "psMetadataItemPrint:       return true for valid case w/i.");
     }
     //Return true for format = %c, type = int
     {
         ok( psMetadataItemPrint(fd, "%c\n", item5),
-            "psMetadataItemPrint:  return true for valid case w/c.");
+            "psMetadataItemPrint:       return true for valid case w/c.");
     }
     //Return true for format = %o, type = int
     {
         ok( psMetadataItemPrint(fd, "%o\n", item4),
-            "psMetadataItemPrint:  return true for valid case w/d.");
+            "psMetadataItemPrint:       return true for valid case w/d.");
     }
     //Return true for format = %u, type = int
     {
         ok( psMetadataItemPrint(fd, "%u\n", item4),
-            "psMetadataItemPrint:  return true for valid case w/i.");
+            "psMetadataItemPrint:       return true for valid case w/i.");
     }
     //Return true for format = %x, type = int
     {
         ok( psMetadataItemPrint(fd, "%x\n", item5),
-            "psMetadataItemPrint:  return true for valid case w/c.");
+            "psMetadataItemPrint:       return true for valid case w/c.");
     }
     //Return true for format = %X, type = int
     {
         ok( psMetadataItemPrint(fd, "%X\n", item5),
-            "psMetadataItemPrint:  return true for valid case w/c.");
+            "psMetadataItemPrint:       return true for valid case w/c.");
     }
 
@@ -343 +366 @@
     {
         ok( psMetadataItemPrint(fd, "%.1e\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/e.");
+            "psMetadataItemPrint:       return true for valid case w/e.");
     }
     //Return true for format = %E, type = int
     {
         ok( psMetadataItemPrint(fd, "%.2E\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/E.");
+            "psMetadataItemPrint:       return true for valid case w/E.");
     }
     //Return true for format = %F, type = int
     {
         ok( psMetadataItemPrint(fd, "%.3F\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/F.");
+            "psMetadataItemPrint:       return true for valid case w/F.");
     }
     //Return true for format = %g, type = int
     {
         ok( psMetadataItemPrint(fd, "%.3g\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/g.");
+            "psMetadataItemPrint:       return true for valid case w/g.");
     }
     //Return true for format = %G, type = int
     {
         ok( psMetadataItemPrint(fd, "%.4G\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/G.");
+            "psMetadataItemPrint:       return true for valid case w/G.");
     }
     //Return true for format = %a, type = int
     {
         ok( psMetadataItemPrint(fd, "%.4a\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/a.");
+            "psMetadataItemPrint:       return true for valid case w/a.");
     }
     //Return true for format = %A, type = int
     {
         ok( psMetadataItemPrint(fd, "%A\n", item2),
-            "psMetadataItemPrint:  return true for valid case w/A.");
+            "psMetadataItemPrint:       return true for valid case w/A.");
     }