Index: /trunk/psLib/test/types/tap_psMetadataItemCompare.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataItemCompare.c	(revision 9935)
+++ /trunk/psLib/test/types/tap_psMetadataItemCompare.c	(revision 9936)
@@ -1,2 +1,13 @@
+/**
+ *  C Implementation: tap_psMetadataItemCompare
+ *
+ * Description:  Tests for psMetadataItemCompare
+ *
+ * Author: dRob <David.Robbins@mhpcc.hpc.mil>, (C) 2006
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ *
+ */
+
 #include <pslib.h>
 
@@ -4,6 +15,21 @@
 #include "pstap.h"
 
+void testItemCompare(void);
+
 int main (void)
 {
+    plan_tests(22);
+
+    diag("psMetadataItemCompare() tests");
+
+    testItemCompare();
+
+    done();
+}
+
+void testItemCompare(void)
+{
+    diag("  >>>Test 1:  psMetadataItemCompare");
+
     psMetadataItem *compare = NULL;
     psMetadataItem *template = NULL;
@@ -11,7 +37,4 @@
     psMetadataItem *item = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", true)
                            ;
-    plan_tests(22);
-
-    diag("psMetadataItemCompare() tests");
 
     //Return false for NULL compare psMetadataItem
@@ -27,11 +50,9 @@
     }
 
-
-    template = psMetadataItemAlloc("Milky Way", PS_DATA_BOOL, "No Comment", true)
-               ;
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_S32, "No Comment", 1);
-
     //Return false for psMetadataItem's with different names
     {
+        template = psMetadataItemAlloc("Milky Way", PS_DATA_BOOL, "No Comment", true)
+                   ;
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_S32, "No Comment", 1);
         ok( !psMetadataItemCompare(template, item),
             "psMetadataItemCompare:      return false for input with different names.")
@@ -39,6 +60,6 @@
     }
     //Return true for an exact match (copied psMetadataItem)
-    itemCopy = psMetadataItemCopy(item);
-    {
+    {
+        itemCopy = psMetadataItemCopy(item);
         ok( psMetadataItemCompare(itemCopy, item),
             "psMetadataItemCompare:      return true for comparison of identical psMetadataItem's.");
@@ -52,7 +73,7 @@
 
     //Return true for comparing Bool with F64
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_F64, "No Comment", 1.0000);
-    {
+    {
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_F64, "No Comment", 1.0000);
         ok( psMetadataItemCompare(compare, item),
             "psMetadataItemCompare:      return false for comparison of F64 to bool." );
@@ -65,11 +86,11 @@
 
     //Return true for comparing S32 with F32 of same value
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_S32, "No Comment", 1)
-               ;
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_F32, "No Comment", 1.00);
-    {
+    {
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_S32, "No Comment", 1)
+                   ;
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_F32, "No Comment", 1.00);
         ok( psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:      return true for comparison of S32 to F32." )
@@ -84,11 +105,11 @@
 
     //Return true for comparing U32 with S16 of same value
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_S16, "No Comment", 1)
-               ;
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_U32, "No Comment", 1);
-    {
+    {
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_S16, "No Comment", 1)
+                   ;
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_U32, "No Comment", 1);
         ok( psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return true for comparison of S16 to U32." )
@@ -103,11 +124,11 @@
 
     //Return true for comparing U8 with U16 of same value
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_U8, "No Comment", 1)
-               ;
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_U16, "No Comment", 1);
-    {
+    {
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_U8, "No Comment", 1)
+                   ;
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_U16, "No Comment", 1);
         ok( psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return true for comparison of U8 to U16." )
@@ -122,7 +143,7 @@
 
     //Return true for comparing U8 with S8 of same value
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_S8, "No Comment", 1);
-    {
+    {
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_S8, "No Comment", 1);
         ok( psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return true for comparison of U8 to S8." )
@@ -137,7 +158,7 @@
 
     //Return false for comparing U8 with S64 of same value
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_S64, "No Comment", 1);
-    {
+    {
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_S64, "No Comment", 1);
         ok( !psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return false for comparison of U8 to S64*.  "
@@ -154,11 +175,12 @@
 
     //Return false for comparing string of different value
-    psFree(compare);
-    compare = psMetadataItemAlloc("Snickers", PS_DATA_STRING, "No Comment", "Not Going Anywhere?");
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_STRING, "No Comment", "For a While?")
-               ;
-    {
+    {
+        psFree(compare);
+        compare = psMetadataItemAlloc("Snickers", PS_DATA_STRING, "No Comment",
+                                      "Not Going Anywhere?");
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_STRING, "No Comment", "For a While?")
+                   ;
         ok( !psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return false for comparison of different psString's.")
@@ -167,9 +189,10 @@
 
     //Return true for comparing string of same value
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_STRING, "No Comment", "Not Going Anywhere?")
-               ;
-    {
+    {
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_STRING, "No Comment",
+                                       "Not Going Anywhere?")
+                   ;
         ok( psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return true for comparison of identical psString's.")
@@ -178,9 +201,9 @@
 
     //Return false for comparing string with bool
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", false)
-               ;
-    {
+    {
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", false)
+                   ;
         ok( !psMetadataItemCompare(compare, template),
             "psMetadataItemCompare:     return false for comparison of psString with bool.")
@@ -188,9 +211,9 @@
     }
     //Return false for comparing bool with string
-    psFree(template)
-    ;
-    template = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", false)
-               ;
-    {
+    {
+        psFree(template)
+        ;
+        template = psMetadataItemAlloc("Snickers", PS_DATA_BOOL, "No Comment", false)
+                   ;
         ok( !psMetadataItemCompare(template, compare),
             "psMetadataItemCompare:     return false for comparison of psString with bool.")
@@ -198,5 +221,5 @@
     }
 
-    //Check for Memory Leaks before exit
+    //Check for Memory leaks
     {
         psFree(compare);
@@ -205,8 +228,7 @@
         psFree(itemCopy);
         psFree(item);
-    }
-
-    //    return exit_status();
-    done();
+        checkMem();
+    }
 }
 
+