Changeset 1851

Timestamp:

Sep 22, 2004, 1:47:09 PM (22 years ago)

Author:

evanalst

Message:

Convert psError test driver to use runTestSuite.

Location:

trunk/psLib/test/sysUtils

Files:

• tst_psError.c (modified) (4 diffs)
• verified/tst_psError.stderr (modified) (3 diffs)

trunk/psLib/test/sysUtils/tst_psError.c

@@ -10 +10 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:06 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-09-22 23:47:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include "psTest.h"
 
-int main(int argc,
-         char* argv[])
+static int testError00(void);
+
+testDescription tests[] = {
+                              {testError00, 0, "psError()", 0, false},
+                              {NULL}
+                          };
+
+int main( int argc, char* argv[] )
+{
+    psLogSetLevel( PS_LOG_INFO );
+
+    return ( !runTestSuite(stderr, "psError", tests, argc, argv) );
+}
+
+static int testError00(void)
 {
 
@@ -31 +44 @@
     char  charval = 'E';
     char *stringval = "E R R O R";
-    int   memBlockAllocated = 0;
-    psMemBlock  ***memBlockPtr = NULL;
 
     // Test point #1 Multiple type values placed in the error string
@@ -51 +62 @@
     printFooter(stderr, "psError","Empty strings in error message",true);
 
-    // Check for memory leaks
-    memBlockAllocated = psMemCheckLeaks(0, memBlockPtr, stderr);
-    if ( memBlockAllocated != 0 ) {
-        fprintf(stderr,"FAIL - Memory leak detected - Number of blocks = %d\n",memBlockAllocated);
-    }
-    // Check for memory corruption and abort if detected
-    memBlockAllocated = psMemCheckCorruption(1);
-
     return 0;
 }

trunk/psLib/test/sysUtils/verified/tst_psError.stderr

@@ +1 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psError.c                                              *
+*            TestPoint: psError{psError()}                                         *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psError.c                                              *
@@ -5 +11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|main
+<DATE><TIME>|<HOST>|E|testError00
     ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
 
@@ -31 +37 @@
 ---> TESTPOINT PASSED (psError{Empty strings in error message} | tst_psError.c)
 
+
+---> TESTPOINT PASSED (psError{psError()} | tst_psError.c)
+