diff tests/automated/weak-tests.el @ 5136:0f66906b6e37

Undo Assert-equal, Assert=, etc.; make `Assert' handle this automatically -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-12 Ben Wing <ben@xemacs.org> * test-harness.el (test-harness-from-buffer): Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...). Get rid of `Assert-equalp' and friends, `Assert-test', and `Assert-test-not'. Instead, make `Assert' smart enough to do the equivalent functionality when an expression like (Assert (equalp ...)) is seen. tests/ChangeLog addition: 2010-03-12 Ben Wing <ben@xemacs.org> * automated/base64-tests.el (bt-base64-encode-string): * automated/base64-tests.el (bt-base64-decode-string): * automated/base64-tests.el (for): * automated/byte-compiler-tests.el: * automated/byte-compiler-tests.el (before-and-after-compile-equal): * automated/case-tests.el (downcase-string): * automated/case-tests.el (uni-mappings): * automated/ccl-tests.el (ccl-test-normal-expr): * automated/ccl-tests.el (ccl-test-map-instructions): * automated/ccl-tests.el (ccl-test-suites): * automated/database-tests.el (delete-database-files): * automated/extent-tests.el (let): * automated/extent-tests.el (insert): * automated/extent-tests.el (props): * automated/file-tests.el: * automated/file-tests.el (for): * automated/hash-table-tests.el (test): * automated/hash-table-tests.el (for): * automated/hash-table-tests.el (ht): * automated/hash-table-tests.el (iterations): * automated/hash-table-tests.el (h1): * automated/hash-table-tests.el (equal): * automated/hash-table-tests.el (=): * automated/lisp-tests.el: * automated/lisp-tests.el (eq): * automated/lisp-tests.el (test-setq): * automated/lisp-tests.el (my-vector): * automated/lisp-tests.el (x): * automated/lisp-tests.el (equal): * automated/lisp-tests.el (y): * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (=): * automated/lisp-tests.el (six): * automated/lisp-tests.el (three): * automated/lisp-tests.el (one): * automated/lisp-tests.el (two): * automated/lisp-tests.el (five): * automated/lisp-tests.el (test1): * automated/lisp-tests.el (division-test): * automated/lisp-tests.el (for): * automated/lisp-tests.el (check-function-argcounts): * automated/lisp-tests.el (z): * automated/lisp-tests.el (eql): * automated/lisp-tests.el (test-harness-risk-infloops): * automated/lisp-tests.el (erase-buffer): * automated/lisp-tests.el (sym): * automated/lisp-tests.el (new-char): * automated/lisp-tests.el (new-load-file-name): * automated/lisp-tests.el (cl-floor): * automated/lisp-tests.el (foo): * automated/md5-tests.el (lambda): * automated/md5-tests.el (large-string): * automated/md5-tests.el (mapcar): * automated/md5-tests.el (insert): * automated/mule-tests.el: * automated/mule-tests.el (test-chars): * automated/mule-tests.el (existing-file-name): * automated/mule-tests.el (featurep): * automated/query-coding-tests.el (featurep): * automated/regexp-tests.el: * automated/regexp-tests.el (insert): * automated/regexp-tests.el (Assert): * automated/regexp-tests.el (=): * automated/regexp-tests.el (featurep): * automated/regexp-tests.el (text): * automated/regexp-tests.el (text1): * automated/regexp-tests.el ("aáa"): * automated/regexp-tests.el (eql): * automated/search-tests.el (insert): * automated/search-tests.el (featurep): * automated/search-tests.el (let): * automated/search-tests.el (boundp): * automated/symbol-tests.el: * automated/symbol-tests.el (name): * automated/symbol-tests.el (check-weak-list-unique): * automated/symbol-tests.el (string): * automated/symbol-tests.el (list): * automated/symbol-tests.el (foo): * automated/symbol-tests.el (eq): * automated/symbol-tests.el (fresh-keyword-name): * automated/symbol-tests.el (print-gensym): * automated/symbol-tests.el (mysym): * automated/syntax-tests.el (test-forward-word): * automated/syntax-tests.el (test-backward-word): * automated/syntax-tests.el (test-syntax-table): * automated/syntax-tests.el (with-syntax-table): * automated/syntax-tests.el (Skip-Test-Unless): * automated/syntax-tests.el (with): * automated/tag-tests.el (testfile): * automated/weak-tests.el (w): * automated/weak-tests.el (p): * automated/weak-tests.el (a): Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...). Get rid of `Assert-equalp' and friends, `Assert-test', and `Assert-test-not'. Instead, make `Assert' smart enough to do the equivalent functionality when an expression like (Assert (equalp ...)) is seen.
author Ben Wing <ben@xemacs.org>
date Fri, 12 Mar 2010 18:27:51 -0600
parents 189fb67ca31a
children 308d34e9f07d
line wrap: on
line diff
--- a/tests/automated/weak-tests.el	Sun Mar 07 06:43:19 2010 -0600
+++ b/tests/automated/weak-tests.el	Fri Mar 12 18:27:51 2010 -0600
@@ -40,7 +40,7 @@
 
 ;; tests for weak-boxes
 (let ((w (make-weak-box (cons 2 3))))
-  (Assert-equal (cons 2 3) (weak-box-ref w))
+  (Assert (equal (cons 2 3) (weak-box-ref w)))
   (garbage-collect)
   (Assert (not (weak-box-ref w))))
 
