Changeset 1201

Timestamp:

Jul 8, 2004, 12:04:12 PM (22 years ago)

Author:

desonia

Message:

changed psHashInsert to psHashAdd.

Location:

trunk/psLib/test/sysUtils

Files:

• builddir/atst_psAbort_01.d (modified) (1 diff)
• builddir/atst_psAbort_02.d (modified) (1 diff)
• builddir/atst_psAbort_03.d (modified) (1 diff)
• builddir/tst_psError.d (modified) (1 diff)
• builddir/tst_psHash00.d (modified) (1 diff)
• builddir/tst_psHash01.d (modified) (1 diff)
• builddir/tst_psHash02.d (modified) (1 diff)
• builddir/tst_psHash03.d (modified) (1 diff)
• builddir/tst_psHash04.d (modified) (1 diff)
• builddir/tst_psLogMsg01.d (modified) (1 diff)
• builddir/tst_psStringCopy.d (modified) (1 diff)
• tst_psHash01.c (modified) (1 diff)
• tst_psHash02.c (modified) (4 diffs)
• tst_psHash03.c (modified) (1 diff)
• tst_psHash04.c (modified) (1 diff)
• verified/tst_psHash02.stdout (deleted)

trunk/psLib/test/sysUtils/builddir/atst_psAbort_01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/atst_psAbort_02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/atst_psAbort_03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psError.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash04.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psStringCopy.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/tst_psHash01.c

@@ -46 +46 @@
     myHashTable = psHashAlloc(NUM_HASH_TABLE_BUCKETS);
     id = IdAlloc("IDA");
-    psHashInsert(myHashTable, "ENTRY00", id);
+    psHashAdd(myHashTable, "ENTRY00", id);
     psFree(id);
     id = IdAlloc("IDB");
-    psHashInsert(myHashTable, "ENTRY01", id);
+    psHashAdd(myHashTable, "ENTRY01", id);
     psFree(id);
     id = IdAlloc("IDC");
-    psHashInsert(myHashTable, "ENTRY02", id);
+    psHashAdd(myHashTable, "ENTRY02", id);
     psFree(id);
     id = IdAlloc("IDD");
-    psHashInsert(myHashTable, "ENTRY03", id);
+    psHashAdd(myHashTable, "ENTRY03", id);
     psFree(id);
     psFree(myHashTable);

trunk/psLib/test/sysUtils/tst_psHash02.c

@@ -49 +49 @@
     printPositiveTestHeader(stdout,
                             "psHash functions",
-                            "psHashInsert()");
+                            "psHashAdd()");
 
     myHashTable = psHashAlloc(NUM_HASH_TABLE_BUCKETS);
@@ -55 +55 @@
     while (myKeys[i] != NULL) {
         id = IdAlloc(myData[i]);
-        psHashInsert(myHashTable, myKeys[i], id);
+        psHashAdd(myHashTable, myKeys[i], id);
         psFree(id);
         i++;
@@ -75 +75 @@
     }
 
-    printFooter(stdout,
-                "psHash functions",
-                "psHashInsert()",
-                testStatus);
-
     //    psHashFree(myHashTable, NULL);
     psFree(myHashTable);
 
-    memLeaks = psMemCheckLeaks(currentId,NULL,NULL);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
@@ -89 +84 @@
     psMemCheckCorruption(1);
 
+    printFooter(stdout,
+                "psHash functions",
+                "psHashAdd()",
+                testStatus);
+
     return (!testStatus);
 }

trunk/psLib/test/sysUtils/tst_psHash03.c

@@ -83 +83 @@
     i = 0;
     while (myKeys[i] != NULL) {
-        psHashInsert(myHashTable, myKeys[i], IdAlloc(myData[i]));
+        psHashAdd(myHashTable, myKeys[i], IdAlloc(myData[i]));
         i++;
     }

trunk/psLib/test/sysUtils/tst_psHash04.c

@@ -53 +53 @@
     while (myKeys[i] != NULL) {
         id = IdAlloc(myData[i]);
-        psHashInsert(myHashTable, myKeys[i], id);
+        psHashAdd(myHashTable, myKeys[i], id);
         psFree(id);
         i++;