Changeset 12094 for trunk/psLib/test/math/tap_psHist02.c

Timestamp:

Feb 27, 2007, 1:56:12 PM (19 years ago)

Author:

gusciora

Message:

Made several changes to keep the tap tests up-to-date with recent src
changes.

File:

• trunk/psLib/test/math/tap_psHist02.c (modified) (5 diffs)

trunk/psLib/test/math/tap_psHist02.c

@@ -35 +35 @@
 
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins );
-        myHist = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
-        ok(myHist != NULL, "psVectorHistogram() returned a non-NULL psHistogram");
+        bool rc = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
+        ok(rc == false, "psVectorHistogram() returned TRUE");
         skip_start(myHist == NULL, 1, "Skipping tests because psVectorHistogram() returned NULL");
 
@@ -80 +80 @@
         }
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins );
-        myHist = psVectorHistogram(myHist, myData, NULL, myMask, 1);
-        ok(myHist != NULL, "psVectorHistogram() returned a non-NULL psHistogram");
+        bool rc = psVectorHistogram(myHist, myData, NULL, myMask, 1);
+        ok(rc == false, "psVectorHistogram() returned TRUE");
         skip_start(myHist == NULL, 1, "Skipping tests because psVectorHistogram() returned NULL");
 
@@ -123 +123 @@
             myData->data.F32[ i ] = lower + ( ( higher - lower ) / ( float ) NUM_DATA ) * ( float ) i;
         }
-        ok(NULL == psVectorHistogram( NULL, myData, NULL, NULL, 0 ), "psVectorHistogram() returned NULL with a NULL psHistogram input");
+        ok(false == psVectorHistogram( NULL, myData, NULL, NULL, 0 ),
+          "psVectorHistogram() returned FALSE with a NULL psHistogram input");
         psFree( myData );
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -135 +136 @@
         psMemId id = psMemGetId();
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins );
-        ok(NULL != psVectorHistogram( myHist, NULL, NULL, NULL, 0 ), "psVectorHistogram() returns non-NULL with a NULL input array");
+        ok(true == psVectorHistogram( myHist, NULL, NULL, NULL, 0 ),
+          "psVectorHistogram() returns TRUE with a NULL input array");
         psFree(myHist);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -149 +151 @@
         psVector *myData = psVectorAlloc(0, PS_TYPE_F32);
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins);
-        myHist = psVectorHistogram(myHist, NULL, NULL, NULL, 0);
-        ok(NULL != psVectorHistogram( myHist, NULL, NULL, NULL, 0 ), "psVectorHistogram() returns non-NULL with an empty input array");
+        ok(true == psVectorHistogram( myHist, NULL, NULL, NULL, 0 ),
+          "psVectorHistogram() returns TRUE with an empty input array");
         psFree(myHist);
         psFree(myData);