Changeset 12331

Timestamp:

Mar 8, 2007, 12:13:32 PM (19 years ago)

Author:

Paul Price

Message:

Fixing tests following API changes.

Location:

trunk/psLib/test/types

Files:

• tap_psLookupTable_all.c (modified) (3 diffs)
• tap_psPixels_all.c (modified) (11 diffs)

trunk/psLib/test/types/tap_psLookupTable_all.c

@@ -86 +86 @@
     psArray *vectors = NULL;
     psLookupTable*  table1  = NULL;
-    psLookupTable*  tableOut  = NULL;
     long           numRows = 0;
 
@@ -205 +204 @@
     // Attempt to import table with negative indexCol
     vectors = psVectorsReadFromFile(table1->filename, table1->format);
-    tableOut = psLookupTableImport(table1, vectors, -1 );
-    {
-        ok( tableOut == NULL,
-            "psLookupTableImport:             return NULL for negative indexCol input.");
+    {
+        ok( !psLookupTableImport(table1, vectors, -1 ),
+            "psLookupTableImport:             return false for negative indexCol input.");
     }
     //Attempt to import table with unsorted array column
@@ -214 +212 @@
     table1 = psLookupTableAlloc("table.dat",
                                 "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0);
-    tableOut = psLookupTableImport(table1, vectors, 7 );
-    {
-        ok( tableOut != NULL,
-            "psLookupTableImport:             return correct table for array with unsorted column");
+    {
+        ok( psLookupTableImport(table1, vectors, 7 ),
+            "psLookupTableImport:             return true for array with unsorted column");
     }
 

trunk/psLib/test/types/tap_psPixels_all.c

@@ -3 +3 @@
  *
  * Description:  Tests for psPixelsAlloc, psPixelsRealloc, psMemCheckPixels,
- *               psPixelsCopy, psPixels(To/From)Mask, p_psPixelsAppend, psPixelsLength,
+ *               psPixelsCopy, psPixels(To/From)Mask, p_psPixelsAdd, psPixelsLength,
  *               psPixels(Set/Get), psPixelsConcatenate
  *
@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(38);
+    plan_tests(36);
 
     note("Tests for psPixels Functions");
@@ -40 +40 @@
     psPixels* p0 = psPixelsAlloc(0);
     {
-        ok(p0 != NULL && p0->n == 0 && p0->data == NULL && p0->nalloc == 0,
+        ok(p0 != NULL && p0->n == 0 && p0->nalloc == 0,
            "psPixelsAlloc:         return newly allocated psPixels of 0 length.");
     }
@@ -46 +46 @@
     psPixels* p1 = psPixelsAlloc(1);
     {
-        ok(p1 != NULL && p1->n == 0 && p1->data != NULL && p1->nalloc == 1,
+        ok(p1 != NULL && p1->n == 1 && p1->data != NULL && p1->nalloc == 1,
            "psPixelsAlloc:         return newly allocated psPixels of 1 length.");
     }
@@ -60 +60 @@
             "psMemCheckPixels:      return false for non-psPixels input.");
     }
-    //Return a psPixels for attempt to Reallocate a NULL psPixels.
-    {
-        psPixels *noPix = NULL;
-        noPix = psPixelsRealloc(noPix, 1);
-        ok(noPix != NULL && noPix->n == 0 && noPix->data != NULL && noPix->nalloc == 1,
-           "psPixelsRealloc:       return re-allocated psPixels of 1 length.");
-        psFree(noPix);
-    }
     //Return a 0-length allocated psPixels on Realloc with 0
     {
-        psPixels *noPix = NULL;
-        noPix = psPixelsRealloc(noPix, 1);
+        psPixels *noPix = psPixelsAlloc(1);
         noPix = psPixelsRealloc(noPix, 0);
-        ok( noPix->n == 0 && noPix->data == NULL && noPix->nalloc == 0,
+        ok( noPix->n == 0 && noPix->nalloc == 0,
             "psPixelsRealloc:       return re-allocated psPixels of 0 length.");
         psFree(noPix);
     }
     //Return a properly down-sized psPixels.
-    p0 = p_psPixelsAppend(p0, 1, 1.1, 1.2);
-    p0 = p_psPixelsAppend(p0, 1, 2.1, 2.2);
-    p0 = p_psPixelsAppend(p0, 1, 3.1, 3.2);
-    p0 = p_psPixelsAppend(p0, 0, 4.1, 4.2);
+    p0 = psPixelsAdd(p0, 1, 1.1, 1.2);
+    p0 = psPixelsAdd(p0, 1, 2.1, 2.2);
+    p0 = psPixelsAdd(p0, 1, 3.1, 3.2);
+    p0 = psPixelsAdd(p0, 0, 4.1, 4.2);
     {
         skip_start(  psPixelsLength(p0) != 4, 1,
@@ -105 +96 @@
             "psPixelsCopy:          return NULL for NULL psPixels input.");
     }
-    //Try to get the length of a non-psPixels object
-    {
-        psVector *vector = psVectorAlloc(5, PS_TYPE_F32);
-        ok( psPixelsLength((psPixels*)vector) == -1,
-            "psPixelsLength:       return -1 for non-psPixels input.");
-        psFree(vector);
-    }
 
     //Check for Memory leaks
@@ -212 +196 @@
             ("psPixels.out");
     }
-    //Return true for NULL pixels and name inputs
-    {
-        ok ( p_psPixelsPrint(stdout, NULL, NULL),
-             "p_psPixelsPrint:      return true for NULL pixels and name inputs.");
+    //Return false for NULL pixels and name inputs
+    {
+        ok ( !p_psPixelsPrint(stdout, NULL, NULL),
+             "p_psPixelsPrint:      return false for NULL pixels and name inputs.");
     }
     //Return true for empty pixel data.
@@ -270 +254 @@
     }
     //Return valid image for valid inputs
-    p0 = p_psPixelsAppend(p0, 1, 2.1, 2.2);
-    p0 = p_psPixelsAppend(p0, 1, 3.1, 3.2);
-    p0 = p_psPixelsAppend(p0, 1, 1.0, 1.0);
+    p0 = psPixelsAdd(p0, 1, 2.1, 2.2);
+    p0 = psPixelsAdd(p0, 1, 3.1, 3.2);
+    p0 = psPixelsAdd(p0, 1, 1.0, 1.0);
     {
         outImage = psPixelsToMask(outImage, p0, region, maskVal);
@@ -288 +272 @@
         }
     }
+
     psPixels *outPixels = NULL;
     {
         outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         ok ( outPixels != NULL,
-             "psPixelsFromMask:     return valid image for valid input.");
-    }
+             "psPixelsFromMask:     return valid pixels for valid input.");
+        psFree(outPixels);
+    }
+
     //Return NULL for NULL image input
     {
-        outPixels = psPixelsFromMask(outPixels, NULL, maskVal);
+        psPixels *outPixels = psPixelsFromMask(outPixels, NULL, maskVal);
         ok ( outPixels == NULL,
              "psPixelsFromMask:     return NULL for NULL image input.");
@@ -303 +290 @@
     *(psElemType*)&(outImage->type.type) = PS_TYPE_U32;
     {
-        outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
+        psPixels *outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         ok ( outPixels == NULL,
              "psPixelsFromMask:     return NULL for image with wrong maskType.");
@@ -311 +298 @@
     //Return NULL for NULL pixels input
     {
-        outPixels = psPixelsConcatenate(outPixels, NULL);
+        psPixels *outPixels = psPixelsConcatenate(outPixels, NULL);
         ok ( outPixels == NULL,
              "psPixelsConcatenate:  return NULL for NULL pixels input.");
     }
+
+
     //Return copy of input pixels for NULL out pixels
     {
+        outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         outPixels = psPixelsConcatenate(outPixels, p0);
         ok ( outPixels->n == 4 && fabs(outPixels->data[0].x - 1.1) < FLT_EPSILON &&