Mercurial > hg > xemacs-beta

diff tests/automated/weak-tests.el @ 4855:189fb67ca31a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create Assert-eq, Assert-equal, etc. These are equivalent to (Assert (eq ...)) but display both the actual value and the expected value of the comparison. Use them throughout the test suite.
author Ben Wing <ben@xemacs.org>
date Thu, 14 Jan 2010 02:18:03 -0600
parents 7b628daa39d4
children 0f66906b6e37
line wrap: on
line diff
--- a/tests/automated/weak-tests.el	Thu Jan 14 01:25:16 2010 -0600
+++ b/tests/automated/weak-tests.el	Thu Jan 14 02:18:03 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)