Index: /trunk/psLib/test/mathtypes/tap_psVector.c
===================================================================
--- /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7784)
+++ /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7785)
@@ -5,5 +5,5 @@
 int main (void)
 {
-    plan_tests(50);
+    plan_tests(62);
 
     diag("psVectorAlloc() tests");
@@ -174,96 +174,85 @@
     }
 
+    diag("psVectorInit() tests");
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_U8);
+        ok(psVectorInit(vec, 1 ), "U8 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_U16);
+        ok(!psVectorInit(vec, PS_MAX_U64), "VectorInit failed.  U16 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_U32);
+        ok(psVectorInit(vec, 10), "U32 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_U64);
+        ok(psVectorInit(vec, -1), "U64 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_S8);
+        ok(!psVectorInit(vec, PS_MAX_S16), "VectorInit failed.  S8 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_S16);
+        ok(psVectorInit(vec, -100), "S16 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_S32);
+        ok(psVectorInit(vec, 1), "S32 Case");
+        psFree(vec);
+    }
+
+    {
+        // XXX is this test ok?
+        psVector *vec = psVectorAlloc(1, PS_TYPE_S64);
+        ok(psVectorInit(vec, PS_MAX_U64), "S64 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_F32);
+        ok(psVectorInit(vec, 1.1), "F32 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_F64);
+        ok(psVectorInit(vec, 1.4 ), "F64 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_C32);
+        psC32 vC32 = 1.23 + 1.19I;
+        ok(psVectorInit(vec, vC32), "C32 Case");
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(1, PS_TYPE_C64);
+        psC64 vC64 = 2.13 + 2.31I;
+        ok(psVectorInit(vec, vC64), "C64 Case");
+        psFree(vec);
+    }
+
     return exit_status();
 }
 
 # if 0
-psS32 testVectorInit(void)
-{
-    psVector *in1 = NULL;
-    psVector *in2 = NULL;
-    psVector *in3 = NULL;
-    psVector *in4 = NULL;
-    psVector *in5 = NULL;
-    psVector *in6 = NULL;
-    psVector *in7 = NULL;
-    psVector *in8 = NULL;
-    psVector *in9 = NULL;
-    psVector *in10 = NULL;
-    psVector *in11 = NULL;
-    psVector *in12 = NULL;
-    int nalloc = 1;
-    in1 = psVectorAlloc(nalloc, PS_TYPE_U8);
-    in2 = psVectorAlloc(nalloc, PS_TYPE_U16);
-    in3 = psVectorAlloc(nalloc, PS_TYPE_U32);
-    in4 = psVectorAlloc(nalloc, PS_TYPE_U64);
-    in5 = psVectorAlloc(nalloc, PS_TYPE_S8);
-    in6 = psVectorAlloc(nalloc, PS_TYPE_S16);
-    in7 = psVectorAlloc(nalloc, PS_TYPE_S32);
-    in8 = psVectorAlloc(nalloc, PS_TYPE_S64);
-    in9 = psVectorAlloc(nalloc, PS_TYPE_F32);
-    in10 = psVectorAlloc(nalloc, PS_TYPE_F64);
-    in11 = psVectorAlloc(nalloc, PS_TYPE_C32);
-    in12 = psVectorAlloc(nalloc, PS_TYPE_C64);
-    psC32 vC32;
-    psC64 vC64;
-
-    if ( !psVectorInit(in1, 1 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  U8 Case \n");
-    }
-
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    if ( psVectorInit(in2, PS_MAX_U64) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  U16 Case \n");
-    }
-    if ( !psVectorInit(in3, 10) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  U32 Case \n");
-    }
-    if ( !psVectorInit(in4, -1) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  U64 Case \n");
-    }
-
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    if ( psVectorInit(in5, PS_MAX_S16 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  S8 Case \n");
-    }
-    if ( !psVectorInit(in6, -100 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  S16 Case \n");
-    }
-    if ( !psVectorInit(in7, 1 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  S32 Case \n");
-    }
-    if ( !psVectorInit(in8, PS_MAX_U64 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  S64 Case \n");
-    }
-    if ( !psVectorInit(in9, 1.1 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  F32 Case \n");
-    }
-    if ( !psVectorInit(in10, 1.4 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  F64 Case \n");
-    }
-
-    vC32 = 1.23 + 1.19I;
-    vC64 = 2.13 + 2.31I;
-    if ( !psVectorInit(in11, vC32 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  C32 Case \n");
-    }
-    if ( !psVectorInit(in12, vC64 ) ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "VectorInit failed.  C64 Case \n");
-    }
-
-    psFree(in1);
-    psFree(in2);
-    psFree(in3);
-    psFree(in4);
-    psFree(in5);
-    psFree(in6);
-    psFree(in7);
-    psFree(in8);
-    psFree(in9);
-    psFree(in10);
-    psFree(in11);
-    psFree(in12);
-    return 0;
-}
 
 psS32 testVectorCreate(void)