Index: /trunk/psLib/test/mathtypes/tap_psVector.c
===================================================================
--- /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7787)
+++ /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7788)
@@ -5,5 +5,5 @@
 int main (void)
 {
-    plan_tests(127);
+    plan_tests(131);
 
     diag("psVectorAlloc() tests");
@@ -386,64 +386,47 @@
     }
 
+
+    diag("psVectorCountPixelMask() tests");
+
+    {
+        ok(psVectorCountPixelMask(NULL, 1) == -1,
+           "psVectorCountPixelMask returned -1 for NULL Vector input.");
+    }
+
+    {
+        psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
+        vec->data.S32[0] = 0;
+        vec->data.S32[1] = 1;
+        vec->data.S32[2] = 0;
+        vec->data.S32[3] = 1;
+        vec->data.S32[4] = 0;
+        vec->n = 5;
+
+        ok(psVectorCountPixelMask(vec, 1) == -1,
+           "returned -1 for wrong type of Vector input.");
+
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = vec = psVectorAlloc(5, PS_TYPE_U8);
+        vec->data.U8[0] = 0;
+        vec->data.U8[1] = 1;
+        vec->data.U8[2] = 0;
+        vec->data.U8[3] = 1;
+        vec->data.U8[4] = 0;
+        vec->n = 5;
+        long numPix = psVectorCountPixelMask(vec, 1);
+
+        ok(numPix != -1, "returned -1 for correct Vector input\n");
+        ok(numPix == 2, "returned pixel count %d\n", numPix);
+
+        psFree(vec);
+    }
+
     return exit_status();
 }
 
 # if 0
-
-psS32 testVectorCountPixelMask(void)
-{
-    long numPix = 0;
-    long numPix2 = 0;
-    psVector *vec = NULL;
-
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    numPix = psVectorCountPixelMask(vec, 1);
-    if (numPix != -1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psVectorCountPixelMask failed to return -1 for NULL Vector input.\n");
-        return 1;
-    }
-
-    numPix = 0;
-    vec = psVectorAlloc(5, PS_TYPE_S32);
-    psVector *vec2 = NULL;
-    vec2 = psVectorAlloc(5, PS_TYPE_U8);
-    vec->data.S32[0] = 0;
-    vec->data.S32[1] = 1;
-    vec->data.S32[2] = 0;
-    vec->data.S32[3] = 1;
-    vec->data.S32[4] = 0;
-    vec2->data.U8[0] = 0;
-    vec2->data.U8[1] = 1;
-    vec2->data.U8[2] = 0;
-    vec2->data.U8[3] = 1;
-    vec2->data.U8[4] = 0;
-    vec->n = 5;
-    vec2->n = 5;
-
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    numPix = psVectorCountPixelMask(vec, 1);
-    numPix2 = psVectorCountPixelMask(vec2, 1);
-
-    if (numPix != -1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psVectorCountPixelMask failed to return -1 for wrong type of Vector input.\n");
-        return 2;
-    }
-    if (numPix2 == -1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psVectorCountPixelMask returned -1 for correct Vector input\n");
-        return 3;
-    }
-    if (numPix2 != 2) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psVectorCountPixelMask returned incorrect pixel count %d\n", numPix2);
-        return 4;
-    }
-
-    psFree(vec);
-    psFree(vec2);
-    return 0;
-}
 
 psS32 testVectorLength( void )