Changeset 1893

Timestamp:

Sep 24, 2004, 2:43:55 PM (22 years ago)

Author:

evanalst

Message:

Remove test type S32, U32 from test_psImageClip since they are not required,
added additional case to check for invalid type(S32) and updated the
verified file.

Location:

trunk/psLib/test/image

Files:

• tst_psImageManip.c (modified) (4 diffs)
• verified/tst_psImageManip.stderr (modified) (2 diffs)

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-18 00:40:15 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-25 00:43:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -191 +191 @@
     psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of F32 imagery");
     testImageClipByType(F32);
-    psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of S32 imagery");
-    testImageClipByType(S32);
+    //    psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of S32 imagery");
+    //    testImageClipByType(S32);
     psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of S16 imagery");
     testImageClipByType(S16);
     psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of S8 imagery");
     testImageClipByType(S8);
-    psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of U32 imagery");
-    testImageClipByType(U32);
+    //    psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of U32 imagery");
+    //    testImageClipByType(U32);
     psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of U16 imagery");
     testImageClipByType(U16);
@@ -225 +225 @@
         return 4;
     }
+
+    // Verify program execution doesn't stop if the input image type is something
+    // other than U8, U16, S8, S16, F32, F64, C32, C64.
+    img = psImageAlloc(c,r,PS_TYPE_S32);
+    psLogMsg(__func__,PS_LOG_INFO,"Following should be an error (invalid type)");
+    retVal = psImageClip(img,min,-1.0f,max,-2.0f);
+    if (retVal != 0) {
+        psError(__func__,"Expected zero return for clip of invalid image type.");
+        return 5;
+    }
+    psFree(img);
 
     return 0;
@@ -295 +306 @@
     testImageClipNaNByType(F32);
     testImageClipNaNByType(F64);
+    testImageClipNaNByType(C32);
+    testImageClipNaNByType(C64);
 
     // Verify the retuned integer is zero, psImage structure input is unmodified

trunk/psLib/test/image/verified/tst_psImageManip.stderr

@@ -12 +12 @@
     Testing clipping of F32 imagery
 <DATE><TIME>|<HOST>|I|testImageClip
-    Testing clipping of S32 imagery
-<DATE><TIME>|<HOST>|I|testImageClip
     Testing clipping of S16 imagery
 <DATE><TIME>|<HOST>|I|testImageClip
     Testing clipping of S8 imagery
-<DATE><TIME>|<HOST>|I|testImageClip
-    Testing clipping of U32 imagery
 <DATE><TIME>|<HOST>|I|testImageClip
     Testing clipping of U16 imagery
@@ -31 +27 @@
 <DATE><TIME>|<HOST>|E|psLib.image.psImageClip
     Specified min value, 256, can not be greater than the specified max value, 128.
+<DATE><TIME>|<HOST>|I|testImageClip
+    Following should be an error (invalid type)
+<DATE><TIME>|<HOST>|E|psLib.image.psImageClip
+    Specified psImage type (psS32) is not supported.
 
 ---> TESTPOINT PASSED (psImage{psImageClip} | tst_psImageManip.c)