Index: trunk/psLib/test/types/tap_psMetadataConfigParse.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfigParse.c	(revision 12458)
+++ trunk/psLib/test/types/tap_psMetadataConfigParse.c	(revision 12459)
@@ -21,5 +21,5 @@
 int main(void)
 {
-    plan_tests(23 + 1);
+    plan_tests(35 + 1);
 
     psLogSetFormat("HLNM");
@@ -46,5 +46,5 @@
         ok(md == NULL, "return NULL for 1 invalid line");
 
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
 
@@ -59,11 +59,12 @@
         skip_start(item == NULL, 2,
                      "Skipping 1 tests because metadata container is empty!");
-        ok( item->type == PS_TYPE_S32 && item->data.S32 == 666,
-            "psMetadataConfigParse: return correct metadataItem data (S32)");
-        ok_str( item->name, "new",
-                "psMetadataConfigParse: return correct metadataItem name (S32)");
+        ok(item->type == PS_TYPE_S32, "return correcot metdataItem type");
+        is_int(item->data.S32, 666, "return correct metadataItem data");
+        ok_str(item->name, "new", "return correct metadataItem name");
+        ok_str(item->comment, "", "return correct metadataItem comment");
         skip_end();
+
         psFree(md);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
 
@@ -71,24 +72,20 @@
     {
         psMemId id = psMemGetId();
-        char str3[70];
-        strcpy(str3, "item4            F64       6.28");
-        psMetadata *md = psMetadataConfigParse(NULL, NULL, str3, false);
+        char *str = "item4            F64       6.28";
+        psMetadata *md = psMetadataConfigParse(NULL, NULL, str, false);
         psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
-        ok( md != NULL && item != NULL,
-            "psMetadataConfigParse: return correct metadata for valid "
-            "string input. (F64)");
-        skip_start(  item == NULL, 2,
-                     "Skipping 1 tests because metadata container is empty!");
-        ok( item->type == PS_DATA_F64,
-            "psMetadataConfigParse: return correct metadataItem data (F64) "
-            "from mdputted metadata.");
-        ok_float(6.28, item->data.F64,
-                 "psMetadataConfigParse: return correct metadataItem data (F64) "
-                 "value.");
-        ok_str( item->name, "item4",
-                "psMetadataConfigParse: return correct metadataItem name (F64)");
+
+        ok(md != NULL, "return correct metadata for valid string input.");
+        ok(item != NULL, "return correct metadata for valid string input.");
+        skip_start(item == NULL, 2,
+                "Skipping 1 tests because metadata container is empty!");
+        ok(item->type == PS_DATA_F64, "return correct metadataItem type");
+        ok_float(6.28, item->data.F64, "return correct metadataItem data");
+        ok_str(item->name, "item4", "return correct metadataItem name");
+        ok_str(item->comment, "", "return correct metadataItem comment");
         skip_end();
+
         psFree(md);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
 
@@ -96,55 +93,56 @@
     {
         psMemId id = psMemGetId();
-        char str4[70];
-        strcpy(str4, "item8            S8        3\nitem8            S8        5");
+        char *str = "item8            S8        3\nitem8            S8        5";
         unsigned int nfail = 0;
-        psMetadata *md = psMetadataConfigParse(NULL, &nfail, str4, false);
+        psMetadata *md = psMetadataConfigParse(NULL, &nfail, str, false);
         psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
-        ok( md != NULL && item != NULL && md->list->n == 1  && nfail == 1,
-            "psMetadataConfigParse: return correct metadata for string "
-            "with duplicate entry. (S8)");
-        skip_start(  item == NULL, 2,
+
+        ok(md != NULL, "return metadata for 1 good & 1 duplicate (bad) line");
+        ok(item != NULL, "return non-empty metdata");
+        is_long(md->list->n, 1, "# of metdataItems");
+        is_int(nfail, 1, "number of parse failures");
+        skip_start(item == NULL, 2,
+                "Skipping 1 tests because metadata container is empty!");
+        ok(item->type == PS_TYPE_S8, "metdataItem type");
+        is_int(item->data.S8, 3, "metdataItem value");
+        ok_str(item->name, "item8", "return correct metadataItem name");
+        ok_str(item->comment, "", "return correct metadataItem comment");
+        skip_end();
+        psFree(md);
+
+        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
+    }
+
+    // Return correct metadata for correct string input - Vector
+    {
+        psMemId id = psMemGetId();
+        char *str = "@vector6 U8 1 2 3 4 5   # I am a vector";
+        psMetadata *md = psMetadataConfigParse(NULL, NULL, str, true);
+        psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
+
+        ok(md != NULL, "return metadata for valid string input. (Vector)");
+        ok(item != NULL, "non-empty metadata");
+        skip_start(item == NULL, 2,
                      "Skipping 1 tests because metadata container is empty!");
-        ok( item->type == PS_TYPE_S8 && item->data.S8 == 3,
-            "psMetadataConfigParse: return correct metadataItem data (S8)");
-        ok_str( item->name, "item8",
-                "psMetadataConfigParse: return correct metadataItem name (S8)");
+        ok(item->type == PS_DATA_VECTOR, "metadataItem type");
+        is_int(((psVector*)(item->data.V))->data.U8[0], 1,
+                "return correct metadataItem data (Vector)");
+        ok_str(item->name, "vector6",
+                "return correct metadataItem name (Vector)");
+        ok_str(item->comment, "", "return correct metadataItem comment");
         skip_end();
+
         psFree(md);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
 
-    //Return correct metadata for correct string input - Vector
+    // Return empty metadata for incorrect string input
     {
         psMemId id = psMemGetId();
-        char str7[70];
-        strcpy(str7, "@vector6 U8 1 2 3 4 5   # I am a vector");
-        psMetadata *md = psMetadataConfigParse(NULL, NULL, str7, true);
-        psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
-        ok(md != NULL && item != NULL,
-            "psMetadataConfigParse: return correct metadata for valid "
-            "string input. (Vector)");
-        skip_start(item == NULL, 2,
-                     "Skipping 1 tests because metadata container is empty!");
-        ok(item->type == PS_DATA_VECTOR
-            && ((psVector*)(item->data.V))->data.U8[0] == 1,
-            "psMetadataConfigParse: return correct metadataItem data (Vector) ");
-        ok_str(item->name, "vector6",
-                "psMetadataConfigParse: return correct metadataItem name (Vector)");
-        skip_end();
-        psFree(md);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
+        char *str = "END\n";
+        psMetadata *md = psMetadataConfigParse(NULL, NULL, str, false);
 
-    //Return empty metadata for incorrect string input
-    {
-        psMemId id = psMemGetId();
-        char str9[70];
-        strcpy(str9, "END\n");
-        psMetadata *md = psMetadataConfigParse(NULL, NULL, str9, false);
-        psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
-        ok(md != NULL && item == NULL,
-            "psMetadataConfigParse: return empty metadata for invalid "
-            "string input.");
+        ok(md == NULL, "return NULL on 1 invalid line");
+
         psFree(md);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");