Changeset 8805 for trunk/psLib/test/types

Timestamp:

Sep 12, 2006, 4:20:15 PM (20 years ago)

Author:

drobbin

Message:

Added testing for Arguments. Edited src file minimally. coverage at 100%. Edited ItemCompare to complete 100% coverage.

Location:

trunk/psLib/test/types

Files:

• Makefile.am (modified) (1 diff)
• execute_tap (modified) (1 diff)
• tap_psArguments_all.c (added)
• tap_psMetadataItemCompare.c (modified) (19 diffs)
• tst_psArguments.c (modified) (2 diffs)

trunk/psLib/test/types/Makefile.am

@@ -23 +23 @@
         tap_psMetadata_manip   \
         tap_psMetadata_polynomials \
-        tap_psArray_all
+        tap_psArray_all \
+        tap_psArguments_all
 
 check_DATA = \

trunk/psLib/test/types/execute_tap

@@ -11 +11 @@
 ./tap_psMetadata_printing
 ./tap_psMetadata_polynomials
+./tap_psArguments_all

trunk/psLib/test/types/tap_psMetadataItemCompare.c

@@ -11 +11 @@
     psMetadataItem *item = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", true)
                            ;
-    plan_tests(21);
+    plan_tests(22);
 
     diag("psMetadataItemCompare() tests");
@@ -18 +18 @@
     {
         ok( !psMetadataItemCompare(compare, item),
-            "return false for NULL compare input." );
+            "psMetadataItemCompare:      return false for NULL compare input." );
     }
     //Return false for NULL template psMetadataItem
     {
         ok( !psMetadataItemCompare(item, template),
-            "return false for NULL template input." )
+            "psMetadataItemCompare:      return false for NULL template input." )
         ;
     }
@@ -35 +35 @@
     {
         ok( !psMetadataItemCompare(template, item),
-            "return false for input with different names." )
+            "psMetadataItemCompare:      return false for input with different names.")
         ;
     }
@@ -42 +42 @@
     {
         ok( psMetadataItemCompare(itemCopy, item),
-            "return true for comparison of identical psMetadataItem's." );
+            "psMetadataItemCompare:      return true for comparison of identical psMetadataItem's.");
     }
 
@@ -48 +48 @@
     {
         ok( psMetadataItemCompare(compare, item),
-            "return true for valid compare of different type." );
+            "psMetadataItemCompare:      return true for valid compare of different type.");
     }
 
@@ -56 +56 @@
     {
         ok( psMetadataItemCompare(compare, item),
-            "return false for comparison of F64 to bool." );
+            "psMetadataItemCompare:      return false for comparison of F64 to bool." );
     }
     //Return true for comparing F64 with Bool
     {
         ok( psMetadataItemCompare(item, compare),
-            "return false for comparison of bool to F64." );
+            "psMetadataItemCompare:      return false for comparison of bool to F64." );
     }
 
@@ -73 +73 @@
     {
         ok( psMetadataItemCompare(compare, template),
-            "return true for comparison of S32 to F32." )
+            "psMetadataItemCompare:      return true for comparison of S32 to F32." )
         ;
     }
@@ -79 +79 @@
     {
         ok( psMetadataItemCompare(template, compare),
-            "return true for comparison of F32 to S32." )
+            "psMetadataItemCompare:      return true for comparison of F32 to S32." )
         ;
     }
@@ -92 +92 @@
     {
         ok( psMetadataItemCompare(compare, template),
-            "return true for comparison of S16 to U32." )
+            "psMetadataItemCompare:     return true for comparison of S16 to U32." )
         ;
     }
@@ -98 +98 @@
     {
         ok( psMetadataItemCompare(template, compare),
-            "return true for comparison of U32 to S16." )
+            "psMetadataItemCompare:     return true for comparison of U32 to S16." )
         ;
     }
@@ -111 +111 @@
     {
         ok( psMetadataItemCompare(compare, template),
-            "return true for comparison of U8 to U16." )
+            "psMetadataItemCompare:     return true for comparison of U8 to U16." )
         ;
     }
@@ -117 +117 @@
     {
         ok( psMetadataItemCompare(template, compare),
-            "return true for comparison of U16 to U8." )
+            "psMetadataItemCompare:     return true for comparison of U16 to U8." )
         ;
     }
@@ -126 +126 @@
     {
         ok( psMetadataItemCompare(compare, template),
-            "return true for comparison of U8 to S8." )
+            "psMetadataItemCompare:     return true for comparison of U8 to S8." )
         ;
     }
@@ -132 +132 @@
     {
         ok( psMetadataItemCompare(template, compare),
-            "return true for comparison of S8 to U8." )
+            "psMetadataItemCompare:     return true for comparison of S8 to U8." )
         ;
     }
@@ -141 +141 @@
     {
         ok( !psMetadataItemCompare(compare, template),
-            "return false for comparison of U8 to S64*.  *not yet implemented" )
+            "psMetadataItemCompare:     return false for comparison of U8 to S64*.  "
+            "*not yet implemented" )
         ;
     }
@@ -147 +148 @@
     {
         ok( !psMetadataItemCompare(template, compare),
-            "return false for comparison of S64* to U8.  *not yet implemented" )
+            "psMetadataItemCompare:     return false for comparison of S64* to U8.  "
+            "*not yet implemented" )
         ;
     }
@@ -160 +162 @@
     {
         ok( !psMetadataItemCompare(compare, template),
-            "return false for comparison of different psString's." )
+            "psMetadataItemCompare:     return false for comparison of different psString's.")
         ;
     }
@@ -171 +173 @@
     {
         ok( psMetadataItemCompare(compare, template),
-            "return true for comparison of identical psString's." )
+            "psMetadataItemCompare:     return true for comparison of identical psString's.")
         ;
     }
@@ -182 +184 @@
     {
         ok( !psMetadataItemCompare(compare, template),
-            "return false for comparison of psString with bool." )
+            "psMetadataItemCompare:     return false for comparison of psString with bool.")
+        ;
+    }
+    //Return false for comparing bool with string
+    psFree(template)
+    ;
+    template = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", false)
+               ;
+    {
+        ok( !psMetadataItemCompare(template, compare),
+            "psMetadataItemCompare:     return false for comparison of psString with bool.")
         ;
     }

trunk/psLib/test/types/tst_psArguments.c

@@ -5 +5 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-06-09 01:25:42 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-09-13 02:20:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -12 +12 @@
 */
 
-#include "psTest.h"
-#include "pslib_strict.h"
+#include "pslib.h"
 
 static psS32 testArgument(void);
-
+/*
 testDescription tests[] = {
                               {testArgument, 666, "Test psArgument fxns", 0, false},
                               {NULL}
                           };
-
+*/
 int main(int argc, char* argv[])
 {
     psLogSetLevel( PS_LOG_INFO );
-    if( !runTestSuite(stderr,"psArguments",tests,argc,argv)) {
-        return 1;
-    }
+    testArgument();
+    //    if( !runTestSuite(stderr,"psArguments",tests,argc,argv)) {
+    //        return 1;
+    //    }
     return 0;
 }