Changeset 8314

Timestamp:

Aug 14, 2006, 11:21:19 AM (20 years ago)

Author:

drobbin

Message:

Edited printing test w.r.t code coverage. Updated test to execute all lines of source or as close as possible.

File:

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

trunk/psLib/test/types/tap_psMetadata_printing.c

@@ -17 +17 @@
     psMetadataAddUnknown(md2, PS_LIST_TAIL, "unknown", 0, "", sphere);
 
-    plan_tests(19);
+    plan_tests(30);
     diag("psMetadataPrint and psMetadataItemPrint tests\n>>Test 1:  psMetadataPrint");
 
@@ -37 +37 @@
     }
     psFree(md2);
+
+    //Return false for unsupported vector type (C32)
     md2 = psMetadataAlloc();
     psVector *vector = psVectorAlloc(2, PS_TYPE_C32);
-    //    psVectorSet(vector, 0, 0);
-
     psMetadataAddVector(md2, PS_LIST_HEAD, "name here", 0, "I vector", vector);
-    //Return false for unsupported vector type (C32)
     {
         ok ( !psMetadataPrint(NULL, md2, 2),
@@ -49 +48 @@
     psFree(vector);
     psFree(md2);
+
+    //Valid case where fd is NULL -> stdout
     md2 = psMetadataAlloc();
     psMetadataAddStr(md2, PS_LIST_HEAD,
                      "  >>Hello Wally", 0, "My name is Bubbles", "Pet Me");
-    //Valid case where fd is NULL -> stdout
     {
         ok ( psMetadataPrint(NULL, md2, 0),
@@ -95 +95 @@
             "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.");
+    }
+
     //Return false for incorrect format parameter
     {
@@ -100 +106 @@
             "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.");
-    }
-    //Return true for format parameter containing additional modifiers
+
+
+    //Return true for format parameter containing additional modifiers (F32)
     {
         ok( psMetadataItemPrint(fd, "%.3f\n", item2),
@@ -113 +116 @@
     {
         ok( psMetadataItemPrint(fd, "%s\n", item3),
-            "psMetadataItemPrint:  return true for valid string case.");
+            "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.");
-    }
-
-
+            "psMetadataItemPrint:  return true for valid ptr case w/p.");
+    }
 
     //Return true for format = %d, type = int
     {
         ok( psMetadataItemPrint(fd, "%d\n", item4),
-            "psMetadataItemPrint:  return true for valid U8 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 U8 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 string 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.");
+    }
+    //Return true for format = %u, type = int
+    {
+        ok( psMetadataItemPrint(fd, "%u\n", item4),
+            "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.");
+    }
+    //Return true for format = %X, type = int
+    {
+        ok( psMetadataItemPrint(fd, "%X\n", item5),
+            "psMetadataItemPrint:  return true for valid case w/c.");
+    }
+
+    //Return true for format = %e, type = int
+    {
+        ok( psMetadataItemPrint(fd, "%.1e\n", item2),
+            "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.");
+    }
+    //Return true for format = %F, type = int
+    {
+        ok( psMetadataItemPrint(fd, "%.3F\n", item2),
+            "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.");
+    }
+    //Return true for format = %G, type = int
+    {
+        ok( psMetadataItemPrint(fd, "%.4G\n", item2),
+            "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.");
+    }
+    //Return true for format = %A, type = int
+    {
+        ok( psMetadataItemPrint(fd, "%A\n", item2),
+            "psMetadataItemPrint:  return true for valid case w/A.");
+    }
 
 
@@ -207 +263 @@
 
     psMetadataAddVector(md, PS_LIST_TAIL, "vector6", 0, "I am a vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_U8);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.U8[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector7", 0, "I am a U8-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_U16);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.U16[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector8", 0, "I am a U16-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_U32);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.U32[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector9", 0, "I am a U32-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_U64);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.U64[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector10", 0, "I am a U64-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_S8);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.S8[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector11", 0, "I am a S8-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_S16);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.S16[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector12", 0, "I am a S16-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_S64);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.S64[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector13", 0, "I am a S64-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_F32);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.F32[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector14", 0, "I am a F32-vector", vec);
+    psFree(vec);
+    vec = psVectorAlloc(2, PS_DATA_F64);
+    vec->n = 2;
+    for (i = 0; i < 2; i++) {
+        vec->data.F64[i] = i+1;
+    }
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector15", 0, "I am a F64-vector", vec);
+
 
     psFree(region);