Changeset 6445 for trunk/psLib/test/types

Timestamp:

Feb 16, 2006, 5:24:47 PM (20 years ago)

Author:

drobbin

Message:

Changed psArrayAlloc to set ->n = 0. Updated corresponding functions & tests.

Location:

trunk/psLib/test/types

Files:

• tst_psArray.c (modified) (4 diffs)
• verified/tst_psArray.stderr (modified) (2 diffs)

trunk/psLib/test/types/tst_psArray.c

@@ -17 +17 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-10-01 02:22:26 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-02-17 03:24:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 
 testDescription tests[] = {
-                              {testArray, -1, "psArray", 0, false},
-                              {testArray01, -2, "psArray", 0, false},
-                              {testArrayAdd, 788, "psArrayAdd", 0, false},
-                              {testArrayGetSet, -3, "psArrayGetSet", 0, false},
+                              {testArray, 665, "psArray", 0, false},
+                              {testArray01, 666, "psArray01", 0, false},
+                              {testArrayAdd, 667, "psArrayAdd", 0, false},
+                              {testArrayGetSet, 668, "psArrayGetSet", 0, false},
                               {NULL}
                           };
@@ -94 +94 @@
         ts->y = 10.1*i;
         mySt[i] = ts;
-        psArr->data[i] = ts;
+        //        psArr->data[i] = ts;
+        if (!psArraySet(psArr, psArr->n, (psPtr)ts) ) {
+            return 6;
+        }
         psMemIncrRefCounter(ts);
+        psFree(ts);
     }
 
@@ -264 +268 @@
         ts->y = 10.1*(10-i);
         mySt[i] = ts;
-        psArr->data[i] = ts;
+        //        psArr->data[i] = ts;
+        if (!psArraySet(psArr, psArr->n, (psPtr)ts) ) {
+            return 6;
+        }
         psMemIncrRefCounter(ts);
+        psFree(ts);
     }
 

trunk/psLib/test/types/verified/tst_psArray.stderr

@@ -136 +136 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psArray.c                                              *
-*            TestPoint: psArray{psArray}                                           *
+*            TestPoint: psArray{psArray01}                                         *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -208 +208 @@
 
 
----> TESTPOINT PASSED (psArray{psArray} | tst_psArray.c)
+---> TESTPOINT PASSED (psArray{psArray01} | tst_psArray.c)
 
 /***************************** TESTPOINT ******************************************\