Changeset 3311

Timestamp:

Feb 23, 2005, 11:36:57 AM (21 years ago)

Author:

desonia

Message:

updated tests in response to source changes.

Location:

trunk/psLib/test/image

Files:

• Makefile.am (modified) (2 diffs)
• tst_psImageExtraction.c (modified) (3 diffs)
• verified/tst_psImageExtraction.stderr (modified) (1 diff)
• verified/tst_psImageStats.stderr (added)
• verified/tst_psImageStats00.stderr (deleted)
• verified/tst_psImageStats01.stderr (deleted)
• verified/tst_psImageStats01.stdout (deleted)
• verified/tst_psImageStats02.stderr (deleted)
• verified/tst_psImageStats02.stdout (deleted)

trunk/psLib/test/image/Makefile.am

@@ -19 +19 @@
         tst_psImageFFT \
         tst_psImageManip \
-        tst_psImageStats00 \
-        tst_psImageStats01 \
-        tst_psImageStats02 \
-        tst_psImageStats03 \
-        tst_psImageStats04 \
+        tst_psImageStats \
         tst_psImageExtraction \
         tst_psImageConvolve \
@@ -44 +40 @@
 tst_psImageFFT_SOURCES =  tst_psImageFFT.c
 tst_psImageManip_SOURCES =  tst_psImageManip.c
-tst_psImageStats00_SOURCES =  tst_psImageStats00.c
-tst_psImageStats01_SOURCES =  tst_psImageStats01.c
-tst_psImageStats02_SOURCES =  tst_psImageStats02.c
-tst_psImageStats03_SOURCES =  tst_psImageStats03.c
-tst_psImageStats04_SOURCES =  tst_psImageStats04.c
+tst_psImageStats_SOURCES =  tst_psImageStats.c
 tst_psImageExtraction_SOURCES =  tst_psImageExtraction.c
 tst_psImageConvolve_SOURCES =  tst_psImageConvolve.c

trunk/psLib/test/image/tst_psImageExtraction.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 19:26:25 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-23 21:36:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -334 +334 @@
     }
 
-    /* Verify the input image is an invalid type */
-    psLogMsg( __func__, PS_LOG_INFO, "Following should be an error invalid image type.");
-    psImage* imgU8 = psImageAlloc( c, r, PS_TYPE_U8 );
-    out = psImageSlice( out, NULL,
-                        imgU8,
-                        mask, 1,
-                        c/10, r/10,
-                        c/10+1, r/10+1,
-                        PS_CUT_X_POS,
-                        stat);
-    if ( out != NULL ) {
-        psError( PS_ERR_UNKNOWN,true, "Input image with invalid type didn't return NULL as expected.");
-        return 112;
-    }
-
     psFree( image );
     psFree( positions );
@@ -354 +339 @@
     psFree( out );
     psFree( stat );
-    psFree( imgU8 );
     psFree( maskS8 );
     psFree( maskSz );

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

@@ -175 +175 @@
 <DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Input psImage mask type, psS8, is not the supported mask datatype of psU8.
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error invalid image type.
-<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
-    Specified psImage type, psU8, is not supported.
 
 ---> TESTPOINT PASSED (psImage{psImageSlice} | tst_psImageExtraction.c)