Changeset 2053

Timestamp:

Oct 12, 2004, 9:18:20 AM (22 years ago)

Author:

evanalst

Message:

Add addtional test cases to psBinaryOp.

Location:

trunk/psLib/test/dataManip

Files:

• tst_psMatrixVectorArithmetic03.c (modified) (2 diffs)
• verified/tst_psMatrixVectorArithmetic03.stderr (modified) (1 diff)
• verified/tst_psMatrixVectorArithmetic03.stdout (modified) (1 diff)

trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c

@@ -15 +15 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-08 02:48:01 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-12 19:18:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -214 +214 @@
     printFooter(stdout, "psMatrixVectorArithmetic", "Invalid operation", true);
 
+    // Invalid parameter in2
+    printNegativeTestHeader(stdout,"psMatrixVectorArithmetic","Invalid input",
+                            "Invalid operation", 0);
+    CREATE_AND_SET_VECTOR(vector4,F64,0,3);
+    CREATE_AND_SET_VECTOR(vector5,F64,0,3);
+    CREATE_AND_SET_VECTOR(vector6,F64,0,3);
+    if ( psBinaryOp(vector6,vector4,"+",NULL) != NULL ) {
+        psError(__func__,"psBinaryOp should return null when out and in1 valid but in2 null.");
+        return 10;
+    }
+    printFooter(stdout, "psMatrixVectorArithmetic", "Invalid input", true);
+
+    vector4->type.dimen = PS_DIMEN_OTHER;
+    if ( psBinaryOp(NULL,vector4,"+",vector5) != NULL) {
+        psError(__func__,"psBinaryOp should return null when input dimen PS_DIMEN_OTHER.");
+        return 11;
+    }
+    vector4->type.dimen = PS_DIMEN_VECTOR;
+
+    psScalar* inScalar = psScalarAlloc(0,PS_TYPE_F64);
+    CREATE_AND_SET_IMAGE(image10,F64,0,3,3);
+    if ( psBinaryOp(image10,inScalar,"+",vector4) == NULL ) {
+        psError(__func__,"psBinaryOp should not return null when input/out dimension don't match.");
+        return 12;
+    }
+
+    psFree(vector4);
+    psFree(vector5);
+
     return 0;
 }

trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr

@@ -29 +29 @@
 <DATE><TIME>|<HOST>|E|psUnaryOp
     : Invalid operation: yarg
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - Null in2 argument
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - PS_DIMEN_OTHER not allowed for arguments: (4, 1)

trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stdout

@@ -76 +76 @@
 ---> TESTPOINT PASSED (psMatrixVectorArithmetic{Invalid operation} | tst_psMatrixVectorArithmetic03.c)
 
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMatrixVectorArithmetic03.c                           *
+*            TestPoint: psMatrixVectorArithmetic{Invalid input}                    *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Invalid operation                                          *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMatrixVectorArithmetic{Invalid input} | tst_psMatrixVectorArithmetic03.c)
+