Changeset 13306 for trunk/psLib/test/mathtypes

Timestamp:

May 7, 2007, 8:30:16 PM (19 years ago)

Author:

gusciora

Message:

Improved psVectorCountPixelMask() tests.

File:

• trunk/psLib/test/mathtypes/tap_psVector.c (modified) (5 diffs)

trunk/psLib/test/mathtypes/tap_psVector.c

@@ -2 +2 @@
 #include <string.h>
 #include <pslib.h>
-
 #include "tap.h"
 #include "pstap.h"
@@ -10 +9 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(285);
+    plan_tests(294);
 
 
@@ -596 +595 @@
 
     // psVectorCountPixelMask() tests
+    // Ensure -1 return for NULL psVector input
     {
         psMemId id = psMemGetId();
         ok(psVectorCountPixelMask(NULL, 1) == -1,
-           "psVectorCountPixelMask returned -1 for NULL Vector input");
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
+           "psVectorCountPixelMask() returned -1 for NULL psVector input");
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // Ensure -1 return for incorrect TYPE psVector input
     {
         psMemId id = psMemGetId();
@@ -613 +614 @@
         vec->data.S32[4] = 0;
         ok(psVectorCountPixelMask(vec, 1) == -1,
-           "returned -1 for wrong type of Vector input");
-        psFree(vec);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
+           "psVectorCountPixelMask() returned -1 for incorrect TYPE psVector input");
+        psFree(vec);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // Use correct inputs
     {
         psMemId id = psMemGetId();
@@ -628 +630 @@
         vec->data.U8[4] = 0;
         long numPix = psVectorCountPixelMask(vec, 1);
-        ok(numPix != -1, "did not return -1 for correct Vector input");
+        ok(numPix != -1, "psVectorCountPixelMask() did return -1 for correct psVector input");
         ok(numPix == 2, "returned pixel count %d", numPix);
+        psFree(vec);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // Use correct inputs; psVector length of 0
+    {
+        psMemId id = psMemGetId();
+        psVector *vec = psVectorAlloc(0, PS_TYPE_U8);
+        long numPix = psVectorCountPixelMask(vec, 1);
+        ok(numPix != -1, "psVectorCountPixelMask() did return -1 for correct psVector input (length 0)");
+        ok(numPix == 0, "returned pixel count %d", numPix);
+        psFree(vec);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // Use correct inputs; psVector length of 1
+    {
+        psMemId id = psMemGetId();
+        psVector *vec = psVectorAlloc(1, PS_TYPE_U8);
+        vec->data.U8[0] = 0;
+        long numPix = psVectorCountPixelMask(vec, 1);
+        ok(numPix != -1, "psVectorCountPixelMask() did return -1 for correct psVector input (length 1)");
+        ok(numPix == 0, "returned pixel count %d", numPix);
+        psFree(vec);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // Use correct inputs; large psVector 
+    {
+        psMemId id = psMemGetId();
+        #define N 10
+        psVector *vec = psVectorAlloc(N, PS_TYPE_U8);
+        for (int i = 0 ; i < N ; i++) {
+            if (0 == i%2) {
+                vec->data.U8[i] = 0;
+            } else {
+                vec->data.U8[i] = 1;
+            }
+        }
+        long numPix = psVectorCountPixelMask(vec, 1);
+        ok(numPix != -1, "psVectorCountPixelMask() did return -1 for correct psVector input (length: %d)", N);
+        ok(numPix == N/2, "returned pixel count %d", numPix);
         psFree(vec);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");