Index: trunk/psLib/test/types/Makefile.am
===================================================================
--- trunk/psLib/test/types/Makefile.am	(revision 10670)
+++ trunk/psLib/test/types/Makefile.am	(revision 10698)
@@ -30,4 +30,5 @@
 	tap_psList_all \
 	tap_psLookupTable_all \
+	tap_psMetadataConfigWrite \
 	tap_psMetadataConfig_output \
 	tap_psMetadataConfig_input \
Index: trunk/psLib/test/types/tap_psMetadataConfigWrite.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfigWrite.c	(revision 10698)
+++ trunk/psLib/test/types/tap_psMetadataConfigWrite.c	(revision 10698)
@@ -0,0 +1,73 @@
+/**
+ *  C Implementation: tap_psMetadataConfigWrite
+ *
+ * Description:  Tests for psMetadataConfigWrite
+ *
+ * Author: dRob <David.Robbins@mhpcc.hpc.mil>, (C) 2006
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ *
+ */
+
+#include <pslib.h>
+#include <string.h>
+
+#include "tap.h"
+#include "pstap.h"
+
+int main(void)
+{
+    plan_tests(7);
+
+    //Return false for NULL metadata input
+    {
+        ok( !psMetadataConfigWrite(NULL, "mdcfg.wrt"),
+            "return false for NULL metadata input.");
+    }
+
+    //Return false for NULL filename input
+    {
+        psMetadata *md = psMetadataAlloc();
+        ok( !psMetadataConfigWrite(md, NULL),
+            "return false for NULL filename input.");
+        psFree(md);
+    }
+
+    //Return false for invalid filename input
+    {
+        psMetadata *md = psMetadataAlloc();
+        ok( !psMetadataConfigWrite(md, "."),
+            "return false for invalid filename input.");
+        psFree(md);
+    }
+
+    //Return false for empty metadata input
+    {
+        psMetadata *md = psMetadataAlloc();
+        ok( !psMetadataConfigWrite(md, "mdcfg.wrt"),
+            "return false for empty metadata input.");
+        psFree(md);
+    }
+
+    //Return true for valid inputs
+    {
+        psMetadata *md = psMetadataAlloc();
+        psMetadataAddBool(md, PS_LIST_TAIL, "item1-1", 0, "I am a boolean", true);
+        ok( psMetadataConfigWrite(md, "mdcfg.wrt"),
+            "return true for valid inputs.");
+        char configTest[61];
+        char fileStr[62];
+        FILE *mdcfg = fopen("mdcfg.wrt", "r");
+        fgets(fileStr, 61, mdcfg);
+        strncpy(configTest,
+                "item1-1          BOOL      T                # I am a boolean", 60);
+        ok_strn(configTest, fileStr, 60,
+                "return correct output.");
+        fclose(mdcfg);
+        remove
+            ("mdcfg.wrt");
+        psFree(md);
+    }
+
+    done();
+}
Index: trunk/psLib/test/types/tap_psMetadataConfig_output.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfig_output.c	(revision 10670)
+++ trunk/psLib/test/types/tap_psMetadataConfig_output.c	(revision 10698)
@@ -2,6 +2,5 @@
  *  C Implementation: tap_psMetadataConfig_output
  *
- * Description:  Tests for psMetadataConfigWrite, psMetadataConfigPrint,
- *               & psMetadataConfigFormat
+ * Description:  Tests for psMetadataConfigPrint & psMetadataConfigFormat
  *
  * Author: dRob <David.Robbins@mhpcc.hpc.mil>, (C) 2006
@@ -17,192 +16,17 @@
 #include "pstap.h"
 
-static void testMetaConfigWrite(void);
 static void testMetaConfigPrint(void);
 static void testMetaConfigFormat(void);
 
