xemacs-beta: tests/automated/lisp-tests.el comparison

comparison tests/automated/lisp-tests.el @ 4855:189fb67ca31a

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	084056f46755
children	6772ce4d982b

comparison

equal deleted inserted replaced

-:95c4ced5c07c
+:189fb67ca31a
 (Check-Error wrong-number-of-arguments (setq setq-test-foo))
 (Check-Error wrong-number-of-arguments (setq setq-test-foo 1 setq-test-bar))
 (Check-Error wrong-number-of-arguments (setq-default setq-test-foo))
 (Check-Error wrong-number-of-arguments (setq-default setq-test-foo 1 setq-test-bar))
-(Assert (eq (setq)         nil))
+(Assert-eq (setq)         nil)
-(Assert (eq (setq-default) nil))
+(Assert-eq (setq-default) nil)
-(Assert (eq (setq         setq-test-foo 42) 42))
+(Assert-eq (setq         setq-test-foo 42) 42)
-(Assert (eq (setq-default setq-test-foo 42) 42))
+(Assert-eq (setq-default setq-test-foo 42) 42)
-(Assert (eq (setq         setq-test-foo 42 setq-test-bar 99) 99))
+(Assert-eq (setq         setq-test-foo 42 setq-test-bar 99) 99)
-(Assert (eq (setq-default setq-test-foo 42 setq-test-bar 99) 99))
+(Assert-eq (setq-default setq-test-foo 42 setq-test-bar 99) 99)
 (macrolet ((test-setq (expected-result &rest body)
 		      `(progn
 			 (defun test-setq-fun () ,@body)
-			 (Assert (eq ,expected-result (test-setq-fun)))
+			 (Assert-eq ,expected-result (test-setq-fun))
 			 (byte-compile 'test-setq-fun)
-			 (Assert (eq ,expected-result (test-setq-fun))))))
+			 (Assert-eq ,expected-result (test-setq-fun)))))
 (test-setq nil (setq))
 (test-setq nil (setq-default))
 (test-setq 42  (setq         test-setq-var 42))
 (test-setq 42  (setq-default test-setq-var 42))
 (test-setq 42  (setq         test-setq-bar 99 test-setq-var 42))
 (my-bit-vector (bit-vector 1 0 1 0))
 (my-string "1234")
 (my-list '(1 2 3 4)))
 ;;(Assert (fooooo)) ;; Generate Other failure
-;;(Assert (eq 1 2)) ;; Generate Assertion failure
+;;(Assert-eq 1 2) ;; Generate Assertion failure
 (dolist (sequence (list my-vector my-bit-vector my-string my-list))
 (Assert (sequencep sequence))
-(Assert (eq 4 (length sequence))))
+(Assert-eq 4 (length sequence)))
 (dolist (array (list my-vector my-bit-vector my-string))
 (Assert (arrayp array)))
-(Assert (eq (elt my-vector 0) 1))
+(Assert-eq (elt my-vector 0) 1)
-(Assert (eq (elt my-bit-vector 0) 1))
+(Assert-eq (elt my-bit-vector 0) 1)
-(Assert (eq (elt my-string 0) ?1))
+(Assert-eq (elt my-string 0) ?1)
-(Assert (eq (elt my-list 0) 1))
+(Assert-eq (elt my-list 0) 1)
 (fillarray my-vector 5)
 (fillarray my-bit-vector 1)
 (fillarray my-string ?5)
 (dolist (array (list my-vector my-bit-vector))
-(Assert (eq 4 (length array))))
+(Assert-eq 4 (length array)))
-(Assert (eq (elt my-vector 0) 5))
+(Assert-eq (elt my-vector 0) 5)
-(Assert (eq (elt my-bit-vector 0) 1))
+(Assert-eq (elt my-bit-vector 0) 1)
-(Assert (eq (elt my-string 0) ?5))
+(Assert-eq (elt my-string 0) ?5)
-(Assert (eq (elt my-vector 3) 5))
+(Assert-eq (elt my-vector 3) 5)
-(Assert (eq (elt my-bit-vector 3) 1))
+(Assert-eq (elt my-bit-vector 3) 1)
-(Assert (eq (elt my-string 3) ?5))
+(Assert-eq (elt my-string 3) ?5)
 (fillarray my-bit-vector 0)
-(Assert (eq 4 (length my-bit-vector)))
+(Assert-eq 4 (length my-bit-vector))
-(Assert (eq (elt my-bit-vector 2) 0))
+(Assert-eq (elt my-bit-vector 2) 0)
 )
 (defun make-circular-list (length)
 "Create evil emacs-crashing circular list of length LENGTH"
 (let ((circular-list
 (dolist (length '(1 2 3 4 1000 2000))
 (Check-Error circular-list (nconc (make-circular-list length) 'foo))
 (Check-Error circular-list (nconc '(1 . 2) (make-circular-list length) 'foo))
 (Check-Error circular-list (nconc '(1 . 2) '(3 . 4) (make-circular-list length) 'foo)))
-(Assert (eq (nconc) nil))
+(Assert-eq (nconc) nil)
-(Assert (eq (nconc nil) nil))
+(Assert-eq (nconc nil) nil)
-(Assert (eq (nconc nil nil) nil))
+(Assert-eq (nconc nil nil) nil)
-(Assert (eq (nconc nil nil nil) nil))
+(Assert-eq (nconc nil nil nil) nil)
-(let ((x (make-list-012))) (Assert (eq (nconc nil x) x)))
+(let ((x (make-list-012))) (Assert-eq (nconc nil x) x))
-(let ((x (make-list-012))) (Assert (eq (nconc x nil) x)))
+(let ((x (make-list-012))) (Assert-eq (nconc x nil) x))
-(let ((x (make-list-012))) (Assert (eq (nconc nil x nil) x)))
+(let ((x (make-list-012))) (Assert-eq (nconc nil x nil) x))
-(let ((x (make-list-012))) (Assert (eq (nconc x) x)))
+(let ((x (make-list-012))) (Assert-eq (nconc x) x))
-(let ((x (make-list-012))) (Assert (eq (nconc x (make-circular-list 3)) x)))
+(let ((x (make-list-012))) (Assert-eq (nconc x (make-circular-list 3)) x))
-(Assert (equal (nconc '(1 . 2) '(3 . 4) '(5 . 6)) '(1 3 5 . 6)))
+(Assert-equal (nconc '(1 . 2) '(3 . 4) '(5 . 6)) '(1 3 5 . 6))
 (let ((y (nconc (make-list-012) nil (list 3 4 5) nil)))
-(Assert (eq (length y) 6))
+(Assert-eq (length y) 6)
-(Assert (eq (nth 3 y) 3)))
+(Assert-eq (nth 3 y) 3))
 ;;-----------------------------------------------------
 ;; Test `last'
 ;;-----------------------------------------------------
 (Check-Error wrong-type-argument (last 'foo))
 (Check-Error wrong-number-of-arguments (last))
 (Check-Error wrong-number-of-arguments (last '(1 2) 1 1))
 (Check-Error circular-list (last (make-circular-list 1)))
 (Check-Error circular-list (last (make-circular-list 2000)))
 (let ((x (list 0 1 2 3)))
-(Assert (eq (last nil) nil))
+(Assert-eq (last nil) nil)
-(Assert (eq (last x 0) nil))
+(Assert-eq (last x 0) nil)
-(Assert (eq (last x  ) (cdddr x)))
+(Assert-eq (last x  ) (cdddr x))
-(Assert (eq (last x 1) (cdddr x)))
+(Assert-eq (last x 1) (cdddr x))
-(Assert (eq (last x 2) (cddr x)))
+(Assert-eq (last x 2) (cddr x))
-(Assert (eq (last x 3) (cdr x)))
+(Assert-eq (last x 3) (cdr x))
-(Assert (eq (last x 4) x))
+(Assert-eq (last x 4) x)
-(Assert (eq (last x 9) x))
+(Assert-eq (last x 9) x)
-(Assert (eq (last '(1 . 2) 0) 2))
+(Assert-eq (last '(1 . 2) 0) 2)
 )
 ;;-----------------------------------------------------
 ;; Test `butlast' and `nbutlast'
 ;;-----------------------------------------------------
 (Check-Error circular-list (nbutlast (make-circular-list 2000)))
 (let* ((x (list 0 1 2 3))
 (y (butlast x))
 (z (nbutlast x)))
-(Assert (eq z x))
+(Assert-eq z x)
 (Assert (not (eq y x)))
-(Assert (equal y '(0 1 2)))
+(Assert-equal y '(0 1 2))
-(Assert (equal z y)))
+(Assert-equal z y))
 (let* ((x (list 0 1 2 3 4))
 (y (butlast x 2))
 (z (nbutlast x 2)))
-(Assert (eq z x))
+(Assert-eq z x)
 (Assert (not (eq y x)))
-(Assert (equal y '(0 1 2)))
+(Assert-equal y '(0 1 2))
-(Assert (equal z y)))
+(Assert-equal z y))
 (let* ((x (list 0 1 2 3))
 (y (butlast x 0))
 (z (nbutlast x 0)))
-(Assert (eq z x))
+(Assert-eq z x)
 (Assert (not (eq y x)))
-(Assert (equal y '(0 1 2 3)))
+(Assert-equal y '(0 1 2 3))
-(Assert (equal z y)))
+(Assert-equal z y))
-(Assert (eq (butlast  '(x)) nil))
+(Assert-eq (butlast  '(x)) nil)
-(Assert (eq (nbutlast '(x)) nil))
+(Assert-eq (nbutlast '(x)) nil)
-(Assert (eq (butlast  '()) nil))
+(Assert-eq (butlast  '()) nil)
-(Assert (eq (nbutlast '()) nil))
+(Assert-eq (nbutlast '()) nil)
 ;;-----------------------------------------------------
 ;; Test `copy-list'
 ;;-----------------------------------------------------
 (Check-Error wrong-type-argument (copy-list 'foo))
 (Check-Error wrong-number-of-arguments (copy-list))
 (Check-Error wrong-number-of-arguments (copy-list '(1 2) 1))
 (Check-Error circular-list (copy-list (make-circular-list 1)))
 (Check-Error circular-list (copy-list (make-circular-list 2000)))
-(Assert (eq '() (copy-list '())))
+(Assert-eq '() (copy-list '()))
 (dolist (x '((1) (1 2) (1 2 3) (1 2 . 3)))
 (let ((y (copy-list x)))
 (Assert (and (equal x y) (not (eq x y))))))
 ;;-----------------------------------------------------
 ;; Arithmetic operations
 ;;-----------------------------------------------------
 ;; Test `+'
-(Assert (eq (+ 1 1) 2))
+(Assert-eq (+ 1 1) 2)
-(Assert (= (+ 1.0 1.0) 2.0))
+(Assert= (+ 1.0 1.0) 2.0)
-(Assert (= (+ 1.0 3.0 0.0) 4.0))
+(Assert= (+ 1.0 3.0 0.0) 4.0)
-(Assert (= (+ 1 1.0) 2.0))
+(Assert= (+ 1 1.0) 2.0)
-(Assert (= (+ 1.0 1) 2.0))
+(Assert= (+ 1.0 1) 2.0)
-(Assert (= (+ 1.0 1 1) 3.0))
+(Assert= (+ 1.0 1 1) 3.0)
-(Assert (= (+ 1 1 1.0) 3.0))
+(Assert= (+ 1 1 1.0) 3.0)
 (if (featurep 'bignum)
 (progn
 (Assert (bignump (1+ most-positive-fixnum)))
-(Assert (eq most-positive-fixnum (1- (1+ most-positive-fixnum))))
+(Assert-eq most-positive-fixnum (1- (1+ most-positive-fixnum)))
 (Assert (bignump (+ most-positive-fixnum 1)))
-(Assert (eq most-positive-fixnum (- (+ most-positive-fixnum 1) 1)))
+(Assert-eq most-positive-fixnum (- (+ most-positive-fixnum 1) 1))
-(Assert (= (1+ most-positive-fixnum) (- most-negative-fixnum)))
+(Assert= (1+ most-positive-fixnum) (- most-negative-fixnum))
 (Assert (zerop (+ (* 3 most-negative-fixnum) (* 3 most-positive-fixnum)
 			3))))
-(Assert (eq (1+ most-positive-fixnum) most-negative-fixnum))
+(Assert-eq (1+ most-positive-fixnum) most-negative-fixnum)
-(Assert (eq (+ most-positive-fixnum 1) most-negative-fixnum)))
+(Assert-eq (+ most-positive-fixnum 1) most-negative-fixnum))
 (when (featurep 'ratio)
 (let ((threefourths (read "3/4"))
 	(threehalfs (read "3/2"))
 	(bigpos (div (+ most-positive-fixnum 2) (1+ most-positive-fixnum)))
 	(bigneg (div (+ most-positive-fixnum 2) most-negative-fixnum))
 	(negone (div (1+ most-positive-fixnum) most-negative-fixnum)))
-(Assert (= negone -1))
+(Assert= negone -1)
-(Assert (= threehalfs (+ threefourths threefourths)))
+(Assert= threehalfs (+ threefourths threefourths))
 (Assert (zerop (+ bigpos bigneg)))))
 ;; Test `-'
 (Check-Error wrong-number-of-arguments (-))
-(Assert (eq (- 0) 0))
+(Assert-eq (- 0) 0)
-(Assert (eq (- 1) -1))
+(Assert-eq (- 1) -1)
 (dolist (one `(1 1.0 ?\1 ,(Int-to-Marker 1)))
-(Assert (= (+ 1 one) 2))
+(Assert= (+ 1 one) 2)
-(Assert (= (+ one) 1))
+(Assert= (+ one) 1)
-(Assert (= (+ one) one))
+(Assert= (+ one) one)
-(Assert (= (- one) -1))
+(Assert= (- one) -1)
-(Assert (= (- one one) 0))
+(Assert= (- one one) 0)
-(Assert (= (- one one one) -1))
+(Assert= (- one one one) -1)
-(Assert (= (- 0 one) -1))
+(Assert= (- 0 one) -1)
-(Assert (= (- 0 one one) -2))
+(Assert= (- 0 one one) -2)
-(Assert (= (+ one 1) 2))
+(Assert= (+ one 1) 2)
 (dolist (zero '(0 0.0 ?\0))
-(Assert (= (+ 1 zero) 1) zero)
+(Assert= (+ 1 zero) 1 zero)
-(Assert (= (+ zero 1) 1) zero)
+(Assert= (+ zero 1) 1 zero)
-(Assert (= (- zero) zero) zero)
+(Assert= (- zero) zero zero)
-(Assert (= (- zero) 0) zero)
+(Assert= (- zero) 0 zero)
-(Assert (= (- zero zero) 0) zero)
+(Assert= (- zero zero) 0 zero)
-(Assert (= (- zero one one) -2) zero)))
+(Assert= (- zero one one) -2 zero)))
-(Assert (= (- 1.5 1) .5))
+(Assert= (- 1.5 1) .5)
-(Assert (= (- 1 1.5) (- .5)))
+(Assert= (- 1 1.5) (- .5))
 (if (featurep 'bignum)
 (progn
 (Assert (bignump (1- most-negative-fixnum)))
-(Assert (eq most-negative-fixnum (1+ (1- most-negative-fixnum))))
+(Assert-eq most-negative-fixnum (1+ (1- most-negative-fixnum)))
 (Assert (bignump (- most-negative-fixnum 1)))
-(Assert (eq most-negative-fixnum (+ (- most-negative-fixnum 1) 1)))
+(Assert-eq most-negative-fixnum (+ (- most-negative-fixnum 1) 1))
-(Assert (= (1- most-negative-fixnum) (- 0 most-positive-fixnum 2)))
+(Assert= (1- most-negative-fixnum) (- 0 most-positive-fixnum 2))
-(Assert (eq (- (- most-positive-fixnum most-negative-fixnum)
+(Assert-eq (- (- most-positive-fixnum most-negative-fixnum)
 		     (* 2 most-positive-fixnum))
-		  1)))
+		  1))
-(Assert (eq (1- most-negative-fixnum) most-positive-fixnum))
+(Assert-eq (1- most-negative-fixnum) most-positive-fixnum)
-(Assert (eq (- most-negative-fixnum 1) most-positive-fixnum)))
+(Assert-eq (- most-negative-fixnum 1) most-positive-fixnum))
 (when (featurep 'ratio)
 (let ((threefourths (read "3/4"))
 	(threehalfs (read "3/2"))
 	(bigpos (div (+ most-positive-fixnum 2) (1+ most-positive-fixnum)))
 	(bigneg (div most-positive-fixnum most-negative-fixnum))
 	(negone (div (1+ most-positive-fixnum) most-negative-fixnum)))
-(Assert (= (- negone) 1))
+(Assert= (- negone) 1)
-(Assert (= threefourths (- threehalfs threefourths)))
+(Assert= threefourths (- threehalfs threefourths))
-(Assert (= (- bigpos bigneg) 2))))
+(Assert= (- bigpos bigneg) 2)))
 ;; Test `/'
 ;; Test division by zero errors
 (dolist (zero '(0 0.0 ?\0))
 (Check-Error arith-error (/ n1 n2 zero)))))
 ;; Other tests for `/'
 (Check-Error wrong-number-of-arguments (/))
 (let (x)
-(Assert (= (/ (setq x 2))   0))
+(Assert= (/ (setq x 2))   0)
-(Assert (= (/ (setq x 2.0)) 0.5)))
+(Assert= (/ (setq x 2.0)) 0.5))
 (dolist (six '(6 6.0 ?\06))
 (dolist (two '(2 2.0 ?\02))
 (dolist (three '(3 3.0 ?\03))
-(Assert (= (/ six two) three) (list six two three)))))
+(Assert= (/ six two) three (list six two three)))))
 (dolist (three '(3 3.0 ?\03))
-(Assert (= (/ three 2.0) 1.5) three))
+(Assert= (/ three 2.0) 1.5 three))
 (dolist (two '(2 2.0 ?\02))
-(Assert (= (/ 3.0 two) 1.5) two))
+(Assert= (/ 3.0 two) 1.5 two))
 (when (featurep 'bignum)
 (let* ((million 1000000)
 	 (billion (* million 1000))	;; American, not British, billion
 	 (trillion (* billion 1000)))
-(Assert (= (/ billion 1000) (/ trillion million) million 1000000.0))
+(Assert= (/ billion 1000) (/ trillion million) million 1000000.0)
-(Assert (= (/ billion -1000) (/ trillion (- million)) (- million)))
+(Assert= (/ billion -1000) (/ trillion (- million)) (- million))
-(Assert (= (/ trillion 1000) billion 1000000000.0))
+(Assert= (/ trillion 1000) billion 1000000000.0)
-(Assert (= (/ trillion -1000) (- billion) -1000000000.0))
+(Assert= (/ trillion -1000) (- billion) -1000000000.0)
-(Assert (= (/ trillion 10) (* 100 billion) 100000000000.0))
+(Assert= (/ trillion 10) (* 100 billion) 100000000000.0)
-(Assert (= (/ (- trillion) 10) (* -100 billion) -100000000000.0))))
+(Assert= (/ (- trillion) 10) (* -100 billion) -100000000000.0)))
 (when (featurep 'ratio)
 (let ((half (div 1 2))
 	(fivefourths (div 5 4))
 	(fivehalfs (div 5 2)))
-(Assert (= half (read "3000000000/6000000000")))
+(Assert= half (read "3000000000/6000000000"))
-(Assert (= (/ fivehalfs fivefourths) 2))
+(Assert= (/ fivehalfs fivefourths) 2)
-(Assert (= (/ fivefourths fivehalfs) half))
+(Assert= (/ fivefourths fivehalfs) half)
-(Assert (= (- half) (read "-3000000000/6000000000")))
+(Assert= (- half) (read "-3000000000/6000000000"))
-(Assert (= (/ fivehalfs (- fivefourths)) -2))
+(Assert= (/ fivehalfs (- fivefourths)) -2)
-(Assert (= (/ (- fivefourths) fivehalfs) (- half)))))
+(Assert= (/ (- fivefourths) fivehalfs) (- half))))
 ;; Test `*'
-(Assert (= 1 (*)))
+(Assert= 1 (*))
 (dolist (one `(1 1.0 ?\01 ,(Int-to-Marker 1)))
-(Assert (= 1 (* one)) one))
+(Assert= 1 (* one) one))
 (dolist (two '(2 2.0 ?\02))
-(Assert (= 2 (* two)) two))
+(Assert= 2 (* two) two))
 (dolist (six '(6 6.0 ?\06))
 (dolist (two '(2 2.0 ?\02))
 (dolist (three '(3 3.0 ?\03))
-(Assert (= (* three two) six) (list three two six)))))
+(Assert= (* three two) six (list three two six)))))
 (dolist (three '(3 3.0 ?\03))
 (dolist (two '(2 2.0 ?\02))
-(Assert (= (* 1.5 two) three) (list two three))
+(Assert= (* 1.5 two) three (list two three))
 (dolist (five '(5 5.0 ?\05))
-(Assert (= 30 (* five two three)) (list five two three)))))
+(Assert= 30 (* five two three) (list five two three)))))
 (when (featurep 'bignum)
 (let ((64K 65536))
-(Assert (= (* 64K 64K) (read "4294967296")))
+(Assert= (* 64K 64K) (read "4294967296"))
-(Assert (= (* (- 64K) 64K) (read "-4294967296")))
+(Assert= (* (- 64K) 64K) (read "-4294967296"))
 (Assert (/= (* -1 most-negative-fixnum) most-negative-fixnum))))
 (when (featurep 'ratio)
 (let ((half (div 1 2))
 	(fivefourths (div 5 4))
 	(twofifths (div 2 5)))
-(Assert (= (* fivefourths twofifths) half))
+(Assert= (* fivefourths twofifths) half)
-(Assert (= (* half twofifths) (read "3/15")))))
+(Assert= (* half twofifths) (read "3/15"))))
 ;; Test `+'
-(Assert (= 0 (+)))
+(Assert= 0 (+))
 (dolist (one `(1 1.0 ?\01 ,(Int-to-Marker 1)))
-(Assert (= 1 (+ one)) one))
+(Assert= 1 (+ one) one))
 (dolist (two '(2 2.0 ?\02))
-(Assert (= 2 (+ two)) two))
+(Assert= 2 (+ two) two))
 (dolist (five '(5 5.0 ?\05))
 (dolist (two '(2 2.0 ?\02))
 (dolist (three '(3 3.0 ?\03))
-(Assert (= (+ three two) five) (list three two five))
+(Assert= (+ three two) five (list three two five))
-(Assert (= 10 (+ five two three)) (list five two three)))))
+(Assert= 10 (+ five two three) (list five two three)))))
 ;; Test `max', `min'
 (dolist (one `(1 1.0 ?\01 ,(Int-to-Marker 1)))
-(Assert (= one (max one)) one)
+(Assert= one (max one) one)
-(Assert (= one (max one one)) one)
+(Assert= one (max one one) one)
-(Assert (= one (max one one one)) one)
+(Assert= one (max one one one) one)
-(Assert (= one (min one)) one)
+(Assert= one (min one) one)
-(Assert (= one (min one one)) one)
+(Assert= one (min one one) one)
-(Assert (= one (min one one one)) one)
+(Assert= one (min one one one) one)
 (dolist (two `(2 2.0 ?\02 ,(Int-to-Marker 2)))
-(Assert (= one (min one two)) (list one two))
+(Assert= one (min one two) (list one two))
-(Assert (= one (min one two two)) (list one two))
+(Assert= one (min one two two) (list one two))
-(Assert (= one (min two two one)) (list one two))
+(Assert= one (min two two one) (list one two))
-(Assert (= two (max one two)) (list one two))
+(Assert= two (max one two) (list one two))
-(Assert (= two (max one two two)) (list one two))
+(Assert= two (max one two two) (list one two))
-(Assert (= two (max two two one)) (list one two))))
+(Assert= two (max two two one) (list one two))))
 (when (featurep 'bignum)
 (let ((big (1+ most-positive-fixnum))
 	(small (1- most-negative-fixnum)))
-(Assert (= big (max 1 1000000.0 most-positive-fixnum big)))
+(Assert= big (max 1 1000000.0 most-positive-fixnum big))
-(Assert (= small (min -1 -1000000.0 most-negative-fixnum small)))))
+(Assert= small (min -1 -1000000.0 most-negative-fixnum small))))
 (when (featurep 'ratio)
 (let* ((big (1+ most-positive-fixnum))
 	 (small (1- most-negative-fixnum))
 	 (bigr (div (* 5 (1+ most-positive-fixnum)) 4))
 	 (smallr (- bigr)))
-(Assert (= bigr (max 1 1000000.0 most-positive-fixnum big bigr)))
+(Assert= bigr (max 1 1000000.0 most-positive-fixnum big bigr))
-(Assert (= smallr (min -1 -1000000.0 most-negative-fixnum small smallr)))))
+(Assert= smallr (min -1 -1000000.0 most-negative-fixnum small smallr))))
 ;; The byte compiler has special handling for these constructs:
 (let ((three 3) (five 5))
-(Assert (= (+ three five 1) 9))
+(Assert= (+ three five 1) 9)
-(Assert (= (+ 1 three five) 9))
+(Assert= (+ 1 three five) 9)
-(Assert (= (+ three five -1) 7))
+(Assert= (+ three five -1) 7)
-(Assert (= (+ -1 three five) 7))
+(Assert= (+ -1 three five) 7)
-(Assert (= (+ three 1) 4))
+(Assert= (+ three 1) 4)
-(Assert (= (+ three -1) 2))
+(Assert= (+ three -1) 2)
-(Assert (= (+ -1 three) 2))
+(Assert= (+ -1 three) 2)
-(Assert (= (+ -1 three) 2))
+(Assert= (+ -1 three) 2)
-(Assert (= (- three five 1) -3))
+(Assert= (- three five 1) -3)
-(Assert (= (- 1 three five) -7))
+(Assert= (- 1 three five) -7)
-(Assert (= (- three five -1) -1))
+(Assert= (- three five -1) -1)
-(Assert (= (- -1 three five) -9))
+(Assert= (- -1 three five) -9)
-(Assert (= (- three 1) 2))
+(Assert= (- three 1) 2)
-(Assert (= (- three 2 1) 0))
+(Assert= (- three 2 1) 0)
-(Assert (= (- 2 three 1) -2))
+(Assert= (- 2 three 1) -2)
-(Assert (= (- three -1) 4))
+(Assert= (- three -1) 4)
-(Assert (= (- three 0) 3))
+(Assert= (- three 0) 3)
-(Assert (= (- three 0 five) -2))
+(Assert= (- three 0 five) -2)
-(Assert (= (- 0 three 0 five) -8))
+(Assert= (- 0 three 0 five) -8)
-(Assert (= (- 0 three five) -8))
+(Assert= (- 0 three five) -8)
-(Assert (= (* three 2) 6))
+(Assert= (* three 2) 6)
-(Assert (= (* three -1 five) -15))
+(Assert= (* three -1 five) -15)
-(Assert (= (* three 1 five) 15))
+(Assert= (* three 1 five) 15)
-(Assert (= (* three 0 five) 0))
+(Assert= (* three 0 five) 0)
-(Assert (= (* three 2 five) 30))
+(Assert= (* three 2 five) 30)
-(Assert (= (/ three 1) 3))
+(Assert= (/ three 1) 3)
-(Assert (= (/ three -1) -3))
+(Assert= (/ three -1) -3)
-(Assert (= (/ (* five five) 2 2) 6))
+(Assert= (/ (* five five) 2 2) 6)
-(Assert (= (/ 64 five 2) 6)))
+(Assert= (/ 64 five 2) 6))
 ;;-----------------------------------------------------
 ;; Logical bit-twiddling operations
 ;;-----------------------------------------------------
-(Assert (= (logxor)  0))
+(Assert= (logxor)  0)
-(Assert (= (logior)  0))
+(Assert= (logior)  0)
-(Assert (= (logand) -1))
+(Assert= (logand) -1)
 (Check-Error wrong-type-argument (logxor 3.0))
 (Check-Error wrong-type-argument (logior 3.0))
 (Check-Error wrong-type-argument (logand 3.0))
 (dolist (three '(3 ?\03))
-(Assert (eq 3 (logand three)) three)
+(Assert-eq 3 (logand three) three)
-(Assert (eq 3 (logxor three)) three)
+(Assert-eq 3 (logxor three) three)
-(Assert (eq 3 (logior three)) three)
+(Assert-eq 3 (logior three) three)
-(Assert (eq 3 (logand three three)) three)
+(Assert-eq 3 (logand three three) three)
-(Assert (eq 0 (logxor three three)) three)
+(Assert-eq 0 (logxor three three) three)
-(Assert (eq 3 (logior three three))) three)
+(Assert-eq 3 (logior three three)) three)
 (dolist (one `(1 ?\01 ,(Int-to-Marker 1)))
 (dolist (two '(2 ?\02))
-(Assert (eq 0 (logand one two)) (list one two))
+(Assert-eq 0 (logand one two) (list one two))
-(Assert (eq 3 (logior one two)) (list one two))
+(Assert-eq 3 (logior one two) (list one two))
-(Assert (eq 3 (logxor one two)) (list one two)))
+(Assert-eq 3 (logxor one two) (list one two)))
 (dolist (three '(3 ?\03))
-(Assert (eq 1 (logand one three)) (list one three))
+(Assert-eq 1 (logand one three) (list one three))
-(Assert (eq 3 (logior one three)) (list one three))
+(Assert-eq 3 (logior one three) (list one three))
-(Assert (eq 2 (logxor one three)) (list one three))))
+(Assert-eq 2 (logxor one three) (list one three))))
 ;;-----------------------------------------------------
 ;; Test `%', mod
 ;;-----------------------------------------------------
 (Check-Error wrong-number-of-arguments (%))
 (Check-Error wrong-number-of-arguments (mod 1 2 3))
 (Check-Error wrong-type-argument (% 10.0 2))
 (Check-Error wrong-type-argument (% 10 2.0))
-(flet ((test1 (x) (Assert (eql x (+ (% x 17) (* (/ x 17) 17))) x))
+(flet ((test1 (x) (Assert-eql x (+ (% x 17) (* (/ x 17) 17)) x))
-(test2 (x) (Assert (eql (- x) (+ (% (- x) 17) (* (/ (- x) 17) 17))) x))
+(test2 (x) (Assert-eql (- x) (+ (% (- x) 17) (* (/ (- x) 17) 17)) x))
-(test3 (x) (Assert (eql x (+ (% (- x) 17) (* (/ (- x) 17) 17))) x))
+(test3 (x) (Assert-eql x (+ (% (- x) 17) (* (/ (- x) 17) 17)) x))
-(test4 (x) (Assert (eql (% x -17) (- (% (- x) 17))) x))
+(test4 (x) (Assert-eql (% x -17) (- (% (- x) 17)) x))
-(test5 (x) (Assert (eql (% x -17) (% (- x) 17))) x))
+(test5 (x) (Assert-eql (% x -17) (% (- x) 17)) x))
 (test1 most-negative-fixnum)
 (if (featurep 'bignum)
 (progn
 	(test2 most-negative-fixnum)
 	(test4 most-negative-fixnum))
 (test4 x))))
 (macrolet
 ((division-test (seven)
 `(progn
-(Assert (eq (% ,seven      2)  1))
+(Assert-eq (% ,seven      2)  1)
-(Assert (eq (% ,seven     -2)  1))
+(Assert-eq (% ,seven     -2)  1)
-(Assert (eq (% (- ,seven)  2) -1))
+(Assert-eq (% (- ,seven)  2) -1)
-(Assert (eq (% (- ,seven) -2) -1))
+(Assert-eq (% (- ,seven) -2) -1)
-(Assert (eq (% ,seven      4)  3))
+(Assert-eq (% ,seven      4)  3)
-(Assert (eq (% ,seven     -4)  3))
+(Assert-eq (% ,seven     -4)  3)
-(Assert (eq (% (- ,seven)  4) -3))
+(Assert-eq (% (- ,seven)  4) -3)
-(Assert (eq (% (- ,seven) -4) -3))
+(Assert-eq (% (- ,seven) -4) -3)
-(Assert (eq (%  35 ,seven)     0))
+(Assert-eq (%  35 ,seven)     0)
-(Assert (eq (% -35 ,seven)     0))
+(Assert-eq (% -35 ,seven)     0)
-(Assert (eq (%  35 (- ,seven)) 0))
+(Assert-eq (%  35 (- ,seven)) 0)
-(Assert (eq (% -35 (- ,seven)) 0))
+(Assert-eq (% -35 (- ,seven)) 0)
-(Assert (eq (mod ,seven      2)  1))
+(Assert-eq (mod ,seven      2)  1)
-(Assert (eq (mod ,seven     -2) -1))
+(Assert-eq (mod ,seven     -2) -1)
-(Assert (eq (mod (- ,seven)  2)  1))
+(Assert-eq (mod (- ,seven)  2)  1)
-(Assert (eq (mod (- ,seven) -2) -1))
+(Assert-eq (mod (- ,seven) -2) -1)
-(Assert (eq (mod ,seven      4)  3))
+(Assert-eq (mod ,seven      4)  3)
-(Assert (eq (mod ,seven     -4) -1))
+(Assert-eq (mod ,seven     -4) -1)
-(Assert (eq (mod (- ,seven)  4)  1))
+(Assert-eq (mod (- ,seven)  4)  1)
-(Assert (eq (mod (- ,seven) -4) -3))
+(Assert-eq (mod (- ,seven) -4) -3)
-(Assert (eq (mod  35 ,seven)     0))
+(Assert-eq (mod  35 ,seven)     0)
-(Assert (eq (mod -35 ,seven)     0))
+(Assert-eq (mod -35 ,seven)     0)
-(Assert (eq (mod  35 (- ,seven)) 0))
+(Assert-eq (mod  35 (- ,seven)) 0)
-(Assert (eq (mod -35 (- ,seven)) 0))
+(Assert-eq (mod -35 (- ,seven)) 0)
-(Assert (= (mod ,seven      2.0)  1.0))
+(Assert= (mod ,seven      2.0)  1.0)
-(Assert (= (mod ,seven     -2.0) -1.0))
+(Assert= (mod ,seven     -2.0) -1.0)
-(Assert (= (mod (- ,seven)  2.0)  1.0))
+(Assert= (mod (- ,seven)  2.0)  1.0)
-(Assert (= (mod (- ,seven) -2.0) -1.0))
+(Assert= (mod (- ,seven) -2.0) -1.0)
-(Assert (= (mod ,seven      4.0)  3.0))
+(Assert= (mod ,seven      4.0)  3.0)
-(Assert (= (mod ,seven     -4.0) -1.0))
+(Assert= (mod ,seven     -4.0) -1.0)
-(Assert (= (mod (- ,seven)  4.0)  1.0))
+(Assert= (mod (- ,seven)  4.0)  1.0)
-(Assert (= (mod (- ,seven) -4.0) -3.0))
+(Assert= (mod (- ,seven) -4.0) -3.0)
-(Assert (eq (% 0 ,seven) 0))
+(Assert-eq (% 0 ,seven) 0)
-(Assert (eq (% 0 (- ,seven)) 0))
+(Assert-eq (% 0 (- ,seven)) 0)
-(Assert (eq (mod 0 ,seven) 0))
+(Assert-eq (mod 0 ,seven) 0)
-(Assert (eq (mod 0 (- ,seven)) 0))
+(Assert-eq (mod 0 (- ,seven)) 0)
-(Assert (= (mod 0.0 ,seven) 0.0))
+(Assert= (mod 0.0 ,seven) 0.0)
-(Assert (= (mod 0.0 (- ,seven)) 0.0)))))
+(Assert= (mod 0.0 (- ,seven)) 0.0))))
 (division-test 7)
 (division-test ?\07)
 (division-test (Int-to-Marker 7)))
 (Check-Error wrong-number-of-arguments (>=))
 (Check-Error wrong-number-of-arguments (/=))
 ;; One argument always yields t
 (loop for x in `(1 1.0 ,(Int-to-Marker 1) ?z) do
-(Assert (eq t (=  x)) x)
+(Assert-eq t (=  x) x)
-(Assert (eq t (<  x)) x)
+(Assert-eq t (<  x) x)
-(Assert (eq t (>  x)) x)
+(Assert-eq t (>  x) x)
-(Assert (eq t (>= x)) x)
+(Assert-eq t (>= x) x)
-(Assert (eq t (<= x)) x)
+(Assert-eq t (<= x) x)
-(Assert (eq t (/= x)) x)
+(Assert-eq t (/= x) x)
 )
 ;; Type checking
 (Check-Error wrong-type-argument (=  'foo 1))
 (Check-Error wrong-type-argument (<= 'foo 1))
 (Assert (not (> one one)) one)
 (Assert (<= one one two two) (list one two))
 (Assert (not (< one one two two)) (list one two))
 (Assert (>= two two one one) (list one two))
 (Assert (not (> two two one one)) (list one two))
-(Assert (= one one one) one)
+(Assert= one one one one)
 (Assert (not (= one one one two)) (list one two))
 (Assert (not (/= one two one)) (list one two))
 ))
 (dolist (one `(1 1.0 ,(Int-to-Marker 1) ?\01))
 (Assert (not (> one one)) one)
 (Assert (<= one one two two) (list one two))
 (Assert (not (< one one two two)) (list one two))
 (Assert (>= two two one one) (list one two))
 (Assert (not (> two two one one)) (list one two))
-(Assert (= one one one) one)
+(Assert= one one one one)
 (Assert (not (= one one one two)) (list one two))
 (Assert (not (/= one two one)) (list one two))
 ))
 ;; ad-hoc
 (Assert (<= 1 2 3 4 5 6 6))
 (Assert (not (< 1 2 3 4 5 6 6)))
 (Assert (<= 1 1))
 (Assert (not (eq (point) (point-marker))))
-(Assert (= 1 (Int-to-Marker 1)))
+(Assert= 1 (Int-to-Marker 1))
-(Assert (= (point) (point-marker)))
+(Assert= (point) (point-marker))
 (when (featurep 'bignum)
 (let ((big1 (1+ most-positive-fixnum))
 	(big2 (* 10 most-positive-fixnum))
 	(small1 (1- most-negative-fixnum))
 	(big2 (div (* 5 most-positive-fixnum) 2))
 	(big3 (div (* 7 most-positive-fixnum) 2))
 	(small1 (div (* 10 most-negative-fixnum) 4))
 	(small2 (div (* 5 most-negative-fixnum) 2))
 	(small3 (div (* 7 most-negative-fixnum) 2)))
-(Assert (= big1 big2))
+(Assert= big1 big2)
-(Assert (= small1 small2))
+(Assert= small1 small2)
 (Assert (< small3 small1 most-negative-fixnum most-positive-fixnum big1
 	       big3))
 (Assert (<= small3 small2 small1 most-negative-fixnum most-positive-fixnum
 		big1 big2 big3))
 (Assert (> big3 big1 most-positive-fixnum most-negative-fixnum small1
 	     delete old-delete
 	     delq   old-delq
 	     remassoc remassq remrassoc remrassq))
 (let ((x '((1 . 2) 3 (4 . 5))))
-(Assert (eq (assoc  1 x) (car x)))
+(Assert-eq (assoc  1 x) (car x))
-(Assert (eq (assq   1 x) (car x)))
+(Assert-eq (assq   1 x) (car x))
-(Assert (eq (rassoc 1 x) nil))
+(Assert-eq (rassoc 1 x) nil)
-(Assert (eq (rassq  1 x) nil))
+(Assert-eq (rassq  1 x) nil)
-(Assert (eq (assoc  2 x) nil))
+(Assert-eq (assoc  2 x) nil)
-(Assert (eq (assq   2 x) nil))
+(Assert-eq (assq   2 x) nil)
-(Assert (eq (rassoc 2 x) (car x)))
+(Assert-eq (rassoc 2 x) (car x))
-(Assert (eq (rassq  2 x) (car x)))
+(Assert-eq (rassq  2 x) (car x))
-(Assert (eq (assoc  3 x) nil))
+(Assert-eq (assoc  3 x) nil)
-(Assert (eq (assq   3 x) nil))
+(Assert-eq (assq   3 x) nil)
-(Assert (eq (rassoc 3 x) nil))
+(Assert-eq (rassoc 3 x) nil)
-(Assert (eq (rassq  3 x) nil))
+(Assert-eq (rassq  3 x) nil)
-(Assert (eq (assoc  4 x) (caddr x)))
+(Assert-eq (assoc  4 x) (caddr x))
-(Assert (eq (assq   4 x) (caddr x)))
+(Assert-eq (assq   4 x) (caddr x))
-(Assert (eq (rassoc 4 x) nil))
+(Assert-eq (rassoc 4 x) nil)
-(Assert (eq (rassq  4 x) nil))
+(Assert-eq (rassq  4 x) nil)
-(Assert (eq (assoc  5 x) nil))
+(Assert-eq (assoc  5 x) nil)
-(Assert (eq (assq   5 x) nil))
+(Assert-eq (assq   5 x) nil)
-(Assert (eq (rassoc 5 x) (caddr x)))
+(Assert-eq (rassoc 5 x) (caddr x))
-(Assert (eq (rassq  5 x) (caddr x)))
+(Assert-eq (rassq  5 x) (caddr x))
-(Assert (eq (assoc  6 x) nil))
+(Assert-eq (assoc  6 x) nil)
-(Assert (eq (assq   6 x) nil))
+(Assert-eq (assq   6 x) nil)
-(Assert (eq (rassoc 6 x) nil))
+(Assert-eq (rassoc 6 x) nil)
-(Assert (eq (rassq  6 x) nil)))
+(Assert-eq (rassq  6 x) nil))
 (let ((x '(("1" . "2") "3" ("4" . "5"))))
-(Assert (eq (assoc  "1" x) (car x)))
+(Assert-eq (assoc  "1" x) (car x))
-(Assert (eq (assq   "1" x) nil))
+(Assert-eq (assq   "1" x) nil)
-(Assert (eq (rassoc "1" x) nil))
+(Assert-eq (rassoc "1" x) nil)
-(Assert (eq (rassq  "1" x) nil))
+(Assert-eq (rassq  "1" x) nil)
-(Assert (eq (assoc  "2" x) nil))
+(Assert-eq (assoc  "2" x) nil)
-(Assert (eq (assq   "2" x) nil))
+(Assert-eq (assq   "2" x) nil)
-(Assert (eq (rassoc "2" x) (car x)))
+(Assert-eq (rassoc "2" x) (car x))
-(Assert (eq (rassq  "2" x) nil))
+(Assert-eq (rassq  "2" x) nil)
-(Assert (eq (assoc  "3" x) nil))
+(Assert-eq (assoc  "3" x) nil)
-(Assert (eq (assq   "3" x) nil))
+(Assert-eq (assq   "3" x) nil)
-(Assert (eq (rassoc "3" x) nil))
+(Assert-eq (rassoc "3" x) nil)
-(Assert (eq (rassq  "3" x) nil))
+(Assert-eq (rassq  "3" x) nil)
-(Assert (eq (assoc  "4" x) (caddr x)))
+(Assert-eq (assoc  "4" x) (caddr x))
-(Assert (eq (assq   "4" x) nil))
+(Assert-eq (assq   "4" x) nil)
-(Assert (eq (rassoc "4" x) nil))
+(Assert-eq (rassoc "4" x) nil)
-(Assert (eq (rassq  "4" x) nil))
+(Assert-eq (rassq  "4" x) nil)
-(Assert (eq (assoc  "5" x) nil))
+(Assert-eq (assoc  "5" x) nil)
-(Assert (eq (assq   "5" x) nil))
+(Assert-eq (assq   "5" x) nil)
-(Assert (eq (rassoc "5" x) (caddr x)))
+(Assert-eq (rassoc "5" x) (caddr x))
-(Assert (eq (rassq  "5" x) nil))
+(Assert-eq (rassq  "5" x) nil)
-(Assert (eq (assoc  "6" x) nil))
+(Assert-eq (assoc  "6" x) nil)
-(Assert (eq (assq   "6" x) nil))
+(Assert-eq (assq   "6" x) nil)
-(Assert (eq (rassoc "6" x) nil))
+(Assert-eq (rassoc "6" x) nil)
-(Assert (eq (rassq  "6" x) nil)))
+(Assert-eq (rassq  "6" x) nil))
 (flet ((a () (list '(1 . 2) 3 '(4 . 5))))
 (Assert (let* ((x (a)) (y (remassoc  1 x))) (and (not (eq x y)) (equal y '(3 (4 . 5))))))
 (Assert (let* ((x (a)) (y (remassq   1 x))) (and (not (eq x y)) (equal y '(3 (4 . 5))))))
 (Assert (let* ((x (a)) (y (remrassoc 1 x))) (and (eq x y) (equal y (a)))))
 ;;-----------------------------------------------------
 ;; function-max-args, function-min-args
 ;;-----------------------------------------------------
 (defmacro check-function-argcounts (fun min max)
 `(progn
-(Assert (eq (function-min-args ,fun) ,min))
+(Assert-eq (function-min-args ,fun) ,min)
-(Assert (eq (function-max-args ,fun) ,max))))
+(Assert-eq (function-max-args ,fun) ,max)))
 (check-function-argcounts 'prog1 1 nil)         ; special form
 (check-function-argcounts 'command-execute 1 3)	; normal subr
 (check-function-argcounts 'funcall 1 nil)       ; `MANY' subr
 (check-function-argcounts 'garbage-collect 0 0) ; no args subr
 '((let (1 . unevalled))
 (prog1 (1 . unevalled))
 (list (0 . many))
 (type-of (1 . 1))
 (garbage-collect (0 . 0)))
-do (Assert (equal (subr-arity (symbol-function function-name)) arity)))
+do (Assert-equal (subr-arity (symbol-function function-name)) arity))
 (Check-Error wrong-type-argument (subr-arity
 (lambda () (message "Hi there!"))))
 (Check-Error wrong-type-argument (subr-arity nil))
 (fmakunbound 'test-sym2)
 ;;-----------------------------------------------------
 ;; Test `type-of'
 ;;-----------------------------------------------------
-(Assert (eq (type-of load-path) 'cons))
+(Assert-eq (type-of load-path) 'cons)
-(Assert (eq (type-of obarray) 'vector))
+(Assert-eq (type-of obarray) 'vector)
-(Assert (eq (type-of 42) 'integer))
+(Assert-eq (type-of 42) 'integer)
-(Assert (eq (type-of ?z) 'character))
+(Assert-eq (type-of ?z) 'character)
-(Assert (eq (type-of "42") 'string))
+(Assert-eq (type-of "42") 'string)
-(Assert (eq (type-of 'foo) 'symbol))
+(Assert-eq (type-of 'foo) 'symbol)
-(Assert (eq (type-of (selected-device)) 'device))
+(Assert-eq (type-of (selected-device)) 'device)
 ;;-----------------------------------------------------
 ;; Test mapping functions
 ;;-----------------------------------------------------
 (Check-Error wrong-type-argument (mapcar #'identity (current-buffer)))
-(Assert (equal (mapcar #'identity load-path) load-path))
+(Assert-equal (mapcar #'identity load-path) load-path)
-(Assert (equal (mapcar #'identity '(1 2 3)) '(1 2 3)))
+(Assert-equal (mapcar #'identity '(1 2 3)) '(1 2 3))
-(Assert (equal (mapcar #'identity "123") '(?1 ?2 ?3)))
+(Assert-equal (mapcar #'identity "123") '(?1 ?2 ?3))
-(Assert (equal (mapcar #'identity [1 2 3]) '(1 2 3)))
+(Assert-equal (mapcar #'identity [1 2 3]) '(1 2 3))
-(Assert (equal (mapcar #'identity #*010) '(0 1 0)))
+(Assert-equal (mapcar #'identity #*010) '(0 1 0))
 (let ((z 0) (list (make-list 1000 1)))
 (mapc (lambda (x) (incf z x)) list)
-(Assert (eq 1000 z)))
+(Assert-eq 1000 z))
 (Check-Error wrong-type-argument (mapvector #'identity (current-buffer)))
-(Assert (equal (mapvector #'identity '(1 2 3)) [1 2 3]))
+(Assert-equal (mapvector #'identity '(1 2 3)) [1 2 3])
-(Assert (equal (mapvector #'identity "123") [?1 ?2 ?3]))
+(Assert-equal (mapvector #'identity "123") [?1 ?2 ?3])
-(Assert (equal (mapvector #'identity [1 2 3]) [1 2 3]))
+(Assert-equal (mapvector #'identity [1 2 3]) [1 2 3])
-(Assert (equal (mapvector #'identity #*010) [0 1 0]))
+(Assert-equal (mapvector #'identity #*010) [0 1 0])
 (Check-Error wrong-type-argument (mapconcat #'identity (current-buffer) "foo"))
-(Assert (equal (mapconcat #'identity '("1" "2" "3") "|") "1|2|3"))
+(Assert-equal (mapconcat #'identity '("1" "2" "3") "|") "1|2|3")
-(Assert (equal (mapconcat #'identity ["1" "2" "3"]  "|") "1|2|3"))
+(Assert-equal (mapconcat #'identity ["1" "2" "3"]  "|") "1|2|3")
 ;; The following 2 functions used to crash XEmacs via mapcar1().
 ;; We don't test the actual values of the mapcar, since they're undefined.
 (Assert
 (let ((x (list (cons 1 1) (cons 2 2) (cons 3 3))))
 x)))
 ;;-----------------------------------------------------
 ;; Test vector functions
 ;;-----------------------------------------------------
-(Assert (equal [1 2 3] [1 2 3]))
+(Assert-equal [1 2 3] [1 2 3])
-(Assert (equal [] []))
+(Assert-equal [] [])
 (Assert (not (equal [1 2 3] [])))
 (Assert (not (equal [1 2 3] [1 2 4])))
 (Assert (not (equal [0 2 3] [1 2 3])))
 (Assert (not (equal [1 2 3] [1 2 3 4])))
 (Assert (not (equal [1 2 3 4] [1 2 3])))
-(Assert (equal (vector 1 2 3) [1 2 3]))
+(Assert-equal (vector 1 2 3) [1 2 3])
-(Assert (equal (make-vector 3 1) [1 1 1]))
+(Assert-equal (make-vector 3 1) [1 1 1])
 ;;-----------------------------------------------------
 ;; Test bit-vector functions
 ;;-----------------------------------------------------
-(Assert (equal #*010 #*010))
+(Assert-equal #*010 #*010)
-(Assert (equal #* #*))
+(Assert-equal #* #*)
 (Assert (not (equal #*010 #*011)))
 (Assert (not (equal #*010 #*)))
 (Assert (not (equal #*110 #*010)))
 (Assert (not (equal #*010 #*0100)))
 (Assert (not (equal #*0101 #*010)))
-(Assert (equal (bit-vector 0 1 0) #*010))
+(Assert-equal (bit-vector 0 1 0) #*010)
-(Assert (equal (make-bit-vector 3 1) #*111))
+(Assert-equal (make-bit-vector 3 1) #*111)
-(Assert (equal (make-bit-vector 3 0) #*000))
+(Assert-equal (make-bit-vector 3 0) #*000)
 ;;-----------------------------------------------------
 ;; Test buffer-local variables used as (ugh!) function parameters
 ;;-----------------------------------------------------
 (make-local-variable 'test-emacs-buffer-local-variable)
 ;;-----------------------------------------------------
 ;; Keep nulls, explicit SEPARATORS
 ;; Hrvoje didn't like the next 3 tests so I'm disabling them for now. -sb
 ;; I assume Hrvoje worried about the possibility of infloops. -sjt
 (when test-harness-risk-infloops
-(Assert (equal (split-string "foo" "") '("" "f" "o" "o" "")))
+(Assert-equal (split-string "foo" "") '("" "f" "o" "o" ""))
-(Assert (equal (split-string "foo" "^") '("" "foo")))
+(Assert-equal (split-string "foo" "^") '("" "foo"))
-(Assert (equal (split-string "foo" "$") '("foo" ""))))
+(Assert-equal (split-string "foo" "$") '("foo" "")))
-(Assert (equal (split-string "foo,bar" ",") '("foo" "bar")))
+(Assert-equal (split-string "foo,bar" ",") '("foo" "bar"))
-(Assert (equal (split-string ",foo,bar," ",") '("" "foo" "bar" "")))
+(Assert-equal (split-string ",foo,bar," ",") '("" "foo" "bar" ""))
-(Assert (equal (split-string ",foo,bar," "^,") '("" "foo,bar,")))
+(Assert-equal (split-string ",foo,bar," "^,") '("" "foo,bar,"))
-(Assert (equal (split-string ",foo,bar," ",$") '(",foo,bar" "")))
+(Assert-equal (split-string ",foo,bar," ",$") '(",foo,bar" ""))
-(Assert (equal (split-string ",foo,,bar," ",") '("" "foo" "" "bar" "")))
+(Assert-equal (split-string ",foo,,bar," ",") '("" "foo" "" "bar" ""))
-(Assert (equal (split-string "foo,,,bar" ",") '("foo" "" "" "bar")))
+(Assert-equal (split-string "foo,,,bar" ",") '("foo" "" "" "bar"))
-(Assert (equal (split-string "foo,,bar,," ",") '("foo" "" "bar" "" "")))
+(Assert-equal (split-string "foo,,bar,," ",") '("foo" "" "bar" "" ""))
-(Assert (equal (split-string "foo,,bar" ",+") '("foo" "bar")))
+(Assert-equal (split-string "foo,,bar" ",+") '("foo" "bar"))
-(Assert (equal (split-string ",foo,,bar," ",+") '("" "foo" "bar" "")))
+(Assert-equal (split-string ",foo,,bar," ",+") '("" "foo" "bar" ""))
 ;; Omit nulls, explicit SEPARATORS
 (when test-harness-risk-infloops
-(Assert (equal (split-string "foo" "" t) '("f" "o" "o")))
+(Assert-equal (split-string "foo" "" t) '("f" "o" "o"))
-(Assert (equal (split-string "foo" "^" t) '("foo")))
+(Assert-equal (split-string "foo" "^" t) '("foo"))
-(Assert (equal (split-string "foo" "$" t) '("foo"))))
+(Assert-equal (split-string "foo" "$" t) '("foo")))
-(Assert (equal (split-string "foo,bar" "," t) '("foo" "bar")))
+(Assert-equal (split-string "foo,bar" "," t) '("foo" "bar"))
-(Assert (equal (split-string ",foo,bar," "," t) '("foo" "bar")))
+(Assert-equal (split-string ",foo,bar," "," t) '("foo" "bar"))
-(Assert (equal (split-string ",foo,bar," "^," t) '("foo,bar,")))
+(Assert-equal (split-string ",foo,bar," "^," t) '("foo,bar,"))
-(Assert (equal (split-string ",foo,bar," ",$" t) '(",foo,bar")))
+(Assert-equal (split-string ",foo,bar," ",$" t) '(",foo,bar"))
-(Assert (equal (split-string ",foo,,bar," "," t) '("foo" "bar")))
+(Assert-equal (split-string ",foo,,bar," "," t) '("foo" "bar"))
-(Assert (equal (split-string "foo,,,bar" "," t) '("foo" "bar")))
+(Assert-equal (split-string "foo,,,bar" "," t) '("foo" "bar"))
-(Assert (equal (split-string "foo,,bar,," "," t) '("foo" "bar")))
+(Assert-equal (split-string "foo,,bar,," "," t) '("foo" "bar"))
-(Assert (equal (split-string "foo,,bar" ",+" t) '("foo" "bar")))
+(Assert-equal (split-string "foo,,bar" ",+" t) '("foo" "bar"))
-(Assert (equal (split-string ",foo,,bar," ",+" t) '("foo" "bar")))
+(Assert-equal (split-string ",foo,,bar," ",+" t) '("foo" "bar"))
 ;; "Double-default" case
-(Assert (equal (split-string "foo bar") '("foo" "bar")))
+(Assert-equal (split-string "foo bar") '("foo" "bar"))
-(Assert (equal (split-string " foo bar ") '("foo" "bar")))
+(Assert-equal (split-string " foo bar ") '("foo" "bar"))
-(Assert (equal (split-string " foo  bar ") '("foo" "bar")))
+(Assert-equal (split-string " foo  bar ") '("foo" "bar"))
-(Assert (equal (split-string "foo   bar") '("foo" "bar")))
+(Assert-equal (split-string "foo   bar") '("foo" "bar"))
-(Assert (equal (split-string "foo  bar  ") '("foo" "bar")))
+(Assert-equal (split-string "foo  bar  ") '("foo" "bar"))
-(Assert (equal (split-string "foobar") '("foobar")))
+(Assert-equal (split-string "foobar") '("foobar"))
 ;; Semantics are identical to "double-default" case!  Fool ya?
-(Assert (equal (split-string "foo bar" nil t) '("foo" "bar")))
+(Assert-equal (split-string "foo bar" nil t) '("foo" "bar"))
-(Assert (equal (split-string " foo bar " nil t) '("foo" "bar")))
+(Assert-equal (split-string " foo bar " nil t) '("foo" "bar"))
-(Assert (equal (split-string " foo  bar " nil t) '("foo" "bar")))
+(Assert-equal (split-string " foo  bar " nil t) '("foo" "bar"))
-(Assert (equal (split-string "foo   bar" nil t) '("foo" "bar")))
+(Assert-equal (split-string "foo   bar" nil t) '("foo" "bar"))
-(Assert (equal (split-string "foo  bar  " nil t) '("foo" "bar")))
+(Assert-equal (split-string "foo  bar  " nil t) '("foo" "bar"))
-(Assert (equal (split-string "foobar" nil t) '("foobar")))
+(Assert-equal (split-string "foobar" nil t) '("foobar"))
 ;; Perverse "anti-double-default" case
-(Assert (equal (split-string "foo bar" split-string-default-separators)
+(Assert-equal (split-string "foo bar" split-string-default-separators)
-	       '("foo" "bar")))
+	       '("foo" "bar"))
-(Assert (equal (split-string " foo bar " split-string-default-separators)
+(Assert-equal (split-string " foo bar " split-string-default-separators)
-	       '("" "foo" "bar" "")))
+	       '("" "foo" "bar" ""))
-(Assert (equal (split-string " foo  bar " split-string-default-separators)
+(Assert-equal (split-string " foo  bar " split-string-default-separators)
-	       '("" "foo" "bar" "")))
+	       '("" "foo" "bar" ""))
-(Assert (equal (split-string "foo   bar" split-string-default-separators)
+(Assert-equal (split-string "foo   bar" split-string-default-separators)
-	       '("foo" "bar")))
+	       '("foo" "bar"))
-(Assert (equal (split-string "foo  bar  " split-string-default-separators)
+(Assert-equal (split-string "foo  bar  " split-string-default-separators)
-	       '("foo" "bar" "")))
+	       '("foo" "bar" ""))
-(Assert (equal (split-string "foobar" split-string-default-separators)
+(Assert-equal (split-string "foobar" split-string-default-separators)
-	       '("foobar")))
+	       '("foobar"))
 (Assert (not (string-match "\\(\\.\\=\\)" ".")))
 (Assert (string= "" (let ((str "test string"))
 		      (if (string-match "^.*$" str)
 			  (replace-match "\\U" t nil str)))))
 ;;-----------------------------------------------------
 ;; Test near-text buffer functions.
 ;;-----------------------------------------------------
 (with-temp-buffer
 (erase-buffer)
-(Assert (eq (char-before) nil))
+(Assert-eq (char-before) nil)
-(Assert (eq (char-before (point)) nil))
+(Assert-eq (char-before (point)) nil)
-(Assert (eq (char-before (point-marker)) nil))
+(Assert-eq (char-before (point-marker)) nil)
-(Assert (eq (char-before (point) (current-buffer)) nil))
+(Assert-eq (char-before (point) (current-buffer)) nil)
-(Assert (eq (char-before (point-marker) (current-buffer)) nil))
+(Assert-eq (char-before (point-marker) (current-buffer)) nil)
-(Assert (eq (char-after) nil))
+(Assert-eq (char-after) nil)
-(Assert (eq (char-after (point)) nil))
+(Assert-eq (char-after (point)) nil)
-(Assert (eq (char-after (point-marker)) nil))
+(Assert-eq (char-after (point-marker)) nil)
-(Assert (eq (char-after (point) (current-buffer)) nil))
+(Assert-eq (char-after (point) (current-buffer)) nil)
-(Assert (eq (char-after (point-marker) (current-buffer)) nil))
+(Assert-eq (char-after (point-marker) (current-buffer)) nil)
-(Assert (eq (preceding-char) 0))
+(Assert-eq (preceding-char) 0)
-(Assert (eq (preceding-char (current-buffer)) 0))
+(Assert-eq (preceding-char (current-buffer)) 0)
-(Assert (eq (following-char) 0))
+(Assert-eq (following-char) 0)
-(Assert (eq (following-char (current-buffer)) 0))
+(Assert-eq (following-char (current-buffer)) 0)
 (insert "foobar")
-(Assert (eq (char-before) ?r))
+(Assert-eq (char-before) ?r)
-(Assert (eq (char-after) nil))
+(Assert-eq (char-after) nil)
-(Assert (eq (preceding-char) ?r))
+(Assert-eq (preceding-char) ?r)
-(Assert (eq (following-char) 0))
+(Assert-eq (following-char) 0)
 (goto-char (point-min))
-(Assert (eq (char-before) nil))
+(Assert-eq (char-before) nil)
-(Assert (eq (char-after) ?f))
+(Assert-eq (char-after) ?f)
-(Assert (eq (preceding-char) 0))
+(Assert-eq (preceding-char) 0)
-(Assert (eq (following-char) ?f))
+(Assert-eq (following-char) ?f)
 )
 ;;-----------------------------------------------------
 ;; Test plist manipulation functions.
 ;;-----------------------------------------------------
 (let ((sym (make-symbol "test-symbol")))
-(Assert (eq t (get* sym t t)))
+(Assert-eq t (get* sym t t))
-(Assert (eq t (get  sym t t)))
+(Assert-eq t (get  sym t t))
-(Assert (eq t (getf nil t t)))
+(Assert-eq t (getf nil t t))
-(Assert (eq t (plist-get nil t t)))
+(Assert-eq t (plist-get nil t t))
 (put sym 'bar 'baz)
-(Assert (eq 'baz (get sym 'bar)))
+(Assert-eq 'baz (get sym 'bar))
-(Assert (eq 'baz (getf '(bar baz) 'bar)))
+(Assert-eq 'baz (getf '(bar baz) 'bar))
-(Assert (eq 'baz (getf (symbol-plist sym) 'bar)))
+(Assert-eq 'baz (getf (symbol-plist sym) 'bar))
-(Assert (eq 2 (getf '(1 2) 1)))
+(Assert-eq 2 (getf '(1 2) 1))
-(Assert (eq 4 (put sym 3 4)))
+(Assert-eq 4 (put sym 3 4))
-(Assert (eq 4 (get sym 3)))
+(Assert-eq 4 (get sym 3))
-(Assert (eq t (remprop sym 3)))
+(Assert-eq t (remprop sym 3))
-(Assert (eq nil (remprop sym 3)))
+(Assert-eq nil (remprop sym 3))
-(Assert (eq 5 (get sym 3 5)))
+(Assert-eq 5 (get sym 3 5))
 )
 (loop for obj in
 (list (make-symbol "test-symbol")
 	"test-string"
 	(make-extent nil nil nil)
 	(make-face 'test-face))
 do
-(Assert (eq 2 (get obj ?1 2)) obj)
+(Assert-eq 2 (get obj ?1 2) obj)
-(Assert (eq 4 (put obj ?3 4)) obj)
+(Assert-eq 4 (put obj ?3 4) obj)
-(Assert (eq 4 (get obj ?3)) obj)
+(Assert-eq 4 (get obj ?3) obj)
 (when (or (stringp obj) (symbolp obj))
-(Assert (equal '(?3 4) (object-plist obj)) obj))
+(Assert-equal '(?3 4) (object-plist obj) obj))
-(Assert (eq t (remprop obj ?3)) obj)
+(Assert-eq t (remprop obj ?3) obj)
 (when (or (stringp obj) (symbolp obj))
-(Assert (eq '() (object-plist obj)) obj))
+(Assert-eq '() (object-plist obj) obj))
-(Assert (eq nil (remprop obj ?3)) obj)
+(Assert-eq nil (remprop obj ?3) obj)
 (when (or (stringp obj) (symbolp obj))
-(Assert (eq '() (object-plist obj)) obj))
+(Assert-eq '() (object-plist obj) obj))
-(Assert (eq 5 (get obj ?3 5)) obj)
+(Assert-eq 5 (get obj ?3 5) obj)
 )
 (Check-Error-Message
 error "Object type has no properties"
 (get 2 'property))
 (remprop (make-extent nil nil nil) 'detachable))
 ;;-----------------------------------------------------
 ;; Test subseq
 ;;-----------------------------------------------------
-(Assert (equal (subseq nil 0) nil))
+(Assert-equal (subseq nil 0) nil)
-(Assert (equal (subseq [1 2 3] 0) [1 2 3]))
+(Assert-equal (subseq [1 2 3] 0) [1 2 3])
-(Assert (equal (subseq [1 2 3] 1 -1) [2]))
+(Assert-equal (subseq [1 2 3] 1 -1) [2])
-(Assert (equal (subseq "123" 0) "123"))
+(Assert-equal (subseq "123" 0) "123")
-(Assert (equal (subseq "1234" -3 -1) "23"))
+(Assert-equal (subseq "1234" -3 -1) "23")
-(Assert (equal (subseq #*0011 0) #*0011))
+(Assert-equal (subseq #*0011 0) #*0011)
-(Assert (equal (subseq #*0011 -3 3) #*01))
+(Assert-equal (subseq #*0011 -3 3) #*01)
-(Assert (equal (subseq '(1 2 3) 0) '(1 2 3)))
+(Assert-equal (subseq '(1 2 3) 0) '(1 2 3))
-(Assert (equal (subseq '(1 2 3 4) -3 nil) '(2 3 4)))
+(Assert-equal (subseq '(1 2 3 4) -3 nil) '(2 3 4))
 (Check-Error wrong-type-argument (subseq 3 2))
 (Check-Error args-out-of-range (subseq [1 2 3] -42))
 (Check-Error args-out-of-range (subseq [1 2 3] 0 42))
 ;;-----------------------------------------------------
 ;; Time-related tests
 ;;-----------------------------------------------------
-(Assert (= (length (current-time-string)) 24))
+(Assert= (length (current-time-string)) 24)
 ;;-----------------------------------------------------
 ;; format test
 ;;-----------------------------------------------------
 (Assert (string= (format "%d" 10) "10"))
 (Assert (string= (format "%1.3d" 10) "010"))
 (Assert (string= (format "%3.1d" 10) " 10"))
 ;;; The following two tests used to use 1000 instead of 100,
 ;;; but that merely found buffer overflow bugs in Solaris sprintf().
-(Assert (= 102 (length (format "%.100f" 3.14))))
+(Assert= 102 (length (format "%.100f" 3.14)))
-(Assert (= 100 (length (format "%100f" 3.14))))
+(Assert= 100 (length (format "%100f" 3.14)))
 ;;; Check for 64-bit cleanness on LP64 platforms.
-(Assert (= (read (format "%d"  most-positive-fixnum)) most-positive-fixnum))
+(Assert= (read (format "%d"  most-positive-fixnum)) most-positive-fixnum)
-(Assert (= (read (format "%ld" most-positive-fixnum)) most-positive-fixnum))
+(Assert= (read (format "%ld" most-positive-fixnum)) most-positive-fixnum)
-(Assert (= (read (format "%u"  most-positive-fixnum)) most-positive-fixnum))
+(Assert= (read (format "%u"  most-positive-fixnum)) most-positive-fixnum)
-(Assert (= (read (format "%lu" most-positive-fixnum)) most-positive-fixnum))
+(Assert= (read (format "%lu" most-positive-fixnum)) most-positive-fixnum)
-(Assert (= (read (format "%d"  most-negative-fixnum)) most-negative-fixnum))
+(Assert= (read (format "%d"  most-negative-fixnum)) most-negative-fixnum)
-(Assert (= (read (format "%ld" most-negative-fixnum)) most-negative-fixnum))
+(Assert= (read (format "%ld" most-negative-fixnum)) most-negative-fixnum)
 ;; These used to crash.
-(Assert (eql (read (format "%f" 1.2e+302)) 1.2e+302))
+(Assert-eql (read (format "%f" 1.2e+302)) 1.2e+302)
-(Assert (eql (read (format "%.1000d" 1)) 1))
+(Assert-eql (read (format "%.1000d" 1)) 1)
 ;;; "%u" is undocumented, and Emacs Lisp has no unsigned type.
 ;;; What to do if "%u" is used with a negative number?
 ;;; For non-bignum XEmacsen, the most reasonable thing seems to be to print an
 ;;; un-read-able number.  The printed value might be useful to a human, if not
 old-char)
 (setq old-char (aref load-file-name 0))
 (if (= new-char old-char)
 (setq new-char ?/))
 (aset load-file-name 0 new-char)
-(Assert (= new-char (aref load-file-name 0))
+(Assert= new-char (aref load-file-name 0)
 	  \"Check that we can modify the string value of load-file-name\"))
 (let* ((new-load-file-name \"hi there\")
 (load-file-name new-load-file-name))
-(Assert (eq new-load-file-name load-file-name)
+(Assert-eq new-load-file-name load-file-name
 	  \"Checking that we can bind load-file-name successfully.\"))
 ")
 (write-region (point-min) (point-max) test-file-name nil 'quiet)
 (set-buffer-modified-p nil)
 			 one-fceiling-result two-fceiling-result
 			 one-round-result two-round-result
 			 one-fround-result two-fround-result
 			 one-truncate-result two-truncate-result
 			 one-ftruncate-result two-ftruncate-result)
-	 (Assert (equal one-floor-result (multiple-value-list
+	 (Assert-equal one-floor-result (multiple-value-list
-					  (floor first)))
+					  (floor first))
 		 (format "checking (floor %S) gives %S"
 			 first one-floor-result))
-	 (Assert (equal one-floor-result (multiple-value-list
+	 (Assert-equal one-floor-result (multiple-value-list
-					  (floor first 1)))
+					  (floor first 1))
 		 (format "checking (floor %S 1) gives %S"
 			 first one-floor-result))
 	 (Check-Error arith-error (floor first 0))
 	 (Check-Error arith-error (floor first 0.0))
-	 (Assert (equal two-floor-result (multiple-value-list
+	 (Assert-equal two-floor-result (multiple-value-list
-					  (floor first second)))
+					  (floor first second))
 		 (format
 		  "checking (floor %S %S) gives %S"
 		  first second two-floor-result))
-	 (Assert (equal (cl-floor first second)
+	 (Assert-equal (cl-floor first second)
-			(multiple-value-list (floor first second)))
+			(multiple-value-list (floor first second))
 		 (format
 		  "checking (floor %S %S) gives the same as the old code"
 		  first second))
-	 (Assert (equal one-ffloor-result (multiple-value-list
+	 (Assert-equal one-ffloor-result (multiple-value-list
-					   (ffloor first)))
+					   (ffloor first))
 		 (format "checking (ffloor %S) gives %S"
 			 first one-ffloor-result))
-	 (Assert (equal one-ffloor-result (multiple-value-list
+	 (Assert-equal one-ffloor-result (multiple-value-list
-					   (ffloor first 1)))
+					   (ffloor first 1))
 		 (format "checking (ffloor %S 1) gives %S"
 			 first one-ffloor-result))
 	 (Check-Error arith-error (ffloor first 0))
 	 (Check-Error arith-error (ffloor first 0.0))
-	 (Assert (equal two-ffloor-result (multiple-value-list
+	 (Assert-equal two-ffloor-result (multiple-value-list
-					   (ffloor first second)))
+					   (ffloor first second))
 		 (format "checking (ffloor %S %S) gives %S"
 			 first second two-ffloor-result))
-	 (Assert (equal one-ceiling-result (multiple-value-list
+	 (Assert-equal one-ceiling-result (multiple-value-list
-					    (ceiling first)))
+					    (ceiling first))
 		 (format "checking (ceiling %S) gives %S"
 			 first one-ceiling-result))
-	 (Assert (equal one-ceiling-result (multiple-value-list
+	 (Assert-equal one-ceiling-result (multiple-value-list
-					    (ceiling first 1)))
+					    (ceiling first 1))
 		 (format "checking (ceiling %S 1) gives %S"
 			 first one-ceiling-result))
 	 (Check-Error arith-error (ceiling first 0))
 	 (Check-Error arith-error (ceiling first 0.0))
-	 (Assert (equal two-ceiling-result (multiple-value-list
+	 (Assert-equal two-ceiling-result (multiple-value-list
-					    (ceiling first second)))
+					    (ceiling first second))
 		 (format "checking (ceiling %S %S) gives %S"
 			 first second two-ceiling-result))
-	 (Assert (equal (cl-ceiling first second)
+	 (Assert-equal (cl-ceiling first second)
-			(multiple-value-list (ceiling first second)))
+			(multiple-value-list (ceiling first second))
 		 (format
 		  "checking (ceiling %S %S) gives the same as the old code"
 		  first second))
-	 (Assert (equal one-fceiling-result (multiple-value-list
+	 (Assert-equal one-fceiling-result (multiple-value-list
-					     (fceiling first)))
+					     (fceiling first))
 		 (format "checking (fceiling %S) gives %S"
 			 first one-fceiling-result))
-	 (Assert (equal one-fceiling-result (multiple-value-list
+	 (Assert-equal one-fceiling-result (multiple-value-list
-					     (fceiling first 1)))
+					     (fceiling first 1))
 		 (format "checking (fceiling %S 1) gives %S"
 			 first one-fceiling-result))
 	 (Check-Error arith-error (fceiling first 0))
 	 (Check-Error arith-error (fceiling first 0.0))
-	 (Assert (equal two-fceiling-result (multiple-value-list
+	 (Assert-equal two-fceiling-result (multiple-value-list
-					  (fceiling first second)))
+					  (fceiling first second))
 		 (format "checking (fceiling %S %S) gives %S"
 			 first second two-fceiling-result))
-	 (Assert (equal one-round-result (multiple-value-list
+	 (Assert-equal one-round-result (multiple-value-list
-					  (round first)))
+					  (round first))
 		 (format "checking (round %S) gives %S"
 			 first one-round-result))
-	 (Assert (equal one-round-result (multiple-value-list
+	 (Assert-equal one-round-result (multiple-value-list
-					  (round first 1)))
+					  (round first 1))
 		 (format "checking (round %S 1) gives %S"
 			 first one-round-result))
 	 (Check-Error arith-error (round first 0))
 	 (Check-Error arith-error (round first 0.0))
-	 (Assert (equal two-round-result (multiple-value-list
+	 (Assert-equal two-round-result (multiple-value-list
-					  (round first second)))
+					  (round first second))
 		 (format "checking (round %S %S) gives %S"
 			 first second two-round-result))
-	 (Assert (equal one-fround-result (multiple-value-list
+	 (Assert-equal one-fround-result (multiple-value-list
-					   (fround first)))
+					   (fround first))
 		 (format "checking (fround %S) gives %S"
 			 first one-fround-result))
-	 (Assert (equal one-fround-result (multiple-value-list
+	 (Assert-equal one-fround-result (multiple-value-list
-					   (fround first 1)))
+					   (fround first 1))
 		 (format "checking (fround %S 1) gives %S"
 			 first one-fround-result))
 	 (Check-Error arith-error (fround first 0))
 	 (Check-Error arith-error (fround first 0.0))
-	 (Assert (equal two-fround-result (multiple-value-list
+	 (Assert-equal two-fround-result (multiple-value-list
-					   (fround first second)))
+					   (fround first second))
 		 (format "checking (fround %S %S) gives %S"
 			 first second two-fround-result))
-	 (Assert (equal (cl-round first second)
+	 (Assert-equal (cl-round first second)
-			(multiple-value-list (round first second)))
+			(multiple-value-list (round first second))
 		 (format
 		  "checking (round %S %S) gives the same as the old code"
 		  first second))
-	 (Assert (equal one-truncate-result (multiple-value-list
+	 (Assert-equal one-truncate-result (multiple-value-list
-					     (truncate first)))
+					     (truncate first))
 		 (format "checking (truncate %S) gives %S"
 			 first one-truncate-result))
-	 (Assert (equal one-truncate-result (multiple-value-list
+	 (Assert-equal one-truncate-result (multiple-value-list
-					     (truncate first 1)))
+					     (truncate first 1))
 		 (format "checking (truncate %S 1) gives %S"
 			 first one-truncate-result))
 	 (Check-Error arith-error (truncate first 0))
 	 (Check-Error arith-error (truncate first 0.0))
-	 (Assert (equal two-truncate-result (multiple-value-list
+	 (Assert-equal two-truncate-result (multiple-value-list
-					     (truncate first second)))
+					     (truncate first second))
 		 (format "checking (truncate %S %S) gives %S"
 			 first second two-truncate-result))
-	 (Assert (equal (cl-truncate first second)
+	 (Assert-equal (cl-truncate first second)
-			(multiple-value-list (truncate first second)))
+			(multiple-value-list (truncate first second))
 		 (format
 		  "checking (truncate %S %S) gives the same as the old code"
 		  first second))
-	 (Assert (equal one-ftruncate-result (multiple-value-list
+	 (Assert-equal one-ftruncate-result (multiple-value-list
-					      (ftruncate first)))
+					      (ftruncate first))
 		 (format "checking (ftruncate %S) gives %S"
 			 first one-ftruncate-result))
-	 (Assert (equal one-ftruncate-result (multiple-value-list
+	 (Assert-equal one-ftruncate-result (multiple-value-list
-					      (ftruncate first 1)))
+					      (ftruncate first 1))
 		 (format "checking (ftruncate %S 1) gives %S"
 			 first one-ftruncate-result))
 	 (Check-Error arith-error (ftruncate first 0))
 	 (Check-Error arith-error (ftruncate first 0.0))
-	 (Assert (equal two-ftruncate-result (multiple-value-list
+	 (Assert-equal two-ftruncate-result (multiple-value-list
-					      (ftruncate first second)))
+					      (ftruncate first second))
 		 (format "checking (ftruncate %S %S) gives %S"
 			 first second two-ftruncate-result)))
 (Assert-rounding-floating (pie ee)
 	 (let ((pie-type (type-of pie)))
 	   (assert (eq pie-type (type-of ee)) t
 (= 2 (length (multiple-value-list
 		 (multiple-value-prog1 (floor pi) "hi there"))))
 "Checking #'multiple-value-prog1 passes back multiple values")
 (multiple-value-bind (floored remainder this-is-nil)
 (floor pi 1.0)
-(Assert (= floored 3)
+(Assert= floored 3
 	    "Checking floored bound correctly")
-(Assert (eql remainder (- pi 3.0))
+(Assert-eql remainder (- pi 3.0)
 	    "Checking remainder bound correctly")
 (Assert (null this-is-nil)
 	    "Checking trailing arg bound but nil"))
 (let ((ey 40000)
 	(bee "this is a string")
 	(cee #s(hash-table size 256 data (969 ?\xF9))))
 (multiple-value-setq (ey bee cee)
 (ffloor e 1.0))
-(Assert (eql 2.0 ey) "Checking ey set correctly")
+(Assert-eql 2.0 ey "Checking ey set correctly")
-(Assert (eql bee (- e 2.0)) "Checking bee set correctly")
+(Assert-eql bee (- e 2.0) "Checking bee set correctly")
 (Assert (null cee) "Checking cee set to nil correctly"))
 (Assert
 (= 3 (length (multiple-value-list (eval '(values nil t pi)))))
 "Checking #'eval passes back multiple values")
 (Assert
 		       with res = (make-string 96 ?\x20)
 		       for int-char from #x20 to #x7f
 		       for char being each element in-ref res
 		       do (setf char (int-to-char int-char))
 		       finally return res)))
-(Assert (equalp "hi there" "Hi There")
+(Assert-equalp "hi there" "Hi There"
 	  "checking equalp isn't case-sensitive")
-(Assert (equalp 99 99.0)
+(Assert-equalp 99 99.0
 	  "checking equalp compares numerical values of different types")
 (Assert (null (equalp 99 ?c))
 	  "checking equalp does not convert characters to numbers")
 ;; Fixed in Hg d0ea57eb3de4.
 (Assert (null (equalp "hi there" [hi there]))
 	  "checking equalp doesn't error with string and non-string")
-(Assert (eq t (equalp "ABCDEEFGH\u00CDJ" string-variable))
+(Assert-eq t (equalp "ABCDEEFGH\u00CDJ" string-variable)
 	  "checking #'equalp is case-insensitive with an upcased constant")
-(Assert (eq t (equalp "abcdeefgh\xedj" string-variable))
+(Assert-eq t (equalp "abcdeefgh\xedj" string-variable)
 	  "checking #'equalp is case-insensitive with a downcased constant")
-(Assert (eq t (equalp string-variable string-variable))
+(Assert-eq t (equalp string-variable string-variable)
 	  "checking #'equalp works when handed the same string twice")
-(Assert (eq t (equalp string-variable "aBcDeeFgH\u00Edj"))
+(Assert-eq t (equalp string-variable "aBcDeeFgH\u00Edj")
 	  "check #'equalp is case-insensitive with a variable-cased constant")
-(Assert (eq t (equalp "" (bit-vector)))
+(Assert-eq t (equalp "" (bit-vector))
 	  "check empty string and empty bit-vector are #'equalp.")
-(Assert (eq t (equalp (string) (bit-vector)))
+(Assert-eq t (equalp (string) (bit-vector))
 	  "check empty string and empty bit-vector are #'equalp, no constants")
-(Assert (eq t (equalp "hi there" (vector ?h ?i ?\  ?t ?h ?e ?r ?e)))
+(Assert-eq t (equalp "hi there" (vector ?h ?i ?\  ?t ?h ?e ?r ?e))
 	  "check string and vector with same contents #'equalp")
-(Assert (eq t (equalp (string ?h ?i ?\  ?t ?h ?e ?r ?e)
+(Assert-eq t (equalp (string ?h ?i ?\  ?t ?h ?e ?r ?e)
-			(vector ?h ?i ?\  ?t ?h ?e ?r ?e)))
+			(vector ?h ?i ?\  ?t ?h ?e ?r ?e))
 	  "check string and vector with same contents #'equalp, no constants")
-(Assert (eq t (equalp [?h ?i ?\  ?t ?h ?e ?r ?e]
+(Assert-eq t (equalp [?h ?i ?\  ?t ?h ?e ?r ?e]
-			(string ?h ?i ?\  ?t ?h ?e ?r ?e)))
+			(string ?h ?i ?\  ?t ?h ?e ?r ?e))
 	  "check string and vector with same contents #'equalp, vector constant")
-(Assert (eq t (equalp [0 1.0 0.0 0 1]
+(Assert-eq t (equalp [0 1.0 0.0 0 1]
-			(bit-vector 0 1 0 0 1)))
+			(bit-vector 0 1 0 0 1))
 	  "check vector and bit-vector with same contents #'equalp,\
 vector constant")
-(Assert (eq t (equalp #*01001
+(Assert-eq t (equalp #*01001
-			(vector 0 1.0 0.0 0 1)))
+			(vector 0 1.0 0.0 0 1))
 	  "check vector and bit-vector with same contents #'equalp,\
 bit-vector constant")
-(Assert (eq t (equalp ?\u00E9 Eacute-character))
+(Assert-eq t (equalp ?\u00E9 Eacute-character)
 	  "checking characters are case-insensitive, one constant")
-(Assert (eq nil (equalp ?\u00E9 (aref (format "%c" ?a) 0)))
+(Assert-eq nil (equalp ?\u00E9 (aref (format "%c" ?a) 0))
 	  "checking distinct characters are not equalp, one constant")
-(Assert (eq t (equalp t (and)))
+(Assert-eq t (equalp t (and))
 	  "checking symbols are correctly #'equalp")
-(Assert (eq nil (equalp t (or nil '#:t)))
+(Assert-eq nil (equalp t (or nil '#:t))
 	  "checking distinct symbols with the same name are not #'equalp")
-(Assert (eq t (equalp #s(char-table type generic data (?\u0080 "hi-there"))
+(Assert-eq t (equalp #s(char-table type generic data (?\u0080 "hi-there"))
 			(let ((aragh (make-char-table 'generic)))
 			  (put-char-table ?\u0080 "hi-there" aragh)
-			  aragh)))
+			  aragh))
 	  "checking #'equalp succeeds correctly, char-tables")
-(Assert (eq nil (equalp #s(char-table type generic data (?\u0080 "hi-there"))
+(Assert-eq nil (equalp #s(char-table type generic data (?\u0080 "hi-there"))
 			  (let ((aragh (make-char-table 'generic)))
 			    (put-char-table ?\u0080 "HI-THERE" aragh)
-			    aragh)))
+			    aragh))
 	  "checking #'equalp fails correctly, char-tables"))
 ;; There are more tests available for equalp here:
 ;;
 ;; http://www.parhasard.net/xemacs/equalp-tests.el

Mercurial > hg > xemacs-beta

comparison tests/automated/lisp-tests.el @ 4855:189fb67ca31a