Changeset 41171 for trunk/psLib/test/types

Timestamp:

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

Author:

eugene

Message:

updates to psLib tests

Location:

trunk/psLib/test/types

Files:

• . (modified) (1 prop)
• tap_psArguments_all.c (modified) (13 diffs)
• tap_psList_all.c (modified) (1 diff)
• tap_psMetadataConfigParse.c (modified) (2 diffs)
• tap_psMetadata_copying.c (modified) (4 diffs)
• tap_psMetadata_manip.c (modified) (1 diff)
• tst_psArguments.c (deleted)
• tst_psArray.c (deleted)
• tst_psBitSet.c (deleted)
• tst_psHash00.c (deleted)
• tst_psHash01.c (deleted)
• tst_psHash02.c (deleted)
• tst_psHash03.c (deleted)
• tst_psHash04.c (deleted)
• tst_psHash05.c (deleted)
• tst_psList.c (deleted)
• tst_psLookupTable_01.c (deleted)
• tst_psMetadataIO.c (deleted)
• tst_psMetadata_01.c (deleted)
• tst_psMetadata_02.c (deleted)
• tst_psMetadata_03.c (deleted)
• tst_psMetadata_04.c (deleted)
• tst_psMetadata_05.c (deleted)
• tst_psMetadata_06.c (deleted)
• tst_psMetadata_07.c (deleted)
• tst_psPixels.c (deleted)

trunk/psLib/test/types

@@ -75 +75 @@
 tap_psMetadataOverlay
 tap_psTree
+tap_psBits_all

@@ -75 +75 @@
 tap_psMetadataOverlay
 tap_psTree
+tap_psBits_all

trunk/psLib/test/types/tap_psArguments_all.c

@@ -37 +37 @@
         int argc = 5;
 
-        // Try to get an argument's position
-        int i = psArgumentGet(argc, argv, "-float");
-        {
-            ok( i == 3,
-                "psArgumentGet:         return correct location of input argument.");
-        }
-
-        // Return 0 for attempting to get from a NULL input argument.
-        {
-            ok( psArgumentGet(argc, NULL, "-float") == 0,
-                "psArgumentGet:         return 0 for a NULL input argument.");
-        }
-
-        // Return 0 for attempting to find a NULL string
-        {
-            ok( psArgumentGet(argc, argv, NULL) == 0,
-                "psArgumentGet:         return 0 for a NULL input string.");
-        }
-
-        // Return 0 for attempting to find an empty string
-        {
-            ok( psArgumentGet(argc, argv, "") == 0,
-                "psArgumentGet:         return 0 for an empty input string.");
-        }
-
-        // Return 0 for attempting to get an argument that doesn't match
-        {
-            ok( psArgumentGet(argc, argv, "-xxx") == 0,
-                "psArgumentGet:         return 0 for an empty input string.");
-        }
-
-        // Return false for attempting to remove argnum = 0
-        {
-            ok( !psArgumentRemove(0, &argc, argv),
-                "psArgumentRemove:      return false for argnum = 0.");
-        }
-
-        // Return false for attempting to remove NULL argc
-        {
-            ok( !psArgumentRemove(0, NULL, argv),
-                "psArgumentRemove:      return false for NULL argc.");
-        }
+        // define a simple fake argument list : this is not modified
+        char *argvBad[5];
+        argvBad[0] = "./program";
+        argvBad[1] = "-string";
+        argvBad[2] = "new";
+        argvBad[3] = "-test";
+        argvBad[4] = "6.66";
+        int argcBad = 5;
 
         // simple argument definitions for comparison
@@ -86 +52 @@
         psMetadataAdd(args, PS_LIST_TAIL, "-double", PS_DATA_F64, "Test Double", 0.666);
 
+        ok( psArgumentGet(argc, argv, "-float") == 3, "psArgumentGet: return correct location of input argument.");
+        ok( psArgumentGet(argc, NULL, "-float") == 0, "psArgumentGet: return 0 for a NULL input argument.");
+
+        ok( psArgumentGet(argc, argv, NULL) == 0, "psArgumentGet: return 0 for a NULL input string.");
+        ok( psArgumentGet(argc, argv, "")   == 0, "psArgumentGet: return 0 for an empty input string.");
+
+        ok( psArgumentGet(argc, argv, "-xxx") == 0, "psArgumentGet: return 0 for an unmatched input string.");
+
+        ok( !psArgumentRemove(0, &argc, argv), "psArgumentRemove: return false for argnum = 0.");
+        ok( !psArgumentRemove(0, NULL, argv), "psArgumentRemove: return false for NULL argc.");
+
         // psArgumentParse tests
