Changeset 1304

Timestamp:

Jul 27, 2004, 2:05:32 PM (22 years ago)

Author:

evanalst

Message:

Add test point to verify the output vector is of type U32.

Location:

trunk/psLib/test/collections

Files:

• tst_psVectorSort_02.c (modified) (3 diffs)
• verified/tst_psVectorSort_02.stderr (added)
• verified/tst_psVectorSort_02.stdout (added)

trunk/psLib/test/collections/tst_psVectorSort_02.c

@@ -10 +10 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-15 23:52:34 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-07-28 00:05:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 
     // Test A - Create float vectors
-    printPositiveTestHeader(stdout,"psVectorSort", "Create vectors");
+    printPositiveTestHeader(stdout,"psVectorSortIndex", "Create vectors");
     in = psVectorAlloc(5, PS_TYPE_F32);
     in->n = 5;
-    out = psVectorAlloc(5, PS_TYPE_F32);
-    out->n = 5;
     in->data.F32[0] = 7.0f;
     in->data.F32[1] = 9.0f;
@@ -41 +39 @@
         printf("arr[%d] = %f\n", i, in->data.F32[i]);
     }
-    printFooter(stdout, "psVectorSort", "Create vectors", true);
+    printFooter(stdout, "psVectorSortIndex", "Create vectors", true);
 
 
     // Test B - Sort integer vector of indices based on pre-sort order of floating point vector
-    printPositiveTestHeader(stdout,"psVectorSort", "Create sorted index vector");
+    printPositiveTestHeader(stdout,"psVectorSortIndex", "Create sorted index vector");
     out = psVectorSortIndex(out, in);
     for(int i=0; i<5; i++) {
-        printf("arr[%d] = %d\n", i, out->data.S32[i]);
+        printf("arr[%d] = %d\n", i, out->data.U32[i]);
     }
-    printFooter(stdout, "psVectorSort", "Create sorted index vector", true);
+    printFooter(stdout, "psVectorSortIndex", "Create sorted index vector", true);
 
+    // Test D - Verify the output vector is of type psU32
+    printPositiveTestHeader(stdout,"psVectorSortIndex", "Verify output vector type");
+    if(out->type.type != PS_TYPE_U32) {
+        printf("ERROR: output vector is of type %d\n", out->type.type);
+    }
+    printFooter(stdout, "psVectorSortIndex", "Verify output vector type", true);
 
     // Test C - Free vectors
-    printPositiveTestHeader(stdout,"psVectorSort", "Free vectors");
+    printPositiveTestHeader(stdout,"psVectorSortIndex", "Free vectors");
     psFree(in);
     psFree(out);
-    psMemCheckLeaks(0, NULL, stdout);
+    int nLeaks = psMemCheckLeaks(0, NULL, stdout);
+    if(nLeaks) {
+        printf("ERROR: Found %d memory leaks\n", nLeaks);
+    }
     int nBad = psMemCheckCorruption(0);
     if(nBad) {