@@ -53,7 +53,7 @@
 			     #'(lambda (value)
                                  (setq finalized-p t))))
        (eph2 (make-ephemeron p p)))
-  (Assert-eq p (ephemeron-ref (make-ephemeron (cons 1 2) p)))
+  (Assert (eq p (ephemeron-ref (make-ephemeron (cons 1 2) p))))
   (Assert (ephemeron-p (make-ephemeron (cons 1 2) p)))
 
   (garbage-collect)
@@ -64,7 +64,7 @@
 
   (garbage-collect)
   
-  (Assert-eq p (ephemeron-ref eph2)))
+  (Assert (eq p (ephemeron-ref eph2))))
 
 (garbage-collect)
 
@@ -81,20 +81,20 @@
   (set-weak-list-list weaklist3 (list a (cons 1 2) b))
   (set-weak-list-list weaklist4 (list a b (cons 1 2)))
   (Assert (weak-list-p weaklist1))
-  (Assert-eq (weak-list-type weaklist1) 'simple)
+  (Assert (eq (weak-list-type weaklist1) 'simple))
   (Assert (weak-list-p weaklist2))
-  (Assert-eq (weak-list-type weaklist2) 'simple)
+  (Assert (eq (weak-list-type weaklist2) 'simple))
   (Assert (weak-list-p weaklist3))
-  (Assert-eq (weak-list-type weaklist3) 'simple)
+  (Assert (eq (weak-list-type weaklist3) 'simple))
   (Assert (weak-list-p weaklist4))
-  (Assert-eq (weak-list-type weaklist4) 'simple)
+  (Assert (eq (weak-list-type weaklist4) 'simple))
 
   (garbage-collect)
 
-  (Assert-eq (weak-list-list weaklist1) testlist)
-  (Assert-equal (weak-list-list weaklist2) testlist)
-  (Assert-equal (weak-list-list weaklist3) testlist)
-  (Assert-equal (weak-list-list weaklist4) testlist))
+  (Assert (eq (weak-list-list weaklist1) testlist))
+  (Assert (equal (weak-list-list weaklist2) testlist))
+  (Assert (equal (weak-list-list weaklist3) testlist))
+  (Assert (equal (weak-list-list weaklist4) testlist)))
 
 (garbage-collect)
 
@@ -111,20 +111,20 @@
   (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b))
   (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b))
   (Assert (weak-list-p weaklist1))
-  (Assert-eq (weak-list-type weaklist1) 'assoc)
+  (Assert (eq (weak-list-type weaklist1) 'assoc))
   (Assert (weak-list-p weaklist2))
-  (Assert-eq (weak-list-type weaklist2) 'assoc)
+  (Assert (eq (weak-list-type weaklist2) 'assoc))
   (Assert (weak-list-p weaklist3))
-  (Assert-eq (weak-list-type weaklist3) 'assoc)
+  (Assert (eq (weak-list-type weaklist3) 'assoc))
   (Assert (weak-list-p weaklist4))
-  (Assert-eq (weak-list-type weaklist4) 'assoc)
+  (Assert (eq (weak-list-type weaklist4) 'assoc))
 
   (garbage-collect)
 
-  (Assert-eq (weak-list-list weaklist1) testlist)
-  (Assert-equal (weak-list-list weaklist2) testlist)
-  (Assert-equal (weak-list-list weaklist3) testlist)
-  (Assert-equal (weak-list-list weaklist4) testlist))
+  (Assert (eq (weak-list-list weaklist1) testlist))
+  (Assert (equal (weak-list-list weaklist2) testlist))
+  (Assert (equal (weak-list-list weaklist3) testlist))
+  (Assert (equal (weak-list-list weaklist4) testlist)))
 
 (garbage-collect)
 
@@ -141,20 +141,20 @@
   (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b))
   (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b))
   (Assert (weak-list-p weaklist1))
-  (Assert-eq (weak-list-type weaklist1) 'key-assoc)
+  (Assert (eq (weak-list-type weaklist1) 'key-assoc))
   (Assert (weak-list-p weaklist2))
-  (Assert-eq (weak-list-type weaklist2) 'key-assoc)
+  (Assert (eq (weak-list-type weaklist2) 'key-assoc))
   (Assert (weak-list-p weaklist3))
-  (Assert-eq (weak-list-type weaklist3) 'key-assoc)
+  (Assert (eq (weak-list-type weaklist3) 'key-assoc))
   (Assert (weak-list-p weaklist4))
-  (Assert-eq (weak-list-type weaklist4) 'key-assoc)
+  (Assert (eq (weak-list-type weaklist4) 'key-assoc))
 
   (garbage-collect)
 
-  (Assert-eq (weak-list-list weaklist1) testlist)
-  (Assert-equal (weak-list-list weaklist2) testlist)
-  (Assert-equal (weak-list-list weaklist3) (list b (cons a (cons 1 2)) b))
-  (Assert-equal (weak-list-list weaklist4) testlist))
+  (Assert (eq (weak-list-list weaklist1) testlist))
+  (Assert (equal (weak-list-list weaklist2) testlist))
+  (Assert (equal (weak-list-list weaklist3) (list b (cons a (cons 1 2)) b)))
+  (Assert (equal (weak-list-list weaklist4) testlist)))
 
 (garbage-collect)
 
@@ -171,20 +171,20 @@
   (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b))
   (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b))
   (Assert (weak-list-p weaklist1))
-  (Assert-eq (weak-list-type weaklist1) 'value-assoc)
+  (Assert (eq (weak-list-type weaklist1) 'value-assoc))
   (Assert (weak-list-p weaklist2))
-  (Assert-eq (weak-list-type weaklist2) 'value-assoc)
+  (Assert (eq (weak-list-type weaklist2) 'value-assoc))
   (Assert (weak-list-p weaklist3))
-  (Assert-eq (weak-list-type weaklist3) 'value-assoc)
+  (Assert (eq (weak-list-type weaklist3) 'value-assoc))
   (Assert (weak-list-p weaklist4))
-  (Assert-eq (weak-list-type weaklist4) 'value-assoc)
+  (Assert (eq (weak-list-type weaklist4) 'value-assoc))
 
   (garbage-collect)
 
-  (Assert-eq (weak-list-list weaklist1) testlist)
-  (Assert-equal (weak-list-list weaklist2) (list b (cons (cons 1 2) a) b))
-  (Assert-equal (weak-list-list weaklist3) testlist)
-  (Assert-equal (weak-list-list weaklist4) testlist))
+  (Assert (eq (weak-list-list weaklist1) testlist))
+  (Assert (equal (weak-list-list weaklist2) (list b (cons (cons 1 2) a) b)))
+  (Assert (equal (weak-list-list weaklist3) testlist))
+  (Assert (equal (weak-list-list weaklist4) testlist)))
 
 (garbage-collect)
 
@@ -201,20 +201,20 @@
   (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b))
   (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b))
   (Assert (weak-list-p weaklist1))
-  (Assert-eq (weak-list-type weaklist1) 'full-assoc)
+  (Assert (eq (weak-list-type weaklist1) 'full-assoc))
   (Assert (weak-list-p weaklist2))
-  (Assert-eq (weak-list-type weaklist2) 'full-assoc)
+  (Assert (eq (weak-list-type weaklist2) 'full-assoc))
   (Assert (weak-list-p weaklist3))
-  (Assert-eq (weak-list-type weaklist3) 'full-assoc)
+  (Assert (eq (weak-list-type weaklist3) 'full-assoc))
   (Assert (weak-list-p weaklist4))
-  (Assert-eq (weak-list-type weaklist4) 'full-assoc)
+  (Assert (eq (weak-list-type weaklist4) 'full-assoc))
 
   (garbage-collect)
 
-  (Assert-eq (weak-list-list weaklist1) testlist)
-  (Assert-equal (weak-list-list weaklist2) (list b (cons (cons 1 2) a) b))
-  (Assert-equal (weak-list-list weaklist3) (list b (cons a (cons 1 2)) b))
-  (Assert-equal (weak-list-list weaklist4) testlist))
+  (Assert (eq (weak-list-list weaklist1) testlist))
+  (Assert (equal (weak-list-list weaklist2) (list b (cons (cons 1 2) a) b)))
+  (Assert (equal (weak-list-list weaklist3) (list b (cons a (cons 1 2)) b)))
+  (Assert (equal (weak-list-list weaklist4) testlist)))
 
 (garbage-collect)