-        // Return false for NULL input arguments
-        {
-            ok( !psArgumentParse(NULL, &argc, argv),
-                "psArgumentParse:       return false for NULL argument metadata input.");
-        }
-
-        // Return false for NULL input argc
-        {
-            ok( !psArgumentParse(args, NULL, argv),
-                "psArgumentParse:       return false for NULL argc input.");
-        }
-
-        // Return false for NULL input argv
-        {
-            ok( !psArgumentParse(args, &argc, NULL),
-                "psArgumentParse:       return false for NULL argv input.");
-        }
-
-        // Return false for argc = 0
-        {
-            int tempc = 0;
-            ok( !psArgumentParse(args, &tempc, argv),
-                "psArgumentParse:       return false for argc = 1 input.");
-        }
-
-        // Return false for string not found in metadata arguments
-        {
-            // define a simple fake argument list : this is not modified
-            char *argvBad[5];
-            argvBad[0] = "./program";
-            argvBad[1] = "-string";
-            argvBad[2] = "new";
-            argvBad[3] = "-test";
-            argvBad[4] = "6.66";
-            int argcBad = 5;
-
-            ok( !psArgumentParse(args, &argcBad, argvBad),
-                "psArgumentParse:      return false for argv containing unspecified input.");
-        }
-
-        // Check for Memory leaks
-        {
-            psFree(args);
-            checkMem();
-        }
+        ok( !psArgumentParse(NULL, &argc, argv), "psArgumentParse: return false for NULL argument metadata input.");
+        ok( !psArgumentParse(args, NULL, argv),  "psArgumentParse: return false for NULL argc input.");
+        ok( !psArgumentParse(args, &argc, NULL), "psArgumentParse: return false for NULL argv input.");
+
+        int tempc = 0;
+        ok( !psArgumentParse(args, &tempc, argv), "psArgumentParse: return false for argc = 0 input.");
+        ok( !psArgumentParse(args, &argcBad, argvBad), "psArgumentParse: return false for argv containing unspecified input.");
+
+        psFree(args);
         ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
@@ -195 +136 @@
         ok( psArgumentParse(args, &argc, argv), "psArgumentParse:      return true for valid inputs.");
 
+        // XXX does not check the results...
+
         // Check for Memory leaks
         psFree(args);
@@ -221 +164 @@
             argv[0] = "./program";
             argv[1] = "-string";
-            ok( !psArgumentParse(tempArg, &argc, argv),
-                "psArgumentParse:      return false for inconsistent argc.");
+            ok( !psArgumentParse(tempArg, &argc, argv), "psArgumentParse: return false for inconsistent argc.");
             psFree(tempArg);
+            ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }
 
@@ -240 +183 @@
             argv[0] = "./program";
             argv[1] = "-string";
-            ok( !psArgumentParse(args, &argc, argv),
-                "psArgumentParse:      return false for incomplete string syntax.");
+            ok( !psArgumentParse(args, &argc, argv), "psArgumentParse: return false for incomplete string syntax.");
         }
 
@@ -251 +193 @@
             argv[1] = "-multi";
             argv[2] = "2";
-            ok( psArgumentParse(args, &argc, argv),
-                "psArgumentParse:      return true for MULTI.");
+            ok( psArgumentParse(args, &argc, argv), "psArgumentParse: return true for MULTI.");
         }
 
         // Check for Memory leaks
-        {
-            psFree(args);
-            checkMem();
-        }
+        psFree(args);
         ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
@@ -269 +207 @@
         {
             int argc = 1;
-            ok( psArgumentVerbosity(&argc, NULL) == 2,
-                "psArgumentVerbosity:  return 2 for NULL argument input.");
+            ok( psArgumentVerbosity(&argc, NULL) == 2, "psArgumentVerbosity: return 2 for NULL argument input.");
         }
 
@@ -277 +214 @@
             char *argv[1];
             argv[0] = "./program";
-            ok( psArgumentVerbosity(NULL, argv) == 2,
-                "psArgumentVerbosity:  return 2 for NULL argument input.");
+            ok( psArgumentVerbosity(NULL, argv) == 2, "psArgumentVerbosity: return 2 for NULL argument input.");
         }
 
