Index: trunk/psLib/test/math/tap_psPolynomialEval1D.c
===================================================================
--- trunk/psLib/test/math/tap_psPolynomialEval1D.c	(revision 12781)
+++ trunk/psLib/test/math/tap_psPolynomialEval1D.c	(revision 13124)
@@ -4,6 +4,6 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.6 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2007-04-10 21:09:30 $
+*  @version  $Revision: 1.7 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2007-05-02 04:20:06 $
 *
 *  XXX: Probably should test single- and multi-dimensional polynomials in
@@ -44,5 +44,25 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(24);
+    plan_tests(30);
+
+
+    // Allocate polynomial with unallowable type
+    {
+        psMemId id = psMemGetId();
+        psPolynomial1D* polyOrd = psPolynomial1DAlloc(99, TERMS-1);
+        ok(polyOrd==NULL, "psPolynomial1DAlloc() returned NULL with unallowed type");
+        psFree(polyOrd);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // Evaluate a NULL polynomial
+    {
+        psMemId id = psMemGetId();
+        psF64 result = psPolynomial1DEval(NULL, 0.0);
+        ok(isnan(result), "psPolynomial1DEval() returned NAN with NULL psPolynomial");
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
 
     // Allocate and evaluate an ordinary polynomial structure
@@ -75,5 +95,5 @@
         skip_end();
         psFree(polyOrd);
-        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
 
@@ -107,21 +127,4 @@
 
 
-    // Allocate polynomial with unallowable type
-    // XXX: This is wierd: why the skip()?
-    {
-        psMemId id = psMemGetId();
-        psPolynomial1D* polyOrd = psPolynomial1DAlloc(99, TERMS-1);
-        ok(polyOrd==NULL, "psPolynomial1DAlloc() returned NULL, as expected");
-        skip_start(polyOrd!=NULL, 1, "Skipping tests because psPolynomial1DAlloc() failed");
-
-        // Attempt to evaluation invalid polynomial type
-        psF64 result = psPolynomial1DEval(polyOrd, 0.0);
-        ok(isnan(result), "psPolynomial1DEval() did not return NAN, as expected");
-        skip_end();
-        psFree(polyOrd);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
     // Allocate polynomial, test the psPolynomial1DEvalVector() routines
     {
@@ -162,13 +165,25 @@
         ok(!errorFlag, "psPolynomial1DEvalVector() produced the correct answers");
 
-        // Attempt to invoke function with null polynomial
-        ok(psPolynomial1DEvalVector(NULL, inputOrd) == NULL, "psPolynomial1DEvalVector() produced NULL when called with NULL polynomial");
-
-        // Attempt to invoke function with null input vector
-        ok(psPolynomial1DEvalVector(polyOrd,NULL) == NULL, "psPolynomial1DEvalVector() produced NULL when called with NULL input vector");
+        // Attempt to invoke function with NULL polynomial
+        {
+            psMemId id = psMemGetId();
+            ok(psPolynomial1DEvalVector(NULL, inputOrd) == NULL, "psPolynomial1DEvalVector() produced NULL when called with NULL polynomial");
+            ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        }
+
+        // Attempt to invoke function with NULL input vector
+        {
+            psMemId id = psMemGetId();
+            ok(psPolynomial1DEvalVector(polyOrd, NULL) == NULL, "psPolynomial1DEvalVector() produced NULL when called with NULL input vector");
+            ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        }
 
         // Attempt to invoke function with a non F64 type input vector
-        inputOrd->type.type = PS_TYPE_U8;
-        ok(psPolynomial1DEvalVector(polyOrd,inputOrd) == NULL, "psPolynomial1DEvalVector() produced NULL when called with non F64 input vector");
+        {
+            psMemId id = psMemGetId();
+            inputOrd->type.type = PS_TYPE_U8;
+            ok(psPolynomial1DEvalVector(polyOrd,inputOrd) == NULL, "psPolynomial1DEvalVector() produced NULL when called with non F64 input vector");
+            ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        }
         psFree(outputOrd);
         skip_end();
@@ -216,10 +231,22 @@
         ok(!errorFlag, "psPolynomial1DEvalVector() produced the correct answers");
 
-        // Attempt to invoke function with null input vector
-        ok(psPolynomial1DEvalVector(polyCheb,NULL) == NULL, "psPolynomial1DEvalVector() produced NULL when called with NULL input vector");
+
+        // Attempt to invoke function with NULL input vector
+        {
+            psMemId id = psMemGetId();
+            ok(psPolynomial1DEvalVector(polyCheb,NULL) == NULL, "psPolynomial1DEvalVector() produced NULL when called with NULL input vector");
+            ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        }
+
 
         // Attempt to invoke function with a non F64 type input vector
-        inputCheb->type.type = PS_TYPE_U8;
-        ok(psPolynomial1DEvalVector(polyCheb,inputCheb) == NULL, "psPolynomial1DEvalVector() produced NULL when called with non F64 input vector");
+        {
+            psMemId id = psMemGetId();
+            inputCheb->type.type = PS_TYPE_U8;
+            ok(psPolynomial1DEvalVector(polyCheb,inputCheb) == NULL, "psPolynomial1DEvalVector() produced NULL when called with non F64 input vector");
+            ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+        }
+
+
         psFree(outputCheb);
         skip_end();