Changeset 3285

Timestamp:

Feb 18, 2005, 11:37:15 AM (21 years ago)

Author:

evanalst

Message:

Update unit test format.

File:

• trunk/psLib/test/collections/tst_psBitSet.c (modified) (4 diffs)

trunk/psLib/test/collections/tst_psBitSet.c

@@ -17 +17 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-02-18 21:37:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
     fprintf(stderr,"Creating psBitSet with 24 bits...\n");
     psBitSet* bs = psBitSetAlloc(24);
-
     if (bs == NULL) {
-        psAbort(__func__,"Failed to create a psBitSet");
-    }
-
+        psError(PS_ERR_UNKNOWN,true,"Failed to create a psBitSet");
+        return 1;
+    }
     if (bs->n != 3) {
-        psAbort(__func__,"Number of bytes for psBitSet incorrect (%d vs 3)",bs->n);
-    }
-
+        psError(PS_ERR_UNKNOWN,true,"Number of bytes for psBitSet incorrect (%d vs 3)",
+                bs->n);
+        return 2;
+    }
     if (bs->bits[0] != 0 || bs->bits[1] != 0 || bs->bits[2] != 0) {
-        psAbort(__func__,"psBitSetAlloc didn't clear out the bits by default (%x%x%x).",
+        psError(PS_ERR_UNKNOWN,true,"psBitSetAlloc didn't clean ou the bits by default (%x%x%x).",
                 bs->bits[2],bs->bits[1],bs->bits[0]);
-    }
-
+        return 3;
+    }
     psFree(bs);
 
@@ -83 +83 @@
     fprintf(stderr,"Creating psBitSet with 25 bits...\n");
     bs = psBitSetAlloc(25);
-
     if (bs == NULL) {
-        psAbort("testBitSet01a","Failed to create a psBitSet with 25 bits");
-    }
-
+        psError(PS_ERR_UNKNOWN,true,"Failed to create a psBitSet with 25 bits");
+        return 4;
+    }
     if (bs->n != 4) {
-        psAbort("testBitSet01a","Number of bytes for psBitSet incorrect (%d vs 4)",bs->n);
+        psError(PS_ERR_UNKNOWN,true,"Number of bytes for psBitSet incorrect (%d vs 4)",bs->n);
+        return 5;
     }
     psFree(bs);
@@ -97 +97 @@
     bs = psBitSetAlloc(-4);
     if (bs != NULL) {
-        psAbort(__func__,"psBitSetAlloc returned something in case of a negative sized psBitSet.");
+        psError(PS_ERR_UNKNOWN,true,"psBitSetAlloc returned something in case of a negative size");
+        return 6;
     }
     err = psErrorLast();
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort(__func__,"psBitSetAlloc didn't generate expected error with size = -4.");
+        psError(PS_ERR_UNKNOWN,true,"psBitSetAlloc didn't generate expected error with size = -4");
+        return 7;
     }
     psFree(err);