Changeset 6574 for trunk/psLib/test/mathtypes

Timestamp:

Mar 13, 2006, 4:22:55 PM (20 years ago)

Author:

drobbin

Message:

Changed psImageSet to coincide with new stipulations concerning sub-images.

Location:

trunk/psLib/test/mathtypes

Files:

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

trunk/psLib/test/mathtypes/tst_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-29 01:15:38 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-14 02:22:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -361 +361 @@
     image = psImageAlloc(5, 5, PS_TYPE_S32);
 
-    if ( !psImageSet(image, 0, 0, 10) )
-        fprintf(stderr, "ImageSet failed to set S32 at position 0\n");
-    if ( psImageSet(image, 10, 10, 100) )
-        fprintf(stderr, "ImageSet Improperly set S32 at out of range position\n");
-    if ( !psImageSet(image, -1, -1, 4) )
-        fprintf(stderr, "ImageSet Failed to set S32 at position 4,4\n");
-    if ( (psS32)psImageGet(image, 0, 0) != 10 )
-        fprintf(stderr, "ImageGet Failed to return the correct S32 from position 0,0\n");
-    if ( (psS32)psImageGet(image, -1, -1) != 4 )
-        fprintf(stderr, "ImageGet Failed to return the correct S32 from tail using -1,-1\n");
+    //Set the position of the subimage relative to the parent.
+    image->col0 = 10;
+    image->row0 = 10;
+    for (int i = 0; i < 5; i++) {
+        for (int j = 0; j < 5; j++) {
+            image->data.S32[i][j] = i+j;
+        }
+    }
+
+    //Attempt to set a position in a NULL psImage*
+    psImage *none = NULL;
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(none, 1, 1, 1) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return false when passed a NULL image.\n");
+        return 1;
+    }
+
+    //Attempt to set a position in a psImage* with negative numCols, numRows
+    none = psImageAlloc(2, 2, PS_TYPE_S32);
+    *(int*)&none->numCols = -1;
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(none, 1, 1, 1) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return false when passed an image with negative numCols.\n");
+        return 2;
+    }
+    *(int*)&none->numCols = 2;
+    *(int*)&none->numRows = -1;
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(none, 1, 1, 1) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return false when passed an image with negative numRows.\n");
+        return 3;
+    }
+
+    //Attempt to set a position in a psImage* with negative col0, row0
+    *(int*)&none->numRows = 2;
+    none->row0 = -1;
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(none, 1, 1, 1) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return false when passed an image with negative col0.\n");
+        return 4;
+    }
+    none->row0 = 0;
+    none->col0 = -1;
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(none, 1, 1, 1) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return false when passed an image with negative col0.\n");
+        return 5;
+    }
+    psFree(none);
+
+    //Try to set a position inside of the subimage.
+    if ( !psImageSet(image, 13, 14, 666) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return true when passed valid parameters.\n");
+        return 6;
+    } else if (image->data.S32[3][4] != 666) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to set the data values correctly.\n");
+        return 7;
+    }
+    //Try to set a position inside of the subimage from the tail.
+    if ( !psImageSet(image, -1, -1, 666) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to return true when passed valid parameters.\n");
+        return 8;
+    } else if  (image->data.S32[4][4] != 666) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psImageSet failed to set (from the tail) the data values correctly.\n");
+        printf("\n value at 14,14 is %d\n", image->data.S32[4][4]);
+        return 9;
+    }
+
+    //Try to set a position outside of the subimage but inside of the parent image.
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(image, 0, 0, 666) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageSet failed to return false when passed an invalid location.\n");
+        return 10;
+    }
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(image, 9, 10, 666) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageSet failed to return false when passed an invalid location.\n");
+        return 11;
+    }
+
+    //Try to set a position outside of the subimage.
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(image, 15, 14, 666) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageSet failed to return false when passed an invalid location.\n");
+        return 12;
+    }
+    //Try to set a position outside of the subimage, indexing from the tail.
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psImageSet(image, -6, -1, 666) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageSet failed to return false when passed an invalid location.\n");
+        return 13;
+    }
+
 
     psFree(image);

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

@@ -134 +134 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
 <DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
-    Invalid position.  Position too large
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Error: image->numCols is less than 0.
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Error: image->numRows is less than 0.
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Error: image->row0 is less than 0.
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Error: image->col0 is less than 0.
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Invalid x-position 0.  Position out of range (10-14)
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Invalid x-position 9.  Position out of range (10-14)
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Invalid x-position 15.  Position out of range (10-14)
+<DATE><TIME>|<HOST>|I|testImageGetSet
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageSet (FILE:LINENO)
+    Invalid x-position 9.  Position out of range (10-14)
 
 ---> TESTPOINT PASSED (psImage{psImageGetSet} | tst_psImage.c)