Index: trunk/psLib/test/sys/tap_psLine.c
===================================================================
--- trunk/psLib/test/sys/tap_psLine.c	(revision 12550)
+++ trunk/psLib/test/sys/tap_psLine.c	(revision 12781)
@@ -5,6 +5,6 @@
  *  @author  dRob, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-03-22 22:47:07 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-04-10 21:09:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17,129 +17,73 @@
 #include "string.h"
 
-static psS32 testLineAlloc(void);
-static psS32 testLineInit(void);
-static psS32 testLineAdd(void);
-static psS32 testLineChk(void);
+psS32 main( psS32 argc, char* argv[] )
+{
+    plan_tests(16);
+    psLogSetFormat("HLNM");
+    psLogSetLevel(PS_LOG_INFO);
+
+    //testLineAlloc()
+    {
+        psMemId id = psMemGetId();
+        psLine *lineline = NULL;
+        lineline = psLineAlloc(20);
+        ok(lineline->NLINE==20, "psLine set NLINE parameter during Allocation");
+        ok(lineline->Nline == 0, "psLine set Nline parameter during Allocation");
+        strncpy(lineline->line, "Hello World", 20);
+        ok(!strncmp(lineline->line, "Hello World", 20),
+            "psLine was stored a simple string!");
+        psFree(lineline);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+    // testLineInit()
+    {
+        psMemId id = psMemGetId();
+        psLine *line = NULL;
+        //Return false for NULL input
+        int okay = !psLineInit(line);
+        ok(okay, "psLineInit.  Expected false for NULL psLine input");
+        //Allocate a line and return true on Init
+        line = psLineAlloc(1);
+        okay = psLineInit(line);
+        ok(okay, "psLineInit.  Expected true for valid psLine input");
+        ok(line->NLINE == 1 && line->Nline == 0, "psLineInit returned line parameters.");
+        psFree(line);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 
 
-psS32 main( psS32 argc, char* argv[] )
-{
-    plan_tests(12);
-
-    testLineAlloc();
-    testLineInit();
-    testLineAdd();
-    testLineChk();
-}
-
-psS32 testLineAlloc(void)
-{
-//    diag("testLineAlloc");
-
-    psLine *lineline = NULL;
-    lineline = psLineAlloc(20);
-
-    ok (lineline->NLINE==20, "psLine set NLINE parameter during Allocation");
-    skip_start (lineline->NLINE != 20,
-                2, "psLine set NLINE parameter during Allocation");
-
-    ok (lineline->Nline == 0,
-        "psLine set Nline parameter during Allocation\n");
-    skip_start (lineline->Nline == 0,
-                1, "psLine set Nline parameter during Allocation\n");
-
-    strncpy(lineline->line, "Hello World", 20);
-    ok (!strncmp(lineline->line, "Hello World", 20),
-        "psLine was stored a simple string!\n");
-
-    skip_end();
-    skip_end();
-
-    psFree(lineline);
-
-    return 0;
-}
-
-psS32 testLineInit(void)
-{
-//    diag("testLineInit");
-
-    psLine *line = NULL;
-    //Return false for NULL input
-    int okay = !psLineInit(line);
-    ok (okay, "psLineInit.  Expected false for NULL psLine input.\n");
-    skip_start (!okay, 2, "psLineInit.  Expected NULL psLine input.\n");
-
-    //Allocate a line and return true on Init
-    line = psLineAlloc(1);
-    okay = psLineInit(line);
-    ok( okay, "psLineInit.  Expected true for valid psLine input.\n");
-    skip_start( !okay, 1, "psLineInit. Expected true for valid psLine input.");
-
-    ok (line->NLINE == 1 && line->Nline == 0,
-        "psLineInit returned line parameters.");
-
-    skip_end();
-    skip_end();
-
-    psFree(line);
-
-    return 0;
-}
+    // testLineAdd()
+    {
+        psMemId id = psMemGetId();
+        psLine *line = NULL;
+        //Return false for NULL input
+        ok(!psLineAdd(line, "Hello World"),
+            "psLineAdd.  Expected false for NULL psLine input.");
+        //Allocate and return true for valid input.
+        line = psLineAlloc(20);
+        int okay = psLineAdd(line, "Hello %s", "World");
+        ok( okay, "psLineAdd.  Expected true for valid psLine input");
+        ok(line->NLINE == 20 && line->Nline == 11,
+            "psLineAdd failed to return the correct line parameters");
+        ok(!strncmp(line->line, "Hello World", 20),
+            "psLineAdd failed to store the correct line string.");
+        psFree(line);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 
 
-psS32 testLineAdd(void)
-{
-//    diag("testLineAdd");
-
-    psLine *line = NULL;
-    //Return false for NULL input
-    ok (!psLineAdd(line, "Hello World"),
-        "psLineAdd.  Expected false for NULL psLine input.");
-    skip_start(psLineAdd(line, "Hello World"),
-               3, "psLineAdd.  Expected false for NULL psLine input.");
-
-    //Allocate and return true for valid input.
-    line = psLineAlloc(20);
-    int okay = psLineAdd(line, "Hello %s", "World");
-    ok( okay, "psLineAdd.  Expected true for valid psLine input.\n");
-    skip_start( !okay, 2, "psLineAdd.Expected true for valid psLine input.\n");
-
-    ok (line->NLINE == 20 && line->Nline == 11,
-        "psLineAdd failed to return the correct line parameters.\n");
-    skip_start (line->NLINE != 20 || line->Nline != 11,
-                1,"psLineAdd failed to return the correct line parameters.\n");
-
-    ok (!strncmp(line->line, "Hello World", 20),
-        "psLineAdd failed to store the correct line string.");
-
-    skip_end();
-    skip_end();
-    skip_end();
-
-    psFree(line);
-
-    return 0;
+    // testLineChk()
+    {
+        psMemId id = psMemGetId();
+        psLine *line = NULL;
+        //Return false for Null input line
+        ok(!psMemCheckLine(line),
+            "psMemCheckLine return false for NULL line input");
+        line = psLineAlloc(1);
+        ok(psMemCheckLine(line),
+            "psMemCheckLine return true for valid line input");
+        psFree(line);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 }
-
-psS32 testLineChk(void)
-{
-//    diag("testLineChk");
-
-    psLine *line = NULL;
-    //Return false for Null input line
-    ok (!psMemCheckLine(line),
-        "psMemCheckLine return false for NULL line input.\n");
-    skip_start (psMemCheckLine(line),
-                1, "psMemCheckLine return false for NULL line input.\n");
-
-    line = psLineAlloc(1);
-    ok (psMemCheckLine(line),
-        "psMemCheckLine return true for valid line input.\n");
-
-    psFree(line);
-
-    skip_end();
-
-    return 0;
-}