Changeset 12239

Timestamp:

Mar 5, 2007, 12:43:28 PM (19 years ago)

Author:

gusciora

Message:

Corrected test cases

File:

• trunk/psLib/test/types/tap_psArguments_all.c (modified) (7 diffs)

trunk/psLib/test/types/tap_psArguments_all.c

@@ -217 +217 @@
 }
 
+
+
+
+
+
+
 void testArgumentVerbosity(void)
 {
@@ -261 +267 @@
             "psArgumentVerbosity:  return 5 for '-vvv' argument input.");
     }
-    //Return 2 for "-logfmt" option
+    //These routines should return 5 since that was the last level set above with -vvv
+    //Return 5 for "-logfmt" option
     {
         int argc = 2;
@@ -267 +274 @@
         argv[0] = "./program";
         argv[1] = "-logfmt";
-        ok( psArgumentVerbosity(&argc, argv) == 2,
-            "psArgumentVerbosity:  return 2 for '-logfmt' argument input.");
-    }
-    //Return 2 for "-logfmt" option with "H"
+        int rc = psArgumentVerbosity(&argc, argv);
+        ok(rc == 5, "psArgumentVerbosity:  return 5 for '-logfmt' argument input (was %d)", rc);
+    }
+    //Return 5 for "-logfmt" option with "H"
     {
         int argc = 3;
@@ -277 +284 @@
         argv[1] = "-logfmt";
         argv[2] = "H";
-        ok( psArgumentVerbosity(&argc, argv) == 2,
-            "psArgumentVerbosity:  return 2 for '-logfmt H' argument inputs.");
-    }
-    //Return 2 for "-trace" option
+        int rc = psArgumentVerbosity(&argc, argv);
+        ok(rc == 5, "psArgumentVerbosity:  return 5 for '-logfmt H' argument inputs (was %d)", rc);
+    }
+    //Return 5 for "-trace" option
     {
         int argc = 2;
@@ -286 +293 @@
         argv[0] = "./program";
         argv[1] = "-trace";
-        ok( psArgumentVerbosity(&argc, argv) == 2,
-            "psArgumentVerbosity:  return 2 for '-trace' argument input.");
-    }
-    //Return 2 for "-trace 1 2" option
+        int rc = psArgumentVerbosity(&argc, argv);
+        ok(rc == 5, "psArgumentVerbosity:  return 5 for '-trace' argument input (was %d)", rc);
+    }
+    //Return 5 for "-trace 1 2" option
     {
         int argc = 4;
@@ -297 +304 @@
         argv[2] = "1";
         argv[3] = "2";
-        ok( psArgumentVerbosity(&argc, argv) == 2,
-            "psArgumentVerbosity:  return 2 for '-trace 1 2' argument inputs.");
-    }
-    //Return 2 for "-trace-levels" option
+        int rc = psArgumentVerbosity(&argc, argv);
+        ok(rc == 5, "psArgumentVerbosity:  return 5 for '-trace 1 2' argument inputs (was %d", rc);
+    }
+    //Return 5 for "-trace-levels" option
     {
         int argc = 2;
@@ -306 +313 @@
         argv[0] = "./program";
         argv[1] = "-trace-levels";
-        ok( psArgumentVerbosity(&argc, argv) == 2,
-            "psArgumentVerbosity:  return 2 for '-trace-levels' argument input.");
+        int rc = psArgumentVerbosity(&argc, argv);
+        ok(rc == 5, "psArgumentVerbosity:  return 5 for '-trace-levels' argument input (was %d)", rc);
     }