APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1325263154 0
# Node ID 49c36ed998b65d72657b50a3573a20bde8e41227
# Parent bd80d9103fc8d867b63865e0979c61a9bb3926fd
No longer use the obsolete function names, hash-table-tests.el
tests/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea(a)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.
diff -r bd80d9103fc8 -r 49c36ed998b6 tests/ChangeLog
--- 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(a)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(a)parhasard.net>
* automated/lisp-reader-tests.el:
diff -r bd80d9103fc8 -r 49c36ed998b6 tests/automated/hash-table-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)))
--
‘Iodine deficiency was endemic in parts of the UK until, through what has been
described as “an unplanned and accidental public health triumph”, iodine was
added to cattle feed to improve milk production in the 1930s.’
(EN Pearce, Lancet, June 2011)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches