Changeset 3737 for trunk/psLib/test/collections

Timestamp:

Apr 21, 2005, 11:18:23 AM (21 years ago)

Author:

desonia

Message:

added psPixels functions and rewrote psVectorSortIndex.

Location:

trunk/psLib/test/collections

Files:

• tst_psVectorSort_01.c (modified) (2 diffs)
• tst_psVectorSort_02.c (modified) (2 diffs)
• verified/tst_psVectorSort_01.stderr (modified) (1 diff)
• verified/tst_psVectorSort_02.stderr (modified) (1 diff)

trunk/psLib/test/collections/tst_psVectorSort_01.c

@@ -7 +7 @@
  *     B)  Sort input float vector into itself
  *     C)  Attempt to sort vector with invalid type (i.e. PS_TYPE_BOOL)
- *     D)  Sort input vector with zero items 
+ *     D)  Sort input vector with zero items
  *     C)  Free float vectors
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-21 21:18:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -142 +142 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error messgae");
     tempVec = psVectorSort(out,in);
-    if(tempVec != out) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return the specified output vector");
+    if(tempVec != NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not return NULL on error or didn't error?");
         return 33;
     }
-    psFree(out);
     printFooter(stdout,"psVectorSort","Invalid vector type",true);
 

trunk/psLib/test/collections/tst_psVectorSort_02.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-21 21:18:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -155 +155 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate two error messages(psVectorSort,psVectorSortIndex)");
     out = psVectorSortIndex(out,in);
-    if( out != tempVect) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return the same output vector");
+    if( out != NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not return NULL on error or didn't error?");
         return 119;
     }
     in->type.type = PS_TYPE_U8;
     psFree(in);
-    psFree(out);
     printFooter(stdout,"psVectorSortIndex","Attempt to sort with invalid type",true);
 

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

@@ -2 +2 @@
     Following should generate an error messgae
 <DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
-    Input psVector is an unsupported type (4865).
+    Input psVector is an unsupported type (0x1301).

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

@@ -5 +5 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate two error messages(psVectorSort,psVectorSortIndex)
-<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
-    Input psVector is an unsupported type (4865).
 <DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
-    Input psVector is an unsupported type (4865).
+    Input psVector is an unsupported type (0x1301).