Index: /trunk/psLib/test/types/tap_psMetadataConfigParse_time.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataConfigParse_time.c	(revision 12477)
+++ /trunk/psLib/test/types/tap_psMetadataConfigParse_time.c	(revision 12478)
@@ -7,7 +7,5 @@
 int main (void)
 {
-    plan_tests(40);
-
-    note("psMetadataParseConfig time format tests");
+    plan_tests(39 + 1);
 
     {
@@ -112,11 +110,9 @@
         psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
 
-        ok(md, "md = %x", md);
-        ok(nBad == 1, "number of bad lines = %d", nBad);
-        // XXX should a md even be returned instead of NULL?
-        ok(md->list->n == 0, "number of items in metadata = %ld", md->list->n);
+        ok(md, "returned metdata");
+        is_int(nBad, 0, "number of bad lines");
+        is_long(psListLength(md->list), 1, "number of items in metadata");
 
         psFree(md);
-
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -131,11 +127,9 @@
         psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
 
-        ok(md, "md = %x", md);
-        ok(nBad == 1, "number of bad lines = %d", nBad);
-        // XXX should a md even be returned instead of NULL?
-        ok(md->list->n == 0, "number of items in metadata = %ld", md->list->n);
+        ok(md, "returned metdata");
+        is_int(nBad, 0, "number of bad lines");
+        is_long(psListLength(md->list), 1, "number of items in metadata");
 
         psFree(md);
-
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -150,8 +144,7 @@
         psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
 
-        ok(md, "md = %x", md);
-        ok(nBad == 1, "number of bad lines = %d", nBad);
-        // XXX should a md even be returned instead of NULL?
-        ok(md->list->n == 0, "number of items in metadata = %ld", md->list->n);
+        ok(md, "returned metdata");
+        is_int(nBad, 0, "number of bad lines");
+        is_long(psListLength(md->list), 1, "number of items in metadata");
 
         psFree(md);
@@ -169,8 +162,7 @@
         psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
 
-        ok(md, "md = %x", md);
-        ok(nBad == 1, "number of bad lines = %d", nBad);
-        // XXX should a md even be returned instead of NULL?
-        ok(md->list->n == 0, "number of items in metadata = %ld", md->list->n);
+        ok(md, "returned metdata");
+        is_int(nBad, 0, "number of bad lines");
+        is_long(psListLength(md->list), 1, "number of items in metadata");
 
         psFree(md);