--- a/tests/automated/hash-table-tests.el	Thu Jan 14 01:25:16 2010 -0600
+++ b/tests/automated/hash-table-tests.el	Thu Jan 14 02:18:03 2010 -0600
@@ -49,26 +49,26 @@
 		       :rehash-size rehash-size
 		       :rehash-threshold rehash-threshold
 		       :weakness weakness)))
-	      (Assert (equal ht (car (let ((print-readably t))
-				       (read-from-string (prin1-to-string ht))))))
-	      (Assert (eq test (hash-table-test ht)))
+	      (Assert-equal ht (car (let ((print-readably t))
+				       (read-from-string (prin1-to-string ht)))))
+	      (Assert-eq test (hash-table-test ht))
 	      (Assert (<= size (hash-table-size ht)))
-	      (Assert (eql rehash-size (hash-table-rehash-size ht)))
-	      (Assert (eql rehash-threshold (hash-table-rehash-threshold ht)))
-	      (Assert (eq weakness (hash-table-weakness ht))))))))))
+	      (Assert-eql rehash-size (hash-table-rehash-size ht))
+	      (Assert-eql rehash-threshold (hash-table-rehash-threshold ht))
+	      (Assert-eq weakness (hash-table-weakness ht)))))))))
 
 (loop for (fun weakness) in '((make-hashtable nil)
 			      (make-weak-hashtable key-and-value)
 			      (make-key-weak-hashtable key)
 			      (make-value-weak-hashtable value))
-  do (Assert (eq weakness (hash-table-weakness (funcall fun 10)))))
+  do (Assert-eq weakness (hash-table-weakness (funcall fun 10))))
 
 (loop for (type weakness) in '((non-weak nil)
 			       (weak key-and-value)
 			       (key-weak key)
 			       (value-weak value))
-  do (Assert (equal (make-hash-table :type type)
-		    (make-hash-table :weakness weakness))))
+  do (Assert-equal (make-hash-table :type type)
+		    (make-hash-table :weakness weakness)))
 
 (Assert (not (equal (make-hash-table :weakness nil)
 		    (make-hash-table :weakness t))))
@@ -77,86 +77,86 @@
       (size 80))
   (Assert (hashtablep ht))
   (Assert (hash-table-p ht))
