Changeset 7090

Timestamp:

May 8, 2006, 5:20:00 PM (20 years ago)

Author:

Paul Price

Message:

Updated test to provide some feedback on where the error is occurring.

File:

• trunk/psLib/test/imageops/tst_psImageSmooth.c (modified) (3 diffs)

trunk/psLib/test/imageops/tst_psImageSmooth.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-05 02:48:34 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-09 03:20:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 
 testDescription tests[] = {
-                              {testImageSmooth, 0, "psImageSmooth", true, false},
+                              {testImageSmooth, 0, "psImageSmooth", 0, false},
                               {NULL}
                           };
@@ -166 +166 @@
 static psS32 testImageSmooth()
 {
-    psBool rc = true;
+    int bad = 0x00;            // What's bad?
 
-    rc&= testImageSmoothGeneric(TS00_IM_F32, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, true);
-    rc&= testImageSmoothGeneric(TS00_IM_F32, 1, NUM_ROWS, SIGMA, NSIGMA, true);
-    rc&= testImageSmoothGeneric(TS00_IM_F32, NUM_COLS, 1, SIGMA, NSIGMA, true);
-    rc&= testImageSmoothGeneric(TS00_IM_F32, 1, 1, SIGMA, NSIGMA, true);
-    rc&= testImageSmoothGeneric(TS00_IM_F64, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, true);
-    rc&= testImageSmoothGeneric(TS00_IM_S32, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false);
-    rc&= testImageSmoothGeneric(TS00_IM_NULL, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false);
+    bad |= (testImageSmoothGeneric(TS00_IM_F32, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, true)    ? 0x00 : 0x01);
+    bad |= (testImageSmoothGeneric(TS00_IM_F32, 1, NUM_ROWS, SIGMA, NSIGMA, true)           ? 0x00 : 0x02);
+    bad |= (testImageSmoothGeneric(TS00_IM_F32, NUM_COLS, 1, SIGMA, NSIGMA, true)           ? 0x00 : 0x04);
+    bad |= (testImageSmoothGeneric(TS00_IM_F32, 1, 1, SIGMA, NSIGMA, true)                  ? 0x00 : 0x08);
+    bad |= (testImageSmoothGeneric(TS00_IM_F64, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, true)    ? 0x00 : 0x10);
+    bad |= (testImageSmoothGeneric(TS00_IM_S32, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false)   ? 0x00 : 0x20);
+    bad |= (testImageSmoothGeneric(TS00_IM_NULL, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false)  ? 0x00 : 0x40);
 
-    return(rc);
+    return bad;
 }