Changeset 1946 for trunk/psLib/test/dataManip/tst_psFunc03.c

Timestamp:

Oct 3, 2004, 2:39:58 PM (22 years ago)

Author:

gusciora

Message:

Added memory corruption checks to these files.

File:

• trunk/psLib/test/dataManip/tst_psFunc03.c (modified) (13 diffs)

trunk/psLib/test/dataManip/tst_psFunc03.c

@@ -3 +3 @@
     allocates the spline data structure.
  
-    XXX: figure out the memory deallocator
     XXX: test bounds?
  *****************************************************************************/
@@ -13 +12 @@
 
 #define N 10
+#define LINEAR 1
+#define CUBIC 3
 
 int main()
@@ -19 +20 @@
     int memLeaks=0;
     int i;
-    //    int  currentId = psMemGetId();
+    int  currentId = psMemGetId();
     psSpline1D *tmpSpline;
     psVector *bounds;
@@ -28 +29 @@
     printPositiveTestHeader(stdout,
                             "psFunction functions",
-                            "psSpline1DAlloc()");
+                            "psSpline1DAllocGeneric(): linear");
     bounds = psVectorAlloc(N+1, PS_TYPE_F32);
     for (i=0;i<N+1;i++) {
@@ -34 +35 @@
     }
 
-    tmpSpline = psSpline1DAllocGeneric(bounds, 1);
+    tmpSpline = psSpline1DAllocGeneric(bounds, LINEAR);
     if (tmpSpline == NULL) {
         printf("ERROR: Could not allocate psSpline1D data structure\n");
@@ -54 +55 @@
             testStatus = false;
         }
-        if ((tmpSpline->spline[i])->n != 2) {
+        if ((tmpSpline->spline[i])->n != LINEAR+1) {
             printf("ERROR: Spline created with order %d\n", (tmpSpline->spline[i])->n);
             testStatus = false;
@@ -71 +72 @@
     }
 
-    psFree(tmpSpline);
+    p_psSpline1DFree(tmpSpline);
+    psFree(bounds);
     psMemCheckCorruption(1);
-    //    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
@@ -80 +82 @@
     printFooter(stdout,
                 "psFunctions functions",
-                "psSpline1DAlloc()",
+                "psSpline1DAllocGeneric(): linear",
                 testStatus);
     /****************************************************************************/
@@ -87 +89 @@
     printPositiveTestHeader(stdout,
                             "psFunction functions",
-                            "psSpline1DAlloc()");
+                            "psSpline1DAllocGeneric(): cubic");
     bounds = psVectorAlloc(N+1, PS_TYPE_F32);
     for (i=0;i<N+1;i++) {
@@ -93 +95 @@
     }
 
-    tmpSpline = psSpline1DAllocGeneric(bounds, 3);
+    tmpSpline = psSpline1DAllocGeneric(bounds, CUBIC);
     if (tmpSpline == NULL) {
         printf("ERROR: Could not allocate psSpline1D data structure\n");
@@ -113 +115 @@
             testStatus = false;
         }
-        if ((tmpSpline->spline[i])->n != 4) {
+        if ((tmpSpline->spline[i])->n != CUBIC+1) {
             printf("ERROR: Spline created with order %d\n", (tmpSpline->spline[i])->n);
             testStatus = false;
@@ -130 +132 @@
     }
 
-    psFree(tmpSpline);
+    p_psSpline1DFree(tmpSpline);
+    psFree(bounds);
     psMemCheckCorruption(1);
-    //    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
@@ -139 +142 @@
     printFooter(stdout,
                 "psFunctions functions",
-                "psSpline1DAlloc()",
+                "psSpline1DAllocGeneric(): cubic",
                 testStatus);