@@ -287 +223 @@
             argv[0] = "./program";
             argv[1] = "-v";
-            ok( psArgumentVerbosity(&argc, argv) == 3,
-                "psArgumentVerbosity:  return 3 for '-v' argument input.");
+            ok( psArgumentVerbosity(&argc, argv) == 3, "psArgumentVerbosity:  return 3 for '-v' argument input.");
         }
 
@@ -297 +232 @@
             argv[0] = "./program";
             argv[1] = "-vv";
-            ok( psArgumentVerbosity(&argc, argv) == 4,
-                "psArgumentVerbosity:  return 4 for '-vv' argument input.");
+            ok( psArgumentVerbosity(&argc, argv) == 4, "psArgumentVerbosity:  return 4 for '-vv' argument input.");
         }
 
@@ -307 +241 @@
             argv[0] = "./program";
             argv[1] = "-vvv";
-            ok( psArgumentVerbosity(&argc, argv) == 5,
-                "psArgumentVerbosity:  return 5 for '-vvv' argument input.");
+            ok( psArgumentVerbosity(&argc, argv) == 5, "psArgumentVerbosity:  return 5 for '-vvv' argument input.");
         }
 
@@ -359 +292 @@
         {
             // this function sends output to the screen or /dev/null (i
-            # if (!DEBUG)
+# if (!DEBUG)
             FILE *f = fopen ("/dev/null", "w");
             int fd = fileno(f);
             psTraceSetDestination (fd);
-            # endif
+# endif
 
             int argc = 2;
@@ -374 +307 @@
         ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
+
+    /** EAM 2019.11.09 this section is commented out because these functions do not exist
+    void testLogTraceArguments(void)
+    {
+        note("  >>>Test 3:  psLogArguments & psTraceArguments Fxns");
+ 
+        // Return 2 (default) for NULL arguments input
+        {
+            int argc = 4;
+            ok( psLogArguments(&argc, NULL) == 2, "psLogArguments: return 2 for NULL argument input.");
+        }
+
+        // Return 2 (default) for NULL argc input
+        {
+            char *argv[1];
+            argv[0] = "./program";
+            ok( psLogArguments(NULL, argv) == 2, "psLogArguments: return 2 for NULL argc input.");
+        }
+
+        // Return 3 for "-v" option
+        {
+            int argc = 2;
+            char *argv[2];
+            argv[0] = "./program";
+            argv[1] = "-v";
+            ok( psLogArguments(&argc, argv) == 3, "psLogArguments: return 3 for '-v' argument input.");
+        }
+
+        // Return 4 for "-vv" option
+        {
+            int argc = 2;
+            char *argv[2];
+            argv[0] = "./program";
+            argv[1] = "-vv";
+            ok( psLogArguments(&argc, argv) == 4, "psLogArguments: return 4 for '-vv' argument input.");
+        }
+
+        // Return 5 for "-vvv" option
+        {
+            int argc = 2;
+            char *argv[2];
+            argv[0] = "./program";
+            argv[1] = "-vvv";
+            ok( psLogArguments(&argc, argv) == 5, "psLogArguments: return 5 for '-vvv' argument input.");
+        }
+
+        // Return 2 for "-logfmt" option
+        {
+            int argc = 2;
+            char *argv[2];
+            argv[0] = "./program";
+            argv[1] = "-logfmt";
+            ok( psLogArguments(&argc, argv) == 2, "psLogArguments: return 2 for '-logfmt' argument input.");
+        }
+
+        // Return 2 for "-logfmt" option with "H"
+        {
+            int argc = 3;
+            char *argv[3];
+            argv[0] = "./program";
+            argv[1] = "-logfmt";
+            argv[2] = "H";
+            ok( psLogArguments(&argc, argv) == 2, "psLogArguments: return 2 for '-logfmt H' argument inputs.");
+        }
+ 
+        // psTraceArguments Tests
+        // Return 0 (default) for NULL arguments input
+        {
+            int argc = 4;
+            ok( psTraceArguments(&argc, NULL) == 0, "psTraceArguments: return 0 for NULL argument input.");
+        }
+
+        // Return 0 (default) for NULL argc input
+        {
+            char *argv[1];
+            argv[0] = "./program";
+            ok( psTraceArguments(NULL, argv) == 0, "psTraceArguments: return 0 for NULL argc input.");
+        }
+
+        // Return 0 for "-trace" option
+        {
+            int argc = 2;
+            char *argv[2];
+            argv[0] = "./program";
+            argv[1] = "-trace";
+            ok( psTraceArguments(&argc, argv) == 0, "psTraceArguments: return 2 for '-trace' argument input.");
+        }
+
+        // Return 2 for "-trace 1 2" option
+        {
+            int argc = 4;
+            char *argv[4];
+            argv[0] = "./program";
+            argv[1] = "-trace";
+            argv[2] = "1";
+            argv[3] = "2";
+            ok( psTraceArguments(&argc, argv) == 1, "psTraceArguments: return 2 for '-trace 1 2' argument inputs.");
+        }
+
+        // Return 2 for "-trace-levels" option
+        {
+            int argc = 2;
+            char *argv[2];
+            argv[0] = "./program";
+            argv[1] = "-trace-levels";
+            ok( psTraceArguments(&argc, argv) == 0, "psTraceArguments: return 2 for '-trace-levels' argument input.");
+        }
+ 
+        // Check for Memory leaks
+        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
+    }
+    **/
 }
