Changeset 7071 for trunk/psLib/test/mathtypes

Timestamp:

May 4, 2006, 4:48:35 PM (20 years ago)

Author:

drobbin

Message:

Fixed some tiny things and working on fixing psImageSmooth (not done).

Location:

trunk/psLib/test/mathtypes

Files:

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

trunk/psLib/test/mathtypes/tst_psVectorSort_01.c

@@ -12 +12 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-05-02 22:35:52 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-05-05 02:48:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
     //    }
     if (out != NULL) {
+        if (out->n != 0) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    "psVectorSort failed to correctly return a 0-length vector.\n");
+            return 12;
+        }
+    } else {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "psVectorSort failed to return a NULL vector for 0-length input vector.\n");
-        return 666;
+                "psVectorSort returned a NULL vector instead of expected vector with n=0.\n");
+        return 13;
     }
     /*    if(out->n != 0) {
@@ -174 +180 @@
         }
         */
+    psFree(out);
     printFooter(stdout,"psVectorSort","Sort zero element vector",true);
 

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

@@ -5 +5 @@
 <DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     Error in psVectorSort:  psVectorCopy returned NULL vector!
-<DATE><TIME>|<HOST>|W|psVectorCopy (FILE:LINENO)
-    Warning: psVector was copied with 0 elements!
-<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
-    Error in psVectorSort:  Vector has less than 2 data entries!