Changeset 9736 for trunk/psLib/test/types

Timestamp:

Oct 24, 2006, 2:16:33 PM (20 years ago)

Author:

drobbin

Message:

Updated psMetadataCopy- an error is now skipped and allows the rest of a metadata to be copied. Added tests for psMetadataConfig. Added error check in MetaConfigPrint for NULL file input.

Location:

trunk/psLib/test/types

Files:

• Makefile.am (modified) (1 diff)
• execute_tap (modified) (2 diffs)
• tap_psMetadata_copying.c (modified) (2 diffs)

trunk/psLib/test/types/Makefile.am

@@ -29 +29 @@
         tap_psBitSet_all \
         tap_psList_all \
-        tap_psLookupTable_all
+        tap_psLookupTable_all \
+        tap_psMetadataConfig_output \
+        tap_psMetadataConfig_input
 
 if BUILD_TESTS

trunk/psLib/test/types/execute_tap

@@ -1 @@
-make
+make test
 ./tap_psArray_all
 ./tap_psListIterator
@@ -18 +18 @@
 ./tap_psList_all
 ./tap_psLookupTable_all
+./tap_psMetadataConfig_output
+./tap_psMetadataConfig_input

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(34);
+    plan_tests(35);
 
     diag("psMetadataCopy and psMetadataItemCopy tests");
@@ -59 +59 @@
         out = NULL;
     }
-    //Return NULL for attempt to copy item of unsupported data type
+    //Return NULL for attempt to copy item of unsupported data type - NULL out metadata
+    psMetadataItem *notype = NULL;
     {
         in = psMetadataAlloc();
         psMetadataAddS32(in, PS_LIST_HEAD, "S32", 0, "", 1);
-        psMetadataItem *notype = psMetadataGet(in, PS_LIST_HEAD);
-        //        notype->type = PS_DATA_METADATA_MULTI + 1000;
+        notype = psMetadataGet(in, PS_LIST_HEAD);
         notype->type = -1;
-        psFree(outTest);
-        outTest = NULL;
+        outTest = psMetadataCopy(out, in);
+        ok( outTest == NULL,
+            "psMetadataCopy:  return NULL for metadata with item of bad type.");
+        psFree(out);
+        out = NULL;
+    }
+    //Return NULL for attempt to copy item of unsupported data type - allocated out metadata
+    {
+        out = psMetadataAlloc();
+        psMetadataAddS32(out, PS_LIST_TAIL, "S32", 0, "", 2);
         outTest = psMetadataCopy(out, in);
         ok( outTest == NULL,
             "psMetadataCopy:  return NULL for metadata with item of bad type.");
         notype->type = PS_DATA_S32;
+        psFree(out);
+        out = NULL;
         psFree(in);
         in = NULL;
-        psFree(out);
-        out = NULL;
     }