Changeset 688 for trunk/psLib/test/collections/tst_psSort_04.c

Timestamp:

May 14, 2004, 11:04:23 AM (22 years ago)

Author:

harman

Message:

Updated tests to reflect major changes to psVector

File:

• trunk/psLib/test/collections/tst_psSort_04.c (modified) (2 diffs)

trunk/psLib/test/collections/tst_psSort_04.c

@@ -4 +4 @@
  *
  *  This test driver contains the following tests for psSort test point 4:
- *     A)  Attempt to sort with null input array
- *     B)  Attempt to sort with null output array 
- *     C)  Free arrays 
+ *     A)  Attempt to sort with null input vector
+ *     B)  Attempt to sort with null output vector 
+ *     C)  Free vectors 
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-05-08 01:19:28 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-05-14 21:04:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
          char* argv[])
 {
-    psArray *badIn = NULL;
-    psArray *badOut = NULL;
-    psArray *goodIn = psFloatArrayAlloc(5);
-    psArray *goodOut = psFloatArrayAlloc(5);
+    psVector *badIn = NULL;
+    psVector *badOut = NULL;
+    psVector *goodIn = psVectorAlloc(PS_TYPE_FLOAT, 5);
+    psVector *goodOut = psVectorAlloc(PS_TYPE_FLOAT, 5);
 
-    // Test A - Attempt to sort with null input array
-    printNegativeTestHeader(stdout,"psSort", "Attempt to sort with null input array",
-                            "Null input array", 0);
+    // Test A - Attempt to sort with null input vector
+    printNegativeTestHeader(stdout,"psSort", "Attempt to sort with null input vector",
+                            "Null input vector", 0);
     goodOut = psSort(goodOut, badIn);
-    printFooter(stdout, "psSort", "Attempt to sort with null input array", true);
+    printFooter(stdout, "psSort", "Attempt to sort with null input vector", true);
 
-    // Test B - Attempt to sort with null output array
-    printNegativeTestHeader(stdout,"psSort", "Attempt to sort with null output array",
-                            "Null output array", 0);
+    // Test B - Attempt to sort with null output vector
+    printNegativeTestHeader(stdout,"psSort", "Attempt to sort with null output vector",
+                            "Null output vector", 0);
     badOut = psSort(badOut, goodIn);
-    printFooter(stdout, "psSort", "Attempt to sort with null output array", true);
+    printFooter(stdout, "psSort", "Attempt to sort with null output vector", true);
 
-    // Test C - Free arrays
-    printPositiveTestHeader(stdout, "psSort", "Free arrays");
-    psFloatArrayFree(goodIn);
-    psFloatArrayFree(goodOut);
+    // Test C - Free vectors
+    printPositiveTestHeader(stdout, "psSort", "Free vectors");
+    psVectorFree(goodIn);
+    psVectorFree(goodOut);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);