Changeset 1303

Timestamp:

Jul 27, 2004, 1:29:08 PM (22 years ago)

Author:

evanalst

Message:

Add check for psVectorSort having the input/output vectors of the same type.

Location:

trunk/psLib/test/collections

Files:

• tst_psVectorSort_03.c (modified) (3 diffs)
• verified/tst_psVectorSort_03.stderr (modified) (1 diff)
• verified/tst_psVectorSort_03.stdout (modified) (1 diff)

trunk/psLib/test/collections/tst_psVectorSort_03.c

@@ -6 +6 @@
  *     A)  Create float vectors of different sizes
  *     B)  Attempt to sort vectors...should get errors
- *     C)  Free float vectors
+ *     C)  Create float vector and double vector
+ *     D)  Attempt to sort vectors...should get errors
+ *     E)  Free float, double vectors
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-27 22:48:19 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-07-27 23:28:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25 +27 @@
     psVector *in = NULL;
     psVector *out = NULL;
-
+    psVector *in2 = NULL;
+    psVector *out2 = NULL;
 
     // Test A - Create float vectors
@@ -46 +49 @@
     printFooter(stdout, "psVectorSort", "Sort float vector", true);
 
+    // Test C - Create float vector and double vector
+    printPositiveTestHeader(stdout,"psVectorSort","Create float & double vectors of same size");
+    in2 = psVectorAlloc(5, PS_TYPE_F32);
+    in2->n = 5;
+    out2 = psVectorAlloc(5, PS_TYPE_F64);
+    out2->n = 5;
+    for(int j=0; j<5; j++) {
+        printf("vec[%d] = %f\n", j, in2->data.F32[j]);
+    }
+    printFooter(stdout, "psVectorSort", "Create float and double vectors same size", true);
+
+    // Test D - Attempt to sort vectors with output of different type should create error
+    printNegativeTestHeader(stdout,"psVectorSort", "Sort F32/F64 vector",
+                            "Input and output vector different types", 0);
+    out2 = psVectorSort(out2, in2);
+    printFooter(stdout, "psVectorSort", "Sort float vector", true);
 
     // Test C - Free float vectors
     printPositiveTestHeader(stdout,"psVectorSort", "Free float vectors");
     psFree(in);
+    psFree(in2);
     psFree(out);
+    psFree(out2);
     int nLeaks = psMemCheckLeaks(0, NULL, stdout);
     if(nLeaks) {

trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr

@@ -1 +1 @@
  <DATE> <TIME> |<HOST>|E|   psVectorSort| : Line 178 - Input and output vector sizes are not equal: in=5 out=6
+ <DATE> <TIME> |<HOST>|E|   psVectorSort| : Line 184 - Input and output vectors are not same type: in=1028 out=1032

trunk/psLib/test/collections/verified/tst_psVectorSort_03.stdout

@@ -26 +26 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psVectorSort_03.c                                      *
+*            TestPoint: psVectorSort{Create float & double vectors of same size}   *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+vec[0] = 0.000000
+vec[1] = 0.000000
+vec[2] = 0.000000
+vec[3] = 0.000000
+vec[4] = 0.000000
+
+---> TESTPOINT PASSED (psVectorSort{Create float and double vectors same size} | tst_psVectorSort_03.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psVectorSort_03.c                                      *
+*            TestPoint: psVectorSort{Sort F32/F64 vector}                          *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Input and output vector different types                    *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psVectorSort{Sort float vector} | tst_psVectorSort_03.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psVectorSort_03.c                                      *
 *            TestPoint: psVectorSort{Free float vectors}                           *
 *             TestType: Positive                                                   *