-
-
-/* XXX: Why is this commented out?
-   void testLogTraceArguments(void)
-   {
-   note("  >>>Test 3:  psLogArguments & psTraceArguments Fxns");
- 
-   // Return 2 (default) for NULL arguments input
-   {
-   int argc = 4;
-   ok( psLogArguments(&argc, NULL) == 2,
-   "psLogArguments:       return 2 for NULL argument input.");
-   }
-   // Return 2 (default) for NULL argc input
-   {
-   char *argv[1];
-   argv[0] = "./program";
-   ok( psLogArguments(NULL, argv) == 2,
-   "psLogArguments:       return 2 for NULL argc input.");
-   }
-   // Return 3 for "-v" option
-   {
-   int argc = 2;
-   char *argv[2];
-   argv[0] = "./program";
-   argv[1] = "-v";
-   ok( psLogArguments(&argc, argv) == 3,
-   "psLogArguments:       return 3 for '-v' argument input.");
-   }
-   // Return 4 for "-vv" option
-   {
-   int argc = 2;
-   char *argv[2];
-   argv[0] = "./program";
-   argv[1] = "-vv";
-   ok( psLogArguments(&argc, argv) == 4,
-   "psLogArguments:       return 4 for '-vv' argument input.");
-   }
-   // Return 5 for "-vvv" option
-   {
-   int argc = 2;
-   char *argv[2];
-   argv[0] = "./program";
-   argv[1] = "-vvv";
-   ok( psLogArguments(&argc, argv) == 5,
-   "psLogArguments:       return 5 for '-vvv' argument input.");
-   }
-   // Return 2 for "-logfmt" option
-   {
-   int argc = 2;
-   char *argv[2];
-   argv[0] = "./program";
-   argv[1] = "-logfmt";
-   ok( psLogArguments(&argc, argv) == 2,
-   "psLogArguments:       return 2 for '-logfmt' argument input.");
-   }
-   // Return 2 for "-logfmt" option with "H"
-   {
-   int argc = 3;
-   char *argv[3];
-   argv[0] = "./program";
-   argv[1] = "-logfmt";
-   argv[2] = "H";
-   ok( psLogArguments(&argc, argv) == 2,
-   "psLogArguments:       return 2 for '-logfmt H' argument inputs.");
-   }
- 
- 
-   // psTraceArguments Tests
-   // Return 0 (default) for NULL arguments input
-   {
-   int argc = 4;
-   ok( psTraceArguments(&argc, NULL) == 0,
-   "psTraceArguments:     return 0 for NULL argument input.");
-   }
-   // Return 0 (default) for NULL argc input
-   {
-   char *argv[1];
-   argv[0] = "./program";
-   ok( psTraceArguments(NULL, argv) == 0,
-   "psTraceArguments:     return 0 for NULL argc input.");
-   }
-   // Return 0 for "-trace" option
-   {
-   int argc = 2;
-   char *argv[2];
-   argv[0] = "./program";
-   argv[1] = "-trace";
-   ok( psTraceArguments(&argc, argv) == 0,
-   "psTraceArguments:     return 2 for '-trace' argument input.");
-   }
-   // Return 2 for "-trace 1 2" option
-   {
-   int argc = 4;
-   char *argv[4];
-   argv[0] = "./program";
-   argv[1] = "-trace";
-   argv[2] = "1";
-   argv[3] = "2";
-   ok( psTraceArguments(&argc, argv) == 1,
-   "psTraceArguments:     return 2 for '-trace 1 2' argument inputs.");
-   }
-   // Return 2 for "-trace-levels" option
-   {
-   int argc = 2;
-   char *argv[2];
-   argv[0] = "./program";
-   argv[1] = "-trace-levels";
-   ok( psTraceArguments(&argc, argv) == 0,
-   "psTraceArguments:     return 2 for '-trace-levels' argument input.");
-   }
- 
-   // Check for Memory leaks
-   {
-   checkMem();
-   }
-   }
-*/

