Changeset 7787

Timestamp:

Jul 1, 2006, 12:53:04 PM (20 years ago)

Author:

jhoblitt

Message:

add psVectorGet() & psVectorSet() tests

File:

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

trunk/psLib/test/mathtypes/tap_psVector.c

@@ -5 +5 @@
 int main (void)
 {
-    plan_tests(122);
+    plan_tests(127);
 
     diag("psVectorAlloc() tests");
@@ -328 +328 @@
     }
 
+
+    diag("psVectorSet() tests");
+
+    {
+        psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
+        vec->n = 0;
+
+        ok(psVectorSet(vec, 0, 10),
+           "VectorSet set S32 at position 0");
+
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
+        vec->n = 0;
+
+        ok(!psVectorSet(vec, 10, 10),
+           "VectorSet failes to set S32 at out of range position");
+
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
+        vec->n = 0;
+
+        ok(psVectorSet(vec, 1, 4),
+           "VectorSet set S32 at position 1");
+
+        psFree(vec);
+    }
+
+
+    diag("psVectorGet() tests");
+
+    {
+        psVector *vec = psVectorAlloc(10, PS_TYPE_S32);
+        vec->n = 0;
+        psVectorSet(vec, 0, 10);
+
+        ok((psS32)psVectorGet(vec, 0) == 10,
+           "VectorGet returned the correct S32 from position 0");
+
+        psFree(vec);
+    }
+
+    {
+        psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
+        vec->n = 0;
+        psVectorSet(vec, -1, 4);
+
+        ok((psS32)psVectorGet(vec, -1) == 4,
+           "VectorGet returned the correct S32 from tail using -1");
+
+        psFree(vec);
+    }
+
     return exit_status();
 }
 
 # if 0
-psS32 testVectorGetSet(void)
-{
-    psVector *vec = NULL;
-    vec = psVectorAlloc(5, PS_TYPE_S32);
-    vec->n = 0;
-
-    if ( !psVectorSet(vec, 0, 10) ) {
-        fprintf(stderr, "VectorSet failed to set S32 at position 0\n");
-    }
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    if ( psVectorSet(vec, 10, 10) ) {
-        fprintf(stderr, "VectorSet Improperly set S32 at out of range position\n");
-    }
-    if ( !psVectorSet(vec, 1, 4) ) {
-        fprintf(stderr, "VectorSet Failed to set S32 at position 1\n");
-    }
-    if ( (psS32)psVectorGet(vec, 0) != 10 ) {
-        fprintf(stderr,
-                "VectorGet Failed to return the correct S32 from position 0\n");
-    }
-    if ( (psS32)psVectorGet(vec, -1) != 4 ) {
-        fprintf(stderr,
-                "VectorGet Failed to return the correct S32 from tail using -1\n");
-    }
-
-    psFree(vec);
-    return 0;
-}
 
 psS32 testVectorCountPixelMask(void)