-static psMetadata *setupMeta(void);
-
 int main(void)
 {
-    plan_tests(25);
+    plan_tests(19);
 
     diag("Tests for psMetadataConfig Output Functions");
 
-    testMetaConfigWrite();
     testMetaConfigPrint();
     testMetaConfigFormat();
 
     done();
-}
-
-static psMetadata *setupMeta(void)
-{
-    psMetadata *md = NULL;
-    psVector *vec1 = NULL;
-    psVector *vec2 = NULL;
-    psVector *vec3 = NULL;
-    psVector *vec4 = NULL;
-    psVector *vec5 = NULL;
-    psVector *vec6 = NULL;
-    psVector *vec7 = NULL;
-    psVector *vec8 = NULL;
-    psVector *vec9 = NULL;
-    psVector *vec10 = NULL;
-    psMetadata *newMD = NULL;
-    psTime *time1;
-    psTime *time2;
-    psTime *time3;
-    psTime *time4;
-    int i = 0;
-    md = psMetadataAlloc();
-    newMD = psMetadataAlloc();
-    vec1 = psVectorAlloc(60, PS_DATA_S8);
-    vec2 = psVectorAlloc(60, PS_DATA_S16);
-    vec3 = psVectorAlloc(60, PS_DATA_S32);
-    vec4 = psVectorAlloc(60, PS_DATA_S64);
-    vec5 = psVectorAlloc(60, PS_DATA_U8);
-    vec6 = psVectorAlloc(60, PS_DATA_U16);
-    vec7 = psVectorAlloc(60, PS_DATA_U32);
-    vec8 = psVectorAlloc(60, PS_DATA_U64);
-    vec9 = psVectorAlloc(60, PS_DATA_F32);
-    vec10 = psVectorAlloc(60, PS_DATA_F64);
-    time1 = psTimeAlloc(PS_TIME_TAI);
-    time2 = psTimeAlloc(PS_TIME_TT);
-    time3 = psTimeAlloc(PS_TIME_UTC);
-    time4 = psTimeAlloc(PS_TIME_UT1);
-    for (i = 0; i < 5; i++) {
-        vec1->data.S8[i] = i+1;
-        vec2->data.S16[i] = i+1;
-        vec3->data.S32[i] = i+1;
-        vec4->data.S64[i] = i+1;
-        vec5->data.U8[i] = i+1;
-        vec6->data.U16[i] = i+1;
-        vec7->data.U32[i] = i+1;
-        vec8->data.U64[i] = i+1;
-        vec9->data.F32[i] = i+1.0;
-        vec10->data.F64[i] = i+1.0;
-    }
-    vec1->n = 5;
-    vec2->n = 5;
-    vec3->n = 5;
-    vec4->n = 5;
-    vec5->n = 5;
-    vec6->n = 5;
-    vec7->n = 5;
-    vec8->n = 5;
-    vec9->n = 5;
-    vec10->n = 5;
-    time1->sec = 1000;
-    time1->nsec = 25;
-    time1->leapsecond = true;
-    psMetadataAddBool(md, PS_LIST_TAIL, "item1-1", 0, "I am a boolean", true);
-    psMetadataAddBool(md, PS_LIST_TAIL, "item1-2", 0, "I am a boolean2", false);
-    psMetadataAddS8(md, PS_LIST_TAIL, "item2-8", 0, "", 8);
-    psMetadataAddS16(md, PS_LIST_TAIL, "item2-16", 0, "", 16);
-    psMetadataAddS32(md, PS_LIST_TAIL, "item2-32", 0, "", 32);
-    psMetadataAddS64(md, PS_LIST_TAIL, "item2-64", 0, "", 64);
-    psMetadataAddU8(md, PS_LIST_TAIL, "item3-8", 0, "", 8);
-    psMetadataAddU16(md, PS_LIST_TAIL, "item3-16", 0, "", 16);
-    psMetadataAddU32(md, PS_LIST_TAIL, "item3-32", 0, "", 32);
-    psMetadataAddU64(md, PS_LIST_TAIL, "item3-64", 0, "", 64);
-    psMetadataAddF32(md, PS_LIST_TAIL, "item4", 0, NULL, 3.14);
-    psMetadataAddF64(md, PS_LIST_TAIL, "item5", 0, "", 6.28);
-    psMetadataAddStr(md, PS_LIST_TAIL, "item6", 0, "I am a string", "GNIRTS");
-    psMetadataAddStr(md, PS_LIST_TAIL, "item6-2", 0, "", "");
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorS8", 0, "I am a vector", vec1);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorS16", 0, "", vec2);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorS32", 0, "", vec3);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorS64", 0, "", vec4);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorU8", 0, "", vec5);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorU16", 0, "I am a vector", vec6);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorU32", 0, "", vec7);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorU64", 0, "", vec8);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorF32", 0, "", vec9);
-    psMetadataAddVector(md, PS_LIST_TAIL, "vectorF64", 0, "", vec10);
-    psMetadataAddTime(md, PS_LIST_TAIL, "time01", 0, "I am time1", time1);
-    psMetadataAddTime(md, PS_LIST_TAIL, "time02", 0, "I am time2", time2);
-    psMetadataAddTime(md, PS_LIST_TAIL, "time03", 0, "I am time3", time3);
-    psMetadataAddTime(md, PS_LIST_TAIL, "time04", 0, "I am time4", time4);
-
-    psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", 0, NULL, 666);
-    psMetadata *newestMD = NULL;
-    newestMD = psMetadataAlloc();
-    psMetadataAddVector(newestMD, PS_LIST_TAIL, "VECTORNEW", 0, "Newest VECTOR", vec1);
-    psMetadataAddStr(newestMD, PS_LIST_TAIL, "cell", 0, "I am a p-Star", "pStArRs");
-    psMetadataAddMetadata(newMD, PS_LIST_TAIL, "META_NEW", 0, "", newestMD);
-    psMetadataAddF32(newMD, PS_LIST_TAIL, "ITEM02", 0, "I AM FLOAT", 666.6);
-    psMetadataAddF64(newMD, PS_LIST_TAIL, "ITEM03", 0, "I AM DOUBLE", 666.666);
-
-    psMetadataAddMetadata(md, PS_LIST_TAIL, "metadata7", 0, "I am a metadata", newMD);
-    psFree(time1);
-    psFree(time2);
-    psFree(time3);
-    psFree(time4);
-    psFree(newestMD);
-    psFree(vec1);
-    psFree(vec2);
-    psFree(vec3);
-    psFree(vec4);
-    psFree(vec5);
-    psFree(vec6);
-    psFree(vec7);
-    psFree(vec8);
-    psFree(vec9);
-    psFree(vec10);
-    psFree(newMD);
-    return md;
-}
-
-void testMetaConfigWrite(void)
-{
-    diag("  >>>Test 1:  psMetadataConfigWrite");
-
-    psMetadata *md = NULL;
-
-    //Return false for NULL metadata input
-    {
-        ok( !psMetadataConfigWrite(md, "mdcfg.wrt"),
-            "psMetadataConfigWrite:           return false for NULL metadata input.");
-    }
-    md = psMetadataAlloc();
-    //Return false for NULL filename input
-    {
-        ok( !psMetadataConfigWrite(md, NULL),
-            "psMetadataConfigWrite:           return false for NULL filename input.");
-    }
-    //Return false for invalid filename input
-    {
-        ok( !psMetadataConfigWrite(md, "."),
-            "psMetadataConfigWrite:           return false for invalid filename input.");
-    }
-    //Return false for empty metadata input
-    {
-        ok( !psMetadataConfigWrite(md, "mdcfg.wrt"),
-            "psMetadataConfigWrite:           return false for empty metadata input.");
-    }
-    //Return true for valid inputs
-    {
-        psFree(md);
-        md = setupMeta();
-        ok( psMetadataConfigWrite(md, "mdcfg.wrt"),
-            "psMetadataConfigWrite:           return true for valid inputs.");
-        char configTest[61];
-        char fileStr[62];
-        FILE *mdcfg = fopen("mdcfg.wrt", "r");
-        fgets(fileStr, 61, mdcfg);
-        strncpy(configTest,
-                "item1-1          BOOL      T                # I am a boolean", 60);
-        ok_strn(configTest, fileStr, 60,
-                "psMetadataConfigWrite:           return correct output.");
-        fclose(mdcfg);
-    }
-
-    //Check for Memory leaks
-    {
-        remove
-            ("mdcfg.wrt");
-        psFree(md);
-        checkMem();
-    }
 }
 
@@ -406,4 +230,2 @@
     }
 }
-
-