Changeset 2273 for trunk/psLib/test/sysUtils/tst_psError.c

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

• trunk/psLib/test/sysUtils/tst_psError.c (modified) (10 diffs)

trunk/psLib/test/sysUtils/tst_psError.c

@@ -13 +13 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -99 +99 @@
 
     // Generate three error messages to have messages on error stack
-    if (psErrorMsg("test4A", code, true, "Error code = %d", code) !=  code) {
+    if (psError(code, true, "Error code = %d", code) !=  code) {
         psLogMsg("tst_psError04", PS_LOG_ERROR, "Failed return value verify.");
         return 31;
     }
-    if (psErrorMsg("test4A", (code+1), false, "Error code = %d", (code+1)) != (code+1)) {
+    if (psError((code+1), false, "Error code = %d", (code+1)) != (code+1)) {
         psLogMsg("tst_psError04", PS_LOG_ERROR, "Failed return value verify.");
         return 32;
     }
-    if (psErrorMsg("test4A", (code+2), false, "Error code = %d", (code+2)) != (code+2)) {
+    if (psError((code+2), false, "Error code = %d", (code+2)) != (code+2)) {
         psLogMsg("tst_psError04", PS_LOG_ERROR, "Failed return value verify.");
         return 33;
@@ -165 +165 @@
 
     // Generate three error messages
-    if (psErrorMsg("test3A", code, true, "Error code = %d", code) !=  code) {
+    if (psError(code, true, "Error code = %d", code) !=  code) {
         psLogMsg("tst_psError03", PS_LOG_ERROR, "Failed return value verify.");
         return 23;
     }
-    if (psErrorMsg("test3A", (code+1), false, "Error code = %d", (code+1)) != (code+1)) {
+    if (psError((code+1), false, "Error code = %d", (code+1)) != (code+1)) {
         psLogMsg("tst_psError03", PS_LOG_ERROR, "Failed return value verify.");
         return 24;
     }
-    if (psErrorMsg("test3A", (code+2), false, "Error code = %d", (code+2)) != (code+2)) {
+    if (psError((code+2), false, "Error code = %d", (code+2)) != (code+2)) {
         psLogMsg("tst_psError03", PS_LOG_ERROR, "Failed return value verify.");
         return 25;
@@ -219 +219 @@
 
     // Generate error message and verify return value
-    if (psErrorMsg("test2A", code, true, "Error code = %d", code) != code ) {
+    if (psError(code, true, "Error code = %d", code) != code ) {
         psLogMsg("tst_psError02", PS_LOG_ERROR, "Failed return value verify.");
         return 10;
@@ -233 +233 @@
 
     // Verify the return value of psErrorMsg is the psErrorCode passed
-    if ( psErrorMsg("test1A", code, true, "Error code = %d", code) != code) {
+    if ( psError(code, true, "Error code = %d", code) != code) {
         psLogMsg("tst_psError01", PS_LOG_ERROR, "Failed return value verify.");
         return 1;
@@ -240 +240 @@
 
     // test1B empty string in for name argument
-    if ( psErrorMsg("", code+1, true, "Error code = %d", code+1) != code+1) {
+    if ( psError(code+1, true, "Error code = %d", code+1) != code+1) {
         psLogMsg("tst_psError01", PS_LOG_ERROR, "Failed return with empty string.");
         return 2;
@@ -246 +246 @@
     psErrorStackPrint(stderr,"ERROR STACK PRINT Test1B");
 
-    // test1C null pointer in  for name argument
-    if ( psErrorMsg(NULL, code+2, true, "Error code = %d", code+2) != code+2) {
-        psLogMsg("tst_psError01", PS_LOG_ERROR, "Failed return with null name arg.");
-        return 3;
-    }
-    psErrorStackPrint(stderr,"ERROR STACK PRINT Test1C");
-
     // test1D undefined code
-    if ( psErrorMsg("test1D", -1, true, "Error code = %d", -1) != -1) {
+    if ( psError(-1, true, "Error code = %d", -1) != -1) {
         psLogMsg("test_psError01", PS_LOG_ERROR, "Failed return with undefined code.");
         return 4;
@@ -261 +254 @@
 
     // test1E set psErrorMsg argument to false
-    if( psErrorMsg("test1E", code, false, "Error code = %d", code) != code) {
+    if( psError(code, false, "Error code = %d", code) != code) {
         psLogMsg("test_psError01", PS_LOG_ERROR, "Failed return with false new arg.");
         return 5;
@@ -268 +261 @@
 
     // test1F psErrorMsg with a error code less then PS_ERR_BASE(256)
-    if( psErrorMsg("test1F", 9, true, "Errno code = %d", 9) != 9) {
+    if( psError(9, true, "Errno code = %d", 9) != 9) {
         psLogMsg("test_psError01", PS_LOG_ERROR, "Failed return with errno code.");
         return 6;
@@ -287 +280 @@
 
     // Test point #1 Multiple type values placed in the error string
-    psError(__func__,
+    psError(PS_ERR_UNKNOWN, true,
             "ALL TYPES intval = %d longval = %ld floatval = %f charval = %c strval = %s",
             intval,longval,floatval,charval,stringval);
 
     // Test point #2 String values in error message
-    psError(PS_STRING(__LINE__),"NO VALUES");
+    psError(PS_ERR_UNKNOWN, true, "NO VALUES");
 
     // Test point #3 Empty strings in error message
-    psError("","");
+    psError(PS_ERR_UNKNOWN, true, "");
 
     return 0;