-  (Assert (eq 'eq (hash-table-test ht)))
-  (Assert (eq 'non-weak (hash-table-type ht)))
-  (Assert (eq 'non-weak (hashtable-type ht)))
-  (Assert (eq 'nil (hash-table-weakness ht)))
+  (Assert-eq 'eq (hash-table-test ht))
+  (Assert-eq 'non-weak (hash-table-type ht))
+  (Assert-eq 'non-weak (hashtable-type ht))
+  (Assert-eq 'nil (hash-table-weakness ht))
   (dotimes (j size)
     (puthash j (- j) ht)
-    (Assert (eq (gethash j ht) (- j)))
-    (Assert (= (hash-table-count ht) (1+ j)))
-    (Assert (= (hashtable-fullness ht) (hash-table-count ht)))
+    (Assert-eq (gethash j ht) (- j))
+    (Assert= (hash-table-count ht) (1+ j))
+    (Assert= (hashtable-fullness ht) (hash-table-count ht))
     (puthash j j ht)
-    (Assert (eq (gethash j ht 'foo) j))
-    (Assert (= (hash-table-count ht) (1+ j)))
+    (Assert-eq (gethash j ht 'foo) j)
+    (Assert= (hash-table-count ht) (1+ j))
     (setf (gethash j ht) (- j))
-    (Assert (eq (gethash j ht) (- j)))
-    (Assert (= (hash-table-count ht) (1+ j))))
+    (Assert-eq (gethash j ht) (- j))
+    (Assert= (hash-table-count ht) (1+ j)))
 
   (clrhash ht)
-  (Assert (= 0 (hash-table-count ht)))
+  (Assert= 0 (hash-table-count ht))
 
   (dotimes (j size)
     (puthash j (- j) ht)
-    (Assert (eq (gethash j ht) (- j)))
-    (Assert (= (hash-table-count ht) (1+ j))))
+    (Assert-eq (gethash j ht) (- j))
+    (Assert= (hash-table-count ht) (1+ j)))
 
   (let ((k-sum 0) (v-sum 0))
     (maphash #'(lambda (k v) (incf k-sum k) (incf v-sum v)) ht)
-    (Assert (= k-sum (/ (* size (- size 1)) 2)))
-    (Assert (= v-sum (- k-sum))))
+    (Assert= k-sum (/ (* size (- size 1)) 2))
+    (Assert= v-sum (- k-sum)))
 
   (let ((count size))
     (dotimes (j size)
       (remhash j ht)
-      (Assert (eq (gethash j ht) nil))
-      (Assert (eq (gethash j ht 'foo) 'foo))
-      (Assert (= (hash-table-count ht) (decf count))))))
+      (Assert-eq (gethash j ht) nil)
+      (Assert-eq (gethash j ht 'foo) 'foo)
+      (Assert= (hash-table-count ht) (decf count)))))
 
 (let ((ht (make-hash-table :size 30 :rehash-threshold .25 :test 'equal))
       (size 70))
   (Assert (hashtablep ht))
   (Assert (hash-table-p ht))
   (Assert (>= (hash-table-size ht) (/ 30 .25)))
-  (Assert (eql .25 (hash-table-rehash-threshold ht)))
-  (Assert (eq 'equal (hash-table-test ht)))
-  (Assert (eq (hash-table-test ht) (hashtable-test-function ht)))
-  (Assert (eq 'non-weak (hash-table-type ht)))
+  (Assert-eql .25 (hash-table-rehash-threshold ht))
+  (Assert-eq 'equal (hash-table-test ht))
+  (Assert-eq (hash-table-test ht) (hashtable-test-function ht))
+  (Assert-eq 'non-weak (hash-table-type ht))
   (dotimes (j size)
     (puthash (int-to-string j) (- j) ht)
-    (Assert (eq (gethash (int-to-string j) ht) (- j)))
-    (Assert (= (hash-table-count ht) (1+ j)))
+    (Assert-eq (gethash (int-to-string j) ht) (- j))
+    (Assert= (hash-table-count ht) (1+ j))
     (puthash (int-to-string j) j ht)
-    (Assert (eq (gethash (int-to-string j) ht 'foo) j))
-    (Assert (= (hash-table-count ht) (1+ j))))
+    (Assert-eq (gethash (int-to-string j) ht 'foo) j)
+    (Assert= (hash-table-count ht) (1+ j)))
 
   (clrhash ht)
-  (Assert (= 0 (hash-table-count ht)))
-  (Assert (equal ht (copy-hash-table ht)))
+  (Assert= 0 (hash-table-count ht))
+  (Assert-equal ht (copy-hash-table ht))
 
   (dotimes (j size)
     (setf (gethash (int-to-string j) ht) (- j))
-    (Assert (eq (gethash (int-to-string j) ht) (- j)))
-    (Assert (= (hash-table-count ht) (1+ j))))
+    (Assert-eq (gethash (int-to-string j) ht) (- j))
+    (Assert= (hash-table-count ht) (1+ j)))
 
   (let ((count size))
     (dotimes (j size)
       (remhash (int-to-string j) ht)
-      (Assert (eq (gethash (int-to-string j) ht) nil))
-      (Assert (eq (gethash (int-to-string j) ht 'foo) 'foo))
-      (Assert (= (hash-table-count ht) (decf count))))))
+      (Assert-eq (gethash (int-to-string j) ht) nil)
+      (Assert-eq (gethash (int-to-string j) ht 'foo) 'foo)
+      (Assert= (hash-table-count ht) (decf count)))))
 
 (let ((iterations 5) (one 1.0) (two 2.0))
   (flet ((check-copy
 	  (ht)
 	  (let ((copy-of-ht (copy-hash-table ht)))
-	    (Assert (equal ht copy-of-ht))
+	    (Assert-equal ht copy-of-ht)
 	    (Assert (not (eq ht copy-of-ht)))
-	    (Assert (eq  (hash-table-count ht) (hash-table-count copy-of-ht)))
-	    (Assert (eq  (hash-table-type  ht) (hash-table-type  copy-of-ht)))
-	    (Assert (eq  (hash-table-size  ht) (hash-table-size  copy-of-ht)))
-	    (Assert (eql (hash-table-rehash-size ht) (hash-table-rehash-size copy-of-ht)))
-	    (Assert (eql (hash-table-rehash-threshold ht) (hash-table-rehash-threshold copy-of-ht))))))
+	    (Assert-eq  (hash-table-count ht) (hash-table-count copy-of-ht))
+	    (Assert-eq  (hash-table-type  ht) (hash-table-type  copy-of-ht))
+	    (Assert-eq  (hash-table-size  ht) (hash-table-size  copy-of-ht))
+	    (Assert-eql (hash-table-rehash-size ht) (hash-table-rehash-size copy-of-ht))
+	    (Assert-eql (hash-table-rehash-threshold ht) (hash-table-rehash-threshold copy-of-ht)))))
 
   (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'eq)))
     (dotimes (j iterations)
@@ -164,11 +164,11 @@
       (puthash (+ two 0.0) t ht)
       (puthash (cons 1 2) t ht)
       (puthash (cons 3 4) t ht))
-    (Assert (eq (hashtable-test-function ht) 'eq))
-    (Assert (eq (hash-table-test ht) 'eq))
-    (Assert (= (* iterations 4) (hash-table-count ht)))
-    (Assert (eq nil (gethash 1.0 ht)))
-    (Assert (eq nil (gethash '(1 . 2) ht)))
+    (Assert-eq (hashtable-test-function ht) 'eq)
+    (Assert-eq (hash-table-test ht) 'eq)
+    (Assert= (* iterations 4) (hash-table-count ht))
+    (Assert-eq nil (gethash 1.0 ht))
+    (Assert-eq nil (gethash '(1 . 2) ht))
     (check-copy ht)
     )
 
@@ -178,11 +178,11 @@
       (puthash (+ two 0.0) t ht)
       (puthash (cons 1 2) t ht)
       (puthash (cons 3 4) t ht))
-    (Assert (eq (hashtable-test-function ht) 'eql))
-    (Assert (eq (hash-table-test ht) 'eql))
-    (Assert (= (+ 2 (* 2 iterations)) (hash-table-count ht)))
-    (Assert (eq t (gethash 1.0 ht)))
-    (Assert (eq nil (gethash '(1 . 2) ht)))
+    (Assert-eq (hashtable-test-function ht) 'eql)
+    (Assert-eq (hash-table-test ht) 'eql)
+    (Assert= (+ 2 (* 2 iterations)) (hash-table-count ht))
+    (Assert-eq t (gethash 1.0 ht))
+    (Assert-eq nil (gethash '(1 . 2) ht))
     (check-copy ht)
     )
 
@@ -192,11 +192,11 @@
       (puthash (+ two 0.0) t ht)
       (puthash (cons 1 2) t ht)
       (puthash (cons 3 4) t ht))
-    (Assert (eq (hashtable-test-function ht) 'equal))
-    (Assert (eq (hash-table-test ht) 'equal))
-    (Assert (= 4 (hash-table-count ht)))
-    (Assert (eq t (gethash 1.0 ht)))
-    (Assert (eq t (gethash '(1 . 2) ht)))
+    (Assert-eq (hashtable-test-function ht) 'equal)
+    (Assert-eq (hash-table-test ht) 'equal)
+    (Assert= 4 (hash-table-count ht))
+    (Assert-eq t (gethash 1.0 ht))
+    (Assert-eq t (gethash '(1 . 2) ht))
     (check-copy ht)
     )
 
@@ -223,18 +223,18 @@
 		 (when (integerp k) (incf k-sum k))
 		 (when (integerp v) (incf v-sum v)))
 	     ht)
-    (Assert (eq 38 k-sum))
-    (Assert (eq 25 v-sum)))
-  (Assert (eq 6 (hash-table-count ht)))
+    (Assert-eq 38 k-sum)
+    (Assert-eq 25 v-sum))
+  (Assert-eq 6 (hash-table-count ht))
   (garbage-collect)
-  (Assert (eq expected-count (hash-table-count ht)))
+  (Assert-eq expected-count (hash-table-count ht))
   (let ((k-sum 0) (v-sum 0))
     (maphash #'(lambda (k v)
 		 (when (integerp k) (incf k-sum k))
 		 (when (integerp v) (incf v-sum v)))
 	     ht)
-    (Assert (eq expected-k-sum k-sum))
-    (Assert (eq expected-v-sum v-sum)))))
+    (Assert-eq expected-k-sum k-sum)
+    (Assert-eq expected-v-sum v-sum))))
 
 ;;; Test the ability to puthash and remhash the current elt of a maphash
 (let ((ht (make-hash-table :test 'eql)))
@@ -244,41 +244,41 @@
 	   ht)
   (let ((k-sum 0) (v-sum 0))
     (maphash #'(lambda (k v) (incf k-sum k) (incf v-sum v)) ht)
-    (Assert (= (* 50 49) k-sum))
-    (Assert (= v-sum k-sum))))
+    (Assert= (* 50 49) k-sum)
+    (Assert= v-sum k-sum)))
 
 ;;; Test reading and printing of hash-table objects
 (let ((h1 #s(hashtable  weakness t rehash-size 3.0 rehash-threshold .2 test eq data (1 2 3 4)))
       (h2 #s(hash-table weakness t rehash-size 3.0 rehash-threshold .2 test eq data (1 2 3 4)))
       (h3 (make-hash-table :weakness t :rehash-size 3.0 :rehash-threshold .2 :test 'eq)))
-  (Assert (equal h1 h2))
+  (Assert-equal h1 h2)
   (Assert (not (equal h1 h3)))
   (puthash 1 2 h3)
   (puthash 3 4 h3)
-  (Assert (equal h1 h3)))
+  (Assert-equal h1 h3))
 
 ;;; Testing equality of hash tables
-(Assert (equal (make-hash-table :test 'eql :size 300 :rehash-threshold .9 :rehash-size 3.0)
-	       (make-hash-table :test 'eql)))
+(Assert-equal (make-hash-table :test 'eql :size 300 :rehash-threshold .9 :rehash-size 3.0)
+	       (make-hash-table :test 'eql))
 (Assert (not (equal (make-hash-table :test 'eq)
 		    (make-hash-table :test 'equal))))
 (let ((h1 (make-hash-table))
       (h2 (make-hash-table)))
-  (Assert (equal h1 h2))
+  (Assert-equal h1 h2)
   (Assert (not (eq h1 h2)))
   (puthash 1 2 h1)
   (Assert (not (equal h1 h2)))
   (puthash 1 2 h2)
-  (Assert (equal h1 h2))
+  (Assert-equal h1 h2)
   (puthash 1 3 h2)
   (Assert (not (equal h1 h2)))
   (clrhash h1)
   (Assert (not (equal h1 h2)))
   (clrhash h2)
-  (Assert (equal h1 h2))
+  (Assert-equal h1 h2)
   )
 
 ;;; Test sxhash
-(Assert (= (sxhash "foo") (sxhash "foo")))
-(Assert (= (sxhash '(1 2 3)) (sxhash '(1 2 3))))
+(Assert= (sxhash "foo") (sxhash "foo"))
+(Assert= (sxhash '(1 2 3)) (sxhash '(1 2 3)))
 (Assert (/= (sxhash '(1 2 3)) (sxhash '(3 2 1))))