Changeset 12476

Timestamp:

Mar 16, 2007, 5:11:55 PM (19 years ago)

Author:

jhoblitt

Message:

fix test failure from constant to psS64 casting issue
some code cleanup

Location:

trunk/psLib/test/types

Files:

• Makefile.am (modified) (1 diff)
• tap_psMetadataConfig_input.c (modified) (1 diff)
• tap_psMetadata_copying.c (modified) (6 diffs)

trunk/psLib/test/types/Makefile.am

@@ -10 +10 @@
         $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
+
+TESTS_ENVIRONMENT="TEST_PWD=foo/$(srcdir)"
 
 TEST_PROGS = \

trunk/psLib/test/types/tap_psMetadataConfig_input.c

@@ -20 +20 @@
 #include "pstap.h"
 
-int main(void)
+int main(int argc, char* argv[])
 {
     plan_tests(30 + 1);
+
+    // chdir to the dir the test files are in
+//    char *path = getenv("TEST_PWD");
+    printf("path=%s\n", argv[0]);
+#if 0
+    if (path) {
+        if (!chdir(path)) {
+            done();
+        }
+    }
+#endif
 
     psLogSetFormat("HLNM");

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -24 +24 @@
 {
     psLogSetFormat("HLNM");
-    plan_tests(36);
-
-    note("psMetadataCopy and psMetadataItemCopy tests");
+    plan_tests(39);
 
     testMetadataCopy();
@@ -37 +35 @@
 void testMetadataCopy(void)
 {
-    note("  >>>Test 1:  psMetadataCopy");
     psMetadata *in = NULL;
     psMetadata *out = NULL;
@@ -166 +163 @@
 void testMetadataItemCopy(void)
 {
-    note("  >>>Test 2:  psMetadataItemCopy");
-
     //Return NULL for NULL input psMetadataItem
     {
@@ -179 +174 @@
     psMetadataItem *itemS16 =  psMetadataItemAlloc("itemS16", PS_DATA_S16, "", 2);
     psMetadataItem *itemS32 =  psMetadataItemAlloc("itemS32", PS_DATA_S32, "", 3);
-    psMetadataItem *itemS64 =  psMetadataItemAlloc("itemS64", PS_DATA_S64, "", 4);
+    psMetadataItem *itemS64 =  psMetadataItemAlloc("itemS64", PS_DATA_S64, "", (psS64)4);
     psMetadataItem *itemU8  =  psMetadataItemAlloc("itemU8", PS_DATA_U8, "", 1);
     psMetadataItem *itemU16 =  psMetadataItemAlloc("itemU16", PS_DATA_U16, "", 2);
@@ -220 +215 @@
         psFree(copy);
     }
-    //S64 case
-    {
-        copy = psMetadataItemCopy(itemS64);
-        ok( (copy->type == PS_DATA_S64 && (strncmp(copy->name, "itemS64", 10) == 0) &&
-             copy->data.S64 == 4 && strncmp(copy->comment, "", 2) == 0),
-            "psMetadataItemCopy:  return valid copy of S64 item.");
-        psFree(copy);
-    }
+
+    // S64 case
+    {
+        psMetadataItem *copy = psMetadataItemCopy(itemS64);
+
+        ok(copy->type == PS_DATA_S64, "item type");
+        ok_str(copy->name, "itemS64", "item name");
+        is_long(copy->data.S64, 4, "item data");
+        ok_str(copy->comment, "", "item comment");
+
+        psFree(copy);
+    }
+
     //U8 case
     {
@@ -427 +427 @@
 void testMetadataItemTransfer(void)
 {
-    note("  >>>Test 3:  psMetadataItemSupplement");
     psMetadata *out = psMetadataAlloc();
     psMetadata *in = psMetadataAlloc();