trunk/psLib/test/types/tap_psList_all.c

@@ -150 +150 @@
                 "psListAddAfter:         return true for adding a list element to the head.");
         }
+        psFree(noList);
+
         //Return true for adding to an empty list
-        psFree(noList);
         noList = psListAlloc(NULL);
         psListIterator *iter3 = psListIteratorAlloc(noList, 0, true);
         {
-            ok( psListAddAfter(iter3, md),
-                "psListAddAfter:         return true for adding to an empty list.");
+            ok( psListAddAfter(iter3, md), "psListAddAfter: return true for adding to an empty list.");
         }
 

trunk/psLib/test/types/tap_psMetadataConfigParse.c

@@ -58 +58 @@
         skip_start(item == NULL, 2,
                      "Skipping 1 tests because metadata container is empty!");
-        ok(item->type == PS_TYPE_S32, "return correcot metdataItem type");
+        ok(item->type == PS_DATA_S32, "return correct metdataItem type");
         is_int(item->data.S32, 666, "return correct metadataItem data");
         is_str(item->name, "new", "return correct metadataItem name");
@@ -105 +105 @@
         skip_start(item == NULL, 2,
                 "Skipping 1 tests because metadata container is empty!");
-        ok(item->type == PS_TYPE_S8, "metdataItem type");
+        ok(item->type == PS_DATA_S8, "metdataItem type");
         is_int(item->data.S8, 3, "metdataItem value");
         is_str(item->name, "item8", "return correct metadataItem name");

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -421 +421 @@
         //Return false for NULL in input
         {
-            ok( !psMetadataItemSupplement(out, NULL, key),
+          ok( !psMetadataItemSupplement(NULL, out, NULL, key),
                 "psMetadataItemSupplement:  return false for NULL in metadata.");
         }
         //Return false for NULL out input
         {
-            ok( !psMetadataItemSupplement(NULL, in, key),
+            ok( !psMetadataItemSupplement(NULL, NULL, in, key),
                 "psMetadataItemSupplement:  return false for NULL out metadata.");
         }
         //Return false for NULL key input
         {
-            ok( !psMetadataItemSupplement(out, in, NULL),
+            ok( !psMetadataItemSupplement(NULL, out, in, NULL),
                 "psMetadataItemSupplement:  return false for NULL key string.");
         }
@@ -439 +439 @@
         //Return true for valid inputs
         {
-            bool transfered = psMetadataItemSupplement(out, in, key);
+            bool transfered = psMetadataItemSupplement(NULL, out, in, key);
             psMetadataItem *item = NULL;
             if (transfered)
@@ -460 +460 @@
         {
             strncpy(key, "not MY key", 15);
-            ok( !psMetadataItemSupplement(out, in, key),
+            ok( !psMetadataItemSupplement(NULL, out, in, key),
                 "psMetadataItemSupplement:  return false for invalid key.");
         }
@@ -468 +468 @@
         invalid->hash = NULL;
         {
-            ok( !psMetadataItemSupplement(invalid, in, "key"),
+            ok( !psMetadataItemSupplement(NULL, invalid, in, "key"),
                 "psMetadataItemSupplement:  return false for invalid metadata.");
         }

trunk/psLib/test/types/tap_psMetadata_manip.c

@@ -231 +231 @@
             psMetadataAddPtr(metadata, PS_LIST_TAIL, "ptr", PS_DATA_SPHERE | PS_META_DUPLICATE_OK, "", s);
             psFree(s);
-            psMetadataItem *metadataItem = NULL;
-            metadataItem = psMetadataLookup(metadata, "ptr");
+            // psMetadataItem *metadataItem = NULL;
+            // metadataItem = psMetadataLookup(metadata, "ptr");
             bool status = false;
             psSphere *sph = NULL;

@@ -75 +75 @@
 tap_psMetadataOverlay
 tap_psTree
+tap_psBits_all