Index: /trunk/psLib/test/mathtypes/tap_psVector.c
===================================================================
--- /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7785)
+++ /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7786)
@@ -5,5 +5,5 @@
 int main (void)
 {
-    plan_tests(62);
+    plan_tests(122);
 
     diag("psVectorAlloc() tests");
@@ -44,4 +44,5 @@
         psFree(vecBogus);
     }
+
 
     diag("psVectorRealloc() tests");
@@ -120,4 +121,5 @@
     }
 
+
     diag("psVectorExtend() tests");
 
@@ -174,4 +176,5 @@
     }
 
+
     diag("psVectorInit() tests");
 
@@ -251,95 +254,82 @@
     }
 
+
+    diag("psVectorCreate() tests");
+
+    {
+        psVector *test = psVectorCreate(NULL, 0.0, 10.0, 1.0, PS_TYPE_S32);
+        for (int i = 0; i < 10; i++) {
+            ok(test->data.S32[i] == i, "Vector data matches. i = %d, data=%d",
+               i, test->data.S32[i]);
+        }
+        psFree(test);
+    }
+
+    {
+        psVector *input = psVectorAlloc(5, PS_TYPE_F32);
+        psVector *test = psVectorCreate(input, 0.0, 5.0, 0.5, PS_TYPE_F32);
+
+        for (int i = 0; i < 10; i++) {
+            ok(test->data.F32[i] == i * 0.5,
+               "Vector data matches. i = %d, data=%f", i, test->data.F32[i]);
+        }
+
+        psFree(input);
+    }
+
+    //  Test PS_TYPE_F64
+    //       PS_TYPE_S64
+    {
+        psVector *test = psVectorCreate(NULL, 0.0, 10.0, 1.0, PS_TYPE_S64);
+        for (int i = 0; i < 10; i++)
+        {
+            ok(test->data.S64[i] == i,
+               "Vector data does not match. i = %d, data=%ld",
+               i, (long)test->data.S64[i]);
+        }
+        psFree(test);
+    }
+
+    {
+        psVector *input = psVectorAlloc(5, PS_TYPE_F64);
+        psVector *test = psVectorCreate(input, 0.0, 5.0, 0.5, PS_TYPE_F64);
+
+        for (int i = 0; i < 10; i++)
+        {
+            ok(test->data.F64[i] == i * 0.5,
+               "Vector data does not match. i = %d, data=%f",
+               i, test->data.F64[i]);
+        }
+        psFree(input);
+    }
+
+    //  Test PS_TYPE_U16
+    //       PS_TYPE_S16
+    {
+        psVector *test = psVectorCreate(NULL, 0.0, 10.0, 1.0, PS_TYPE_S16);
+        for (int i = 0; i < 10; i++)
+        {
+            ok(test->data.S16[i] == i, "Vector data matches. i = %d, data=%d",
+               i, test->data.S16[i]);
+        }
+        psFree(test);
+    }
+
+    {
+        psVector *input = psVectorAlloc(5, PS_TYPE_U16);
+        psVector *test = psVectorCreate(input, 0.0, 20.0, 2.0, PS_TYPE_U16);
+
+        for (int i = 0; i < 10; i++)
+        {
+            ok(test->data.U16[i] == i * 2.0,
+               "Vector data matches. i = %d, data=%d", i, test->data.U16[i]);
+        }
+        psFree(input);
+    }
+
     return exit_status();
 }
 
 # if 0
-
-psS32 testVectorCreate(void)
-{
-    psVector *test = NULL;
-    psVector *test2 = NULL;
-    psVector *input = NULL;
-    psVector *input2 = psVectorAlloc(5, PS_TYPE_F32);
-
-    test = psVectorCreate(input, 0.0, 10.0, 1.0, PS_TYPE_S32);
-    test2 = psVectorCreate(input2, 0.0, 5.0, 0.5, PS_TYPE_F32);
-
-    for (int i = 0; i < 10; i++) {
-        if (test->data.S32[i] != i) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n",
-                    i, test->data.S32[i]);
-            return 1;
-        }
-        if (test2->data.F32[i] != i*0.5) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%f\n",
-                    i, test->data.F32[i]);
-            return 1;
-        }
-    }
-    psFree(test);
-    psFree(test2);
-    return 0;
-}
-psS32 testVectorCreateA(void)
-{
-    //
-    //  Test PS_TYPE_F64
-    //       PS_TYPE_S64
-    //
-    psVector *test = NULL;
-    psVector *test2 = NULL;
-    psVector *input = NULL;
-    psVector *input2 = psVectorAlloc(5, PS_TYPE_F64);
-
-    test = psVectorCreate(input, 0.0, 10.0, 1.0, PS_TYPE_S64);
-    test2 = psVectorCreate(input2, 0.0, 5.0, 0.5, PS_TYPE_F64);
-
-    for (int i = 0; i < 10; i++) {
-        if (test->data.S64[i] != i) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%ld\n",
-                    i, (long)test->data.S64[i]);
-            return 1;
-        }
-        if (test2->data.F64[i] != i*0.5) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%f\n",
-                    i, test->data.F64[i]);
-            return 1;
-        }
-    }
-    psFree(test);
-    psFree(test2);
-    return 0;
-}
-psS32 testVectorCreateB(void)
-{
-    //
-    //  Test PS_TYPE_U16
-    //       PS_TYPE_S16
-    //
-    psVector *test = NULL;
-    psVector *test2 = NULL;
-    psVector *input = NULL;
-    psVector *input2 = psVectorAlloc(5, PS_TYPE_U16);
-
-    test = psVectorCreate(input, 0.0, 10.0, 1.0, PS_TYPE_S16);
-    test2 = psVectorCreate(input2, 0.0, 20.0, 2.0, PS_TYPE_U16);
-
-    for (int i = 0; i < 10; i++) {
-        if (test->data.S16[i] != i) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n",
-                    i, test->data.S16[i]);
-            return 1;
-        }
-        if (test2->data.U16[i] != i*2.0) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n",
-                    i, test->data.U16[i]);
-            return 1;
-        }
-    }
-    psFree(test);
-    psFree(test2);
-    return 0;
-}
 psS32 testVectorGetSet(void)
 {
