Changeset 8269

Timestamp:

Aug 10, 2006, 11:26:18 AM (20 years ago)

Author:

drobbin

Message:

Added test points to complete code coverage for these two functions. (MetaItemCompare @95% b/c abort line never gets executed-- can be removed if desired line#80-81.)

Location:

trunk/psLib/test/types

Files:

• tap_psMetadataItemCompare.c (modified) (12 diffs)
• tap_psMetadataItemParse.c (modified) (2 diffs)

trunk/psLib/test/types/tap_psMetadataItemCompare.c

@@ -9 +9 @@
     psMetadataItem *item = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", true)
                            ;
-    plan_tests(15);
+    plan_tests(21);
 
     diag("psMetadataItemCompare() tests");
@@ -18 +18 @@
             "return false for NULL compare input." );
     }
-
     //Return false for NULL template psMetadataItem
     {
@@ -25 +24 @@
         ;
     }
+
 
     template = psMetadataItemAlloc("Milky Way", PS_DATA_BOOL, "No Comment", true)
@@ -36 +36 @@
         ;
     }
-
     //Return true for an exact match (copied psMetadataItem)
     itemCopy = psMetadataItemCopy(item);
@@ -50 +49 @@
     }
 
-    //Return false for comparing Bool with F32
+    //Return false for comparing Bool with F64
     psFree(compare);
     compare = psMetadataItemAlloc("Snickers", PS_DATA_F64, "No Comment", 1.0000);
@@ -56 +55 @@
         ok( !psMetadataItemCompare(compare, item),
             "return false for comparison of F64 to bool." );
+    }
+    //Return false for comparing F64 with Bool
+    {
+        ok( !psMetadataItemCompare(item, compare),
+            "return false for comparison of bool to F64." );
     }
 
@@ -68 +72 @@
         ok( psMetadataItemCompare(compare, template),
             "return true for comparison of S32 to F32." )
+        ;
+    }
+    //Return true for comparing F32 with S32 of same value
+    {
+        ok( psMetadataItemCompare(template, compare),
+            "return true for comparison of F32 to S32." )
         ;
     }
@@ -83 +93 @@
         ;
     }
+    //Return true for comparing S16 with U32 of same value
+    {
+        ok( psMetadataItemCompare(template, compare),
+            "return true for comparison of U32 to S16." )
+        ;
+    }
 
     //Return true for comparing U8 with U16 of same value
@@ -96 +112 @@
         ;
     }
+    //Return true for comparing U16 with U8 of same value
+    {
+        ok( psMetadataItemCompare(template, compare),
+            "return true for comparison of U16 to U8." )
+        ;
+    }
 
     //Return true for comparing U8 with S8 of same value
@@ -105 +127 @@
         ;
     }
+    //Return true for comparing S8 with U8 of same value
+    {
+        ok( psMetadataItemCompare(template, compare),
+            "return true for comparison of S8 to U8." )
+        ;
+    }
 
     //Return false for comparing U8 with S64 of same value
@@ -110 +138 @@
     compare = psMetadataItemAlloc("Snickers", PS_DATA_S64, "No Comment", 1);
     {
-        ok( psMetadataItemCompare(compare, template),
-            "return true for comparison of U8 to S64*.  *not yet implemented" )
+        ok( !psMetadataItemCompare(compare, template),
+            "return false for comparison of U8 to S64*.  *not yet implemented" )
+        ;
+    }
+    //Return false for comparing S64 with U8 of same value
+    {
+        ok( !psMetadataItemCompare(template, compare),
+            "return false for comparison of S64* to U8.  *not yet implemented" )
         ;
     }
@@ -128 +162 @@
     }
 
-    //Return false for comparing string of same value
+    //Return true for comparing string of same value
     psFree(template)
     ;

trunk/psLib/test/types/tap_psMetadataItemParse.c

@@ -17 +17 @@
     psMetadataItem *itemString11 = psMetadataItemAlloc("String", PS_DATA_STRING, "", "false");
     psMetadataItem *itemUnsupported = psMetadataItemAlloc("s64", PS_DATA_S64, "", 1);
-    plan_tests(105);
+    plan_tests(112);
 
     diag("psMetadataItemParse() tests");
@@ -388 +388 @@
              "return 'true' in STRING for STRING with value 'true'." );
         psFree(tempString);
-        //Return 0.00 for F32 of value 0.00
+
+        //Return 0.000000 for F32 of value 0.000000
         tempString = psMetadataItemParseString(itemF32);
         ok ( strncmp(tempString, "0.000000", 4) == 0,
-             "return '0.000000' in STRING for F32 with value '0.000000'.", tempString );
+             "return '0.000000' in STRING for F32 with value '0.000000'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 0.500000 for F64 value 0.5
+        tempString = psMetadataItemParseString(itemF64);
+        ok ( strncmp(tempString, "0.500000", 10) == 0,
+             "return '0.500000' in STRING for F64 with value '0.5'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 1 for S8 value 1
+        tempString = psMetadataItemParseString(itemS8);
+        ok ( strncmp(tempString, "1", 3) == 0,
+             "return '1' in STRING for S8 with value '1'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 0 for S16 value 0
+        tempString = psMetadataItemParseString(itemS16);
+        ok ( strncmp(tempString, "0", 3) == 0,
+             "return '0' in STRING for S8 with value '0'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 1 for S32 value 1
+        tempString = psMetadataItemParseString(itemS32);
+        ok ( strncmp(tempString, "1", 3) == 0,
+             "return '1' in STRING for S8 with value '1'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 2 for U8 value 2
+        tempString = psMetadataItemParseString(itemU8);
+        ok ( strncmp(tempString, "2", 3) == 0,
+             "return '2' in STRING for S8 with value '2'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 0 for U16 value 0
+        tempString = psMetadataItemParseString(itemU16);
+        ok ( strncmp(tempString, "0", 3) == 0,
+             "return '0' in STRING for S8 with value '0'.   (actual result=%s)",
+             tempString);
+        psFree(tempString);
+
+        //Return 1 for U32 value 1
+        tempString = psMetadataItemParseString(itemU32);
+        ok ( strncmp(tempString, "1", 3) == 0,
+             "return '1' in STRING for S8 with value '1'.   (actual result=%s)",
+             tempString);
         psFree(tempString);
     }