Changeset 560 for trunk/psLib/test/sysUtils/tst_psTrace01.c

Timestamp:

May 1, 2004, 1:04:35 PM (22 years ago)

Author:

gusciora

Message:

This is a fairly large checkin. I had been sitting on a lot of test code
that was not quite in sync with the current test harness. I modified it
somewhat so it mostly works with the test harness, though there are still
problems with the printFooter() function not having a status for "status
unknown". Also, the runTest is not correctly parsing my date strings in
psLogMsg calls. Also, I added an individual entry for each test in the
Makefile in the test directory. I did this because the generic rules were
failing, and I did not want to break the tests for those people who were
successfully using the generic rules.

File:

• trunk/psLib/test/sysUtils/tst_psTrace01.c (modified) (3 diffs)

trunk/psLib/test/sysUtils/tst_psTrace01.c

@@ -12 +12 @@
     int successFlag = true;
 
-    printPositiveTestHeader(stderr,
+    printPositiveTestHeader(stdout,
                             "psTrace functions",
-                            "Testing psTraceReset()");
+                            "psTraceReset()");
 
     for (i=0;i<10;i++) {
@@ -21 +21 @@
 
         lev = psGetTraceLevel(".");
-        if (lev != UNKNOWN_TRACE_LEVEL) {
+        if (lev != DEFAULT_TRACE_LEVEL) {
             printf("ERROR: expected trace level was %d, actual was %d\n",
                    i, lev);
@@ -32 +32 @@
     psSetTraceLevel(".a.b.c", 2);
     psTraceReset();
-    if ((UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".")) ||
-            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a")) ||
-            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a.b")) ||
-            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a.b.c"))) {
+    if ((DEFAULT_TRACE_LEVEL != psGetTraceLevel(".")) ||
+            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a")) ||
+            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a.b")) ||
+            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a.b.c"))) {
         printf("ERROR: trace levels were not reset properly\n");
         successFlag = false;
     }
 
-    printFooter(stderr,
+    printFooter(stdout,
                 "psTrace functions",
-                "Testing psTraceReset()",
+                "psTraceReset()",
                 successFlag);
-    exit(0);
+
+    exit(!successFlag);
 }