Changeset 4457 for trunk/psLib/test/collections/tst_psList.c

Timestamp:

Jul 5, 2005, 5:04:35 PM (21 years ago)

Author:

drobbin

Message:

made changes based on revisions in psLib SDRS rev. 15

File:

• trunk/psLib/test/collections/tst_psList.c (modified) (23 diffs)

trunk/psLib/test/collections/tst_psList.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-06 03:04:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77 +77 @@
         return 2;
     }
-    if (list->size != 0) {
+    if (list->n != 0) {
         psError(PS_ERR_UNKNOWN, true,"size of list wasn't zero for empty list.");
         return 3;
@@ -101 +101 @@
     }
 
-    if (list->size != 1) {
+    if (list->n != 1) {
         psError(PS_ERR_UNKNOWN, true,"size of list wasn't correctly set for new, one-element list.");
         return 7;
@@ -310 +310 @@
     list = psListAlloc(data);
     psFree(data);
-    if (list->size != 1) {
+    if (list->n != 1) {
         psError(PS_ERR_UNKNOWN, true,"psListAlloc didn't create a list properly.");
         return 2;
@@ -321 +321 @@
         return 40;
     }
-    if ( list->size != 1) {
+    if ( list->n != 1) {
         psError(PS_ERR_UNKNOWN, true,"psListAdd with a NULL data element changed the list size or returned success.");
         return 3;
@@ -341 +341 @@
 
     // verify that the size incremented
-    if (list->size != 2) {
+    if (list->n != 2) {
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the size by one");
         return 4;
@@ -365 +365 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 3) {
+    if (list->n != 3) {
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't increment the size by 1");
         return 6;
@@ -399 +399 @@
     psFree(data);
     // verify that the size wasn't incremented
-    if (list->size != 3) {
+    if (list->n != 3) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to head when where was invalid.");
@@ -420 +420 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 4 || *(psS32*)list->head->next->data != 5) {
+    if (list->n != 4 || *(psS32*)list->head->next->data != 5) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #1.");
@@ -439 +439 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
+    if (list->n != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #4.");
@@ -460 +460 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 6  || *(psS32 *)list->tail->prev->prev->data != 7) {
+    if (list->n != 6  || *(psS32 *)list->tail->prev->prev->data != 7) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"psListAdd didn't insert to position #2.");
@@ -480 +480 @@
         return 29;
     }
-    if(list->size != 7 || *(psS32 *)list->tail->data != 8) {
+    if(list->n != 7 || *(psS32 *)list->tail->data != 8) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN,true,"psListAdd didn't place added item at tail.");
@@ -660 +660 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -682 +682 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -697 +697 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -721 +721 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -736 +736 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -756 +756 @@
     }
 
-    if (list->size != --items) {
+    if (list->n != --items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't decrement size properly to %d.",items);
@@ -771 +771 @@
     }
 
-    if (list->size != items) {
+    if (list->n != items) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"size not %d, as expected.",items);
@@ -791 +791 @@
     }
 
-    if (list->size != 0) {
+    if (list->n != 0) {
         printListInt(list);
         psError(PS_ERR_UNKNOWN, true,"Didn't remove all the elements.");
@@ -835 +835 @@
     arr = psListToArray(list);
 
-    if (arr->n != 15 || list->size != 15) {
+    if (arr->n != 15 || list->n != 15) {
         psError(PS_ERR_UNKNOWN, true,"The created array didn't have the proper size");
         return 1;
@@ -873 +873 @@
     list = psArrayToList(arr);
 
-    if (arr->n != 15 || list->size != 15) {
+    if (arr->n != 15 || list->n != 15) {
         psError(PS_ERR_UNKNOWN, true,"The created array didn't have the proper size");
         return 1;
@@ -1112 +1112 @@
     (not needed, as psListAdd is tested elsewhere, but check anyway.)
     */
-    if (list->size != 15) {
+    if (list->n != 15) {
         psError(PS_ERR_UNKNOWN, true,"List wasn't populated as expected?");
         return 2;