Index: trunk/psLib/test/types/Makefile.am
===================================================================
--- trunk/psLib/test/types/Makefile.am	(revision 8757)
+++ trunk/psLib/test/types/Makefile.am	(revision 8774)
@@ -16,4 +16,5 @@
 	tap_psListIterator \
 	tap_psMetadataConfigParse \
+	tap_psMetadataConfigParse_time \
 	tap_psMetadataItemCompare \
 	tap_psMetadataItemParse \
Index: trunk/psLib/test/types/tap_psMetadataConfigParse.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfigParse.c	(revision 8757)
+++ trunk/psLib/test/types/tap_psMetadataConfigParse.c	(revision 8774)
@@ -148,14 +148,14 @@
     plan_tests(52);
 
-    diag("psMetadataParseConfig tests");
+    diag("psMetadataConfigRead tests");
 
     generateMDConfig();
 
     unsigned int numBadLines = 0;            // Number of bad lines
-    psMetadata *md = psMetadataConfigParse(NULL, &numBadLines, FILENAME, false);
+    psMetadata *md = psMetadataConfigRead(NULL, &numBadLines, FILENAME, false);
     ok(md, "md = %x", md);
     ok(numBadLines == 1, "number of bad lines = %d", numBadLines); // One bad line from boolean
     skip_start(!md || numBadLines != 1, 0,
-               "Skipping 0 tests because psMetadataConfigParse failed.");
+               "Skipping 0 tests because psMetadataConfigRead failed.");
     ok(psListLength(md->list) == 6, "size = %d", psListLength(md->list));
 
Index: trunk/psLib/test/types/tap_psMetadataConfigParse_time.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfigParse_time.c	(revision 8774)
+++ trunk/psLib/test/types/tap_psMetadataConfigParse_time.c	(revision 8774)
@@ -0,0 +1,182 @@
+#include <stdio.h>
+#include <pslib.h>
+
+#include "tap.h"
+#include "pstap.h"
+
+int main (void)
+{
+    plan_tests(40);
+
+    diag("psMetadataParseConfig time format tests");
+
+    {
+        psMemId id = psMemGetId();
+
+        char *testStr = "time    UTC     2005-03-18T16:05:00Z\n";
+
+        psU32 nBad = 0;
+        psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
+        psTime *time1 = psMetadataLookupTime(NULL, md, "time");
+        psTime *time2 = psTimeFromISO("2005-03-18T16:05:00Z", PS_TIME_UTC);
+        double delta = psTimeDelta(time1, time2);
+        psFree(time2);
+
+        ok(md, "md = %x", md);
+        ok(nBad == 0, "number of bad lines = %d", nBad); // One bad line from boolean
+        ok(md->list->n == 1, "number of items in metadata = %ld", md->list->n);
+        ok1(time1->type == PS_TIME_UTC);
+        ok(delta == 0.0, "reported time was off by %fs", delta);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        char *testStr = "time    UT1     2005-03-18T16:05:00Z\n";
+
+        psU32 nBad = 0;
+        psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
+        psTime *time1 = psMetadataLookupTime(NULL, md, "time");
+        psTime *time2 = psTimeFromISO("2005-03-18T16:05:00Z", PS_TIME_UT1);
+        double delta = psTimeDelta(time1, time2);
+        psFree(time2);
+
+        ok(md, "md = %x", md);
+        ok(nBad == 0, "number of bad lines = %d", nBad);
+        ok(md->list->n == 1, "number of items in metadata = %ld", md->list->n);
+        ok1(time1->type == PS_TIME_UT1);
+        ok(delta == 0.0, "reported time was off by %fs", delta);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        char *testStr = "time    TAI     2005-03-18T16:05:00Z\n";
+
+        psU32 nBad = 0;
+        psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
+        psTime *time1 = psMetadataLookupTime(NULL, md, "time");
+        psTime *time2 = psTimeFromISO("2005-03-18T16:05:00Z", PS_TIME_TAI);
+        double delta = psTimeDelta(time1, time2);
+        psFree(time2);
+
+        ok(md, "md = %x", md);
+        ok(nBad == 0, "number of bad lines = %d", nBad);
+        ok(md->list->n == 1, "number of items in metadata = %ld", md->list->n);
+        ok1(time1->type == PS_TIME_TAI);
+        ok(delta == 0.0, "reported time was off by %fs", delta);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        char *testStr = "time    TT      2005-03-18T16:05:00Z";
+
+        psU32 nBad = 0;
+        psMetadata *md = psMetadataConfigParse(NULL, &nBad, testStr, false);
+        psTime *time1 = psMetadataLookupTime(NULL, md, "time");
+        psTime *time2 = psTimeFromISO("2005-03-18T16:05:00Z", PS_TIME_TT);
+        double delta = psTimeDelta(time1, time2);
+        psFree(time2);
+
+        ok(md, "md = %x", md);
+        ok(nBad == 0, "number of bad lines = %d", nBad);
+        ok(md->list->n == 1, "number of items in metadata = %ld", md->list->n);
+        ok1(time1->type == PS_TIME_TT);
+        ok(delta == 0.0, "reported time was off by %fs", delta);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        // missing Z
+        char *testStr = "broken      UTC     2005-03-18T16:05:00";
+
+        psU32 nBad = 0;
+        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);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        // missing Z
+        char *testStr = "broken      UT1     2005-03-18T16:05:00";
+
+        psU32 nBad = 0;
+        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);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        // missing Z
+        char *testStr = "broken      TAI     2005-03-18T16:05:00";
+
+        psU32 nBad = 0;
+        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);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    {
+        psMemId id = psMemGetId();
+
+        // missing Z
+        char *testStr = "broken      TT      2005-03-18T16:05:00";
+
+        psU32 nBad = 0;
+        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);
+
+        psFree(md);
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    return exit_status();
+}