Index: /trunk/psLib/test/mathtypes/tap_psVector.c
===================================================================
--- /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7778)
+++ /trunk/psLib/test/mathtypes/tap_psVector.c	(revision 7779)
@@ -5,10 +5,11 @@
 int main (void)
 {
-    plan_tests(39);
-
-    {
-        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
-
-        diag("psVector Alloc tests");
+    plan_tests(50);
+
+    diag("psVectorAlloc() tests");
+
+    {
+        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
+
         ok(psVec != NULL, "psVector successfully allocated");
         ok(psVec->nalloc == 5, "Vector size = %ld", psVec->nalloc);
@@ -44,10 +45,9 @@
     }
 
+    diag("psVectorRealloc() tests");
+
     {
         // create new psVector
         psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
-
-        diag("psVector Realloc tests");
-        ok (psVec != NULL, "test vector allocated");
 
         // generate first part of vector
@@ -59,9 +59,9 @@
         // Test C - Reallocate S32 vector bigger
         psVec = psVectorRealloc(psVec,10);
-        ok (psVec != NULL, "test vector reallocated to bigger size");
-        ok (psVec->nalloc == 10, "Vector size = %ld", psVec->nalloc);
-        ok (psVec->n == 5, "Vector population = %ld", psVec->n);
-        ok (psVec->type.type == PS_TYPE_S32, "Vector type = %d", psVec->type.type);
-        ok (psVec->type.dimen == PS_DIMEN_VECTOR, "Vector dimen = %d", psVec->type.dimen);
+        ok(psVec != NULL, "test vector reallocated to bigger size");
+        ok(psVec->nalloc == 10, "Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 5, "Vector population = %ld", psVec->n);
+        ok(psVec->type.type == PS_TYPE_S32, "Vector type = %d", psVec->type.type);
+        ok(psVec->type.dimen == PS_DIMEN_VECTOR, "Vector dimen = %d", psVec->type.dimen);
 
         // generate test data values
@@ -76,9 +76,16 @@
         }
 
+        psFree(psVec);
+    }
+
+    {
         // Test D - Reallocate S32 vector smaller
+        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
+        psVec->n = 5;
         psVec = psVectorRealloc(psVec,3);
-        ok (psVec != NULL, "test vector reallocated to smaller size");
-        ok (psVec->nalloc == 3, "Vector size = %ld", psVec->nalloc);
-        ok (psVec->n == 3, "Vector population = %ld", psVec->n);
+
+        ok(psVec != NULL, "test vector reallocated to smaller size");
+        ok(psVec->nalloc == 3, "Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 3, "Vector population = %ld", psVec->n);
 
         // test data values
@@ -89,7 +96,7 @@
         // reallocate to 0 length
         psVec = psVectorRealloc(psVec,0);
-        ok (psVec != NULL, "test vector reallocated to zero length");
-        ok (psVec->nalloc == 0, "Vector size = %ld", psVec->nalloc);
-        ok (psVec->n == 0, "Vector population = %ld", psVec->n);
+        ok(psVec != NULL, "test vector reallocated to zero length");
+        ok(psVec->nalloc == 0, "Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 0, "Vector population = %ld", psVec->n);
 
         // Test E - Free S32 vector
@@ -99,10 +106,11 @@
 
     {
-        psVector* vecBogus = psVectorRealloc(NULL, 6);
-
-        ok(vecBogus == NULL, "psVectorAlloc() doesn't not accept bogus type");
+        psVector *vecBogus = psVectorAlloc(5, PS_TYPE_S32);
+        vecBogus = psVectorRealloc(NULL, 6);
+
+        ok(vecBogus == NULL, "psVectorRealloc() doesn't not accept bogus type");
         psErr *err = psErrorLast();
 
-        skip_start(err == NULL, 2, "Skipping 2 tests because psVectorAlloc() didn't fail as expect");
+        skip_start(err == NULL, 2, "Skipping 2 tests because psVectorRealloc() didn't fail as expect");
         ok(strstr(err->name, "psVectorRealloc"), "alloc failure - got error name %s", err->name);
         ok(err->code == PS_ERR_BAD_PARAMETER_NULL, "alloc failure - got error code %d", err->code);
@@ -110,83 +118,64 @@
 
         psFree(vecBogus);
-
-        return exit_status();
-    }
+    }
+
+    diag("psVectorExtend() tests");
+
+    {
+        // create new psVector
+        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
+        psVec->n = 0;
+        psVec = psVectorExtend(psVec, 0, 2);
+
+        ok(psVec != NULL, "test vector extended");
+        ok(psVec->nalloc == 5, "Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 2, "Vector population = %ld", psVec->n);
+
+        psFree(psVec);
+    }
+
+    {
+        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
+        psVec = psVectorExtend(psVec, 0, 2);
+        psVec = psVectorExtend(psVec, 0, 2);
+
+        ok(psVec != NULL, "test vector extended");
+        ok(psVec->nalloc == 5, "Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 4,"Vector population = %ld", psVec->n);
+
+        psFree(psVec);
+    }
+
+    {
+        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
+        psVec = psVectorExtend(psVec, 0, 2);
+        psVec = psVectorExtend(psVec, 0, 2);
+        psVec = psVectorExtend(psVec, 0, -2);
+
+        ok(psVec != NULL, "test vector extended");
+        ok(psVec->nalloc == 5 ,"Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 2, "Vector population = %ld", psVec->n);
+
+        psFree(psVec);
+    }
+
+    {
+        psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
+        psVec = psVectorExtend(psVec, 0, 2);
+        psVec = psVectorExtend(psVec, 0, 2);
+        psVec = psVectorExtend(psVec, 0, -2);
+        psVec = psVectorExtend(psVec, 0, -20);
+
+        ok(psVec != NULL, "test vector extended");
+        ok(psVec->nalloc == 5, "Vector size = %ld", psVec->nalloc);
+        ok(psVec->n == 0, "Vector population = %ld", psVec->n);
+
+        psFree(psVec);
+    }
+
+    return exit_status();
 }
 
 # if 0
-
-psS32 testVectorExtend(void)
-{
-    // create new psVector
-    psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
-    if (psVec == NULL) {
-        fprintf(stderr,"ERROR: Return is NULL\n");
-        return 1;
-    }
-
-    psVec->n = 0;
-
-    psVec = psVectorExtend(psVec, 0, 2);
-    if (psVec == NULL) {
-        fprintf(stderr,"ERROR: Return is NULL\n");
-        return 2;
-    }
-    if (psVec->nalloc != 5) { // no growth should occur
-        fprintf(stderr,"Vector size = %ld\n", psVec->nalloc);
-        return 3;
-    }
-    if (psVec->n != 2) {
-        fprintf(stderr,"Vector population = %ld\n", psVec->n);
-        return 4;
-    }
-
-    psVec = psVectorExtend(psVec, 0, 2);
-    if (psVec == NULL) {
-        fprintf(stderr,"ERROR: Return is NULL\n");
-        return 10;
-    }
-    if (psVec->nalloc != 15) { // growth should occur
-        fprintf(stderr,"Vector size = %ld\n", psVec->nalloc);
-        return 11;
-    }
-    if (psVec->n != 4) {
-        fprintf(stderr,"Vector population = %ld\n", psVec->n);
-        return 12;
-    }
-
-    psVec = psVectorExtend(psVec, 0, -2);
-    if (psVec == NULL) {
-        fprintf(stderr,"ERROR: Return is NULL\n");
-        return 20;
-    }
-    if (psVec->nalloc != 15) { // no growth
-        fprintf(stderr,"Vector size = %ld\n", psVec->nalloc);
-        return 21;
-    }
-    if (psVec->n != 2) {
-        fprintf(stderr,"Vector population = %ld\n", psVec->n);
-        return 22;
-    }
-
-    psVec = psVectorExtend(psVec, 0, -20);
-    if (psVec == NULL) {
-        fprintf(stderr,"ERROR: Return is NULL\n");
-        return 30;
-    }
-    if (psVec->nalloc != 15) { // no growth
-        fprintf(stderr,"Vector size = %ld\n", psVec->nalloc);
-        return 31;
-    }
-    if (psVec->n != 0) {
-        fprintf(stderr,"Vector population = %ld\n", psVec->n);
-        return 32;
-    }
-
-    psFree(psVec);
-
-    return 0;
-}
-
 psS32 testVectorInit(void)
 {