Changeset 41171 for trunk/psLib/test/sys/tap_psError.c

Timestamp:

Nov 27, 2019, 11:57:38 AM (6 years ago)

Author:

eugene

Message:

updates to psLib tests

File:

• trunk/psLib/test/sys/tap_psError.c (modified) (3 diffs)

trunk/psLib/test/sys/tap_psError.c

@@ -324 +324 @@
 
         for (psS32 i = 0; i < numErr; i++) {
-            const char* desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+1+i);
-            ok(desc != NULL,
-                "psErrorCode didn't find registered error code.");
-
-            ok(strcmp(desc,errDesc[i].description) == 0,
-                "psErrorCode didn't return the proper description.  Got '%s', expected '%s'.", desc,errDesc[i].description);
-        }
-
-        /*
-            2. invoke psErrorCodeString with a static/builtin psLib error code. Verify:
+            const char *desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+1+i);
+            ok(desc, "psErrorCode found registered error code.");
+            ok(!strcmp(desc,errDesc[i].description), "psErrorCode returned the proper description.  Got '%s', expected '%s'.", desc, errDesc[i].description);
+        }
+
+        /* 2. invoke psErrorCodeString with a static/builtin psLib error code. Verify:
                 a. the result is correct.
         */
-        const char* desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES);
-        ok(desc != NULL, "psErrorCode didn't find static error code.");
-        ok(strcmp(desc,"error classes end marker") == 0,
-            "psErrorCode didn't return the proper description.  Got '%s', expected '%s'.",
-            desc,"error classes end marker");
+        const char *desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES);
+        ok(desc, "psErrorCode found static error code.");
+        ok(!strcmp(desc, "error classes end marker"), "psErrorCode returned the proper description.  Got '%s', expected '%s'.", desc, "error classes end marker");
 
         desc = psErrorCodeString(PS_ERR_NONE);
-        ok(desc != NULL,
-            "psErrorCode didn't find static error code.");
-        ok(strcmp(desc,"not an error") == 0,
-            "psErrorCode didn't return the proper description.  Got '%s', expected '%s'.",
-            desc,"not an error");
+        ok(desc, "psErrorCode found static error code.");
+        ok(!strcmp(desc,"not an error"), "psErrorCode returned the proper description.  Got '%s', expected '%s'.", desc, "not an error");
     
-        /*
-            3. invoke psErrorCodeString with an invalid code. Verify a NULL is returned.
-        */
+        /* 3. invoke psErrorCodeString with an invalid code. Verify a NULL is returned. */
         desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+numErr+1);
-        ok(desc == NULL,
-            "psErrorCode didn't return a NULL with a bogus input code.");
-
-        /*
-            4. invoke psErrorRegister with a NULL psErrorDescription. Verify that:
+        ok(!desc, "psErrorCode returns a NULL with a bogus input code.");
+
+        /* 4. invoke psErrorRegister with a NULL psErrorDescription. Verify that:
                 a. the execution does not cease.
                 b. an appropriate error is generated.
@@ -366 +353 @@
         psErr* err = psErrorLast();
         ok(err->code == PS_ERR_BAD_PARAMETER_NULL,
-        "psErrorCode didn't generate proper error code for NULL input.");
+        "psErrorCode generated proper error code for NULL input.");
 
         psFree(err);
@@ -377 +364 @@
         err = psErrorLast();
         ok(err->code == PS_ERR_NONE,
-            "psErrorCode generated an error for nErrors = 0.");
+            "psErrorCode did not generate an error for nErrors = 0.");
         psFree(err);
     }