Changeset 5137 for trunk/psLib/test/mathtypes

Timestamp:

Sep 26, 2005, 12:35:54 PM (21 years ago)

Author:

drobbin

Message:

Implemented, updated, fixed, debugged the CountPixelMask fxns and tests

Location:

trunk/psLib/test/mathtypes

Files:

• tst_psVector.c (modified) (4 diffs)
• verified/tst_psVector.stderr (modified) (1 diff)

trunk/psLib/test/mathtypes/tst_psVector.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-09-24 01:33:12 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-09-26 22:35:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 static psS32 testVectorCreate(void);
 static psS32 testVectorGetSet(void);
+static psS32 testVectorCountPixelMask(void);
 
 testDescription tests[] = {
@@ -38 +39 @@
                               {testVectorCreate,-5,"psVectorCreate",0,false},
                               {testVectorGetSet,-6,"psVectorGet/Set",0,false},
+                              {testVectorCountPixelMask,-7,"psVectorCountPixelMask",0,false},
                               {NULL}
                           };
@@ -414 +416 @@
 }
 
-
-
+psS32 testVectorCountPixelMask(void)
+{
+    long numPix = 0;
+    long numPix2 = 0;
+    psVector *vec = NULL;
+    numPix = psVectorCountPixelMask(vec, 1);
+
+    if (numPix != -1) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psVectorCountPixelMask failed to return -1 for NULL Vector input.\n");
+        return 1;
+    }
+
+    numPix = 0;
+    vec = psVectorAlloc(5, PS_TYPE_S32);
+    psVector *vec2 = NULL;
+    vec2 = psVectorAlloc(5, PS_TYPE_U8);
+    vec->data.S32[0] = 0;
+    vec->data.S32[1] = 1;
+    vec->data.S32[2] = 0;
+    vec->data.S32[3] = 1;
+    vec->data.S32[4] = 0;
+    vec2->data.U8[0] = 0;
+    vec2->data.U8[1] = 1;
+    vec2->data.U8[2] = 0;
+    vec2->data.U8[3] = 1;
+    vec2->data.U8[4] = 0;
+    numPix = psVectorCountPixelMask(vec, 1);
+    numPix2 = psVectorCountPixelMask(vec2, 1);
+
+    if (numPix != -1) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psVectorCountPixelMask failed to return -1 for wrong type of Vector input.\n");
+        return 2;
+    }
+    if (numPix2 == -1) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psVectorCountPixelMask returned -1 for correct Vector input\n");
+        return 3;
+    }
+    if (numPix2 != 2) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psVectorCountPixelMask returned incorrect pixel count %d\n", numPix2);
+        return 4;
+    }
+
+    psFree(vec);
+    psFree(vec2);
+    return 0;
+}
+

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

@@ -69 +69 @@
 ---> TESTPOINT PASSED (psVector{psVectorGet/Set} | tst_psVector.c)
 
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psVector.c                                             *
+*            TestPoint: psVector{psVectorCountPixelMask}                           *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|E|psVectorCountPixelMask (FILE:LINENO)
+    The input psVector can not be NULL.
+<DATE><TIME>|<HOST>|E|psVectorCountPixelMask (FILE:LINENO)
+    Input psVector is an unsupported type (0x104).
+
+---> TESTPOINT PASSED (psVector{psVectorCountPixelMask} | tst_psVector.c)
+