--- a/tests/ChangeLog	Fri Dec 30 16:05:31 2011 +0000
+++ b/tests/ChangeLog	Fri Dec 30 16:39:14 2011 +0000
@@ -1,3 +1,9 @@
+2011-12-30  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* automated/hash-table-tests.el:
+	No longer use the obsolete function names in the tests, now
+	they've been removed from cl.el.
+
 2011-12-03  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/lisp-reader-tests.el:

--- a/tests/automated/hash-table-tests.el	Fri Dec 30 16:05:31 2011 +0000
+++ b/tests/automated/hash-table-tests.el	Fri Dec 30 16:39:14 2011 +0000
@@ -55,12 +55,6 @@
 	      (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)))))
-
 (loop for (type weakness) in '((non-weak nil)
 			       (weak key-and-value)
 			       (key-weak key)
@@ -73,17 +67,14 @@
 
 (let ((ht (make-hash-table :size 20 :rehash-threshold .75 :test 'eq))
       (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)))
   (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)))
     (puthash j j ht)
     (Assert (eq (gethash j ht 'foo) j))
     (Assert (= (hash-table-count ht) (1+ j)))
@@ -113,12 +104,10 @@
 
 (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)))
   (dotimes (j size)
     (puthash (int-to-string j) (- j) ht)
@@ -167,7 +156,6 @@
       (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)))
@@ -181,7 +169,6 @@
       (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)))
@@ -195,7 +182,6 @@
       (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)))
@@ -214,7 +200,6 @@
       (puthash (cons 1 2) t ht)
       (puthash (cons 3.0 4.0) (gensym) ht)
       (puthash (cons 3 4) t ht))
-    (Assert (eq (hashtable-test-function ht) 'equalp))
     (Assert (eq (hash-table-test ht) 'equalp))
     (Assert (= 4 (hash-table-count ht)))
     (Assert (eq t (gethash 1.0 ht)))