diff tests/automated/extent-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 20ae8821c23d
children 0f66906b6e37
line wrap: on
line diff
--- a/tests/automated/extent-tests.el	Thu Jan 14 01:25:16 2010 -0600
+++ b/tests/automated/extent-tests.el	Thu Jan 14 02:18:03 2010 -0600
@@ -52,12 +52,12 @@
 
     ;; Put it in a buffer.
     (set-extent-endpoints extent 1 1 (current-buffer))
-    (Assert (eq (extent-object extent) (current-buffer)))
+    (Assert-eq (extent-object extent) (current-buffer))
 
     ;; And then into another buffer.
     (with-temp-buffer
       (set-extent-endpoints extent 1 1 (current-buffer))
-      (Assert (eq (extent-object extent) (current-buffer))))
+      (Assert-eq (extent-object extent) (current-buffer)))
 
     ;; Now that the buffer doesn't exist, extent should be detached
     ;; again.
@@ -65,39 +65,39 @@
 
     ;; This line crashes XEmacs 21.2.46 and prior.
     (set-extent-endpoints extent 1 (length string) string)
-    (Assert (eq (extent-object extent) string))
+    (Assert-eq (extent-object extent) string)
     )
 
   (let ((extent (make-extent 1 1)))
     ;; By default, extent should be closed-open
-    (Assert (eq (get extent 'start-closed) t))
-    (Assert (eq (get extent 'start-open) nil))
-    (Assert (eq (get extent 'end-open) t))
-    (Assert (eq (get extent 'end-closed) nil))
+    (Assert-eq (get extent 'start-closed) t)
+    (Assert-eq (get extent 'start-open) nil)
+    (Assert-eq (get extent 'end-open) t)
+    (Assert-eq (get extent 'end-closed) nil)
 
     ;; Make it closed-closed.
     (set-extent-property extent 'end-closed t)
 
-    (Assert (eq (get extent 'start-closed) t))
-    (Assert (eq (get extent 'start-open) nil))
-    (Assert (eq (get extent 'end-open) nil))
-    (Assert (eq (get extent 'end-closed) t))
+    (Assert-eq (get extent 'start-closed) t)
+    (Assert-eq (get extent 'start-open) nil)
+    (Assert-eq (get extent 'end-open) nil)
+    (Assert-eq (get extent 'end-closed) t)
 
     ;; open-closed
     (set-extent-property extent 'start-open t)
 
-    (Assert (eq (get extent 'start-closed) nil))
-    (Assert (eq (get extent 'start-open) t))
-    (Assert (eq (get extent 'end-open) nil))
-    (Assert (eq (get extent 'end-closed) t))
+    (Assert-eq (get extent 'start-closed) nil)
+    (Assert-eq (get extent 'start-open) t)
+    (Assert-eq (get extent 'end-open) nil)
+    (Assert-eq (get extent 'end-closed) t)
 
     ;; open-open
     (set-extent-property extent 'end-open t)
 
-    (Assert (eq (get extent 'start-closed) nil))
-    (Assert (eq (get extent 'start-open) t))
-    (Assert (eq (get extent 'end-open) t))
-    (Assert (eq (get extent 'end-closed) nil)))
+    (Assert-eq (get extent 'start-closed) nil)
+    (Assert-eq (get extent 'start-open) t)
+    (Assert-eq (get extent 'end-open) t)
+    (Assert-eq (get extent 'end-closed) nil))
 
   )
 
@@ -125,25 +125,25 @@
   (let ((e (make-extent 4 7)))
     ;; current state: "###[eee)###"
     ;;                 123 456 789
-    (Assert (equal (et-range e) '(4 7)))
+    (Assert-equal (et-range e) '(4 7))
 
     (et-insert-at "xxx" 4)
 
     ;; current state: "###[xxxeee)###"
     ;;                 123 456789 012
-    (Assert (equal (et-range e) '(4 10)))
+    (Assert-equal (et-range e) '(4 10))
 
     (et-insert-at "yyy" 7)
 
     ;; current state: "###[xxxyyyeee)###"
     ;;                 123 456789012 345
-    (Assert (equal (et-range e) '(4 13)))
+    (Assert-equal (et-range e) '(4 13))
 
     (et-insert-at "zzz" 13)
 
     ;; current state: "###[xxxyyyeee)zzz###"
     ;;                 123 456789012 345678
-    (Assert (equal (et-range e) '(4 13)))
+    (Assert-equal (et-range e) '(4 13))
     ))
 
 ;; closed-closed
@@ -155,25 +155,25 @@
 
     ;; current state: "###[eee]###"
     ;;                 123 456 789
-    (Assert (equal (et-range e) '(4 7)))
+    (Assert-equal (et-range e) '(4 7))
 
     (et-insert-at "xxx" 4)
 
     ;; current state: "###[xxxeee]###"
     ;;                 123 456789 012
-    (Assert (equal (et-range e) '(4 10)))
+    (Assert-equal (et-range e) '(4 10))
 
     (et-insert-at "yyy" 7)
 
     ;; current state: "###[xxxyyyeee]###"
     ;;                 123 456789012 345
-    (Assert (equal (et-range e) '(4 13)))
+    (Assert-equal (et-range e) '(4 13))
 
     (et-insert-at "zzz" 13)
 
     ;; current state: "###[xxxyyyeeezzz]###"
     ;;                 123 456789012345 678
-    (Assert (equal (et-range e) '(4 16)))
+    (Assert-equal (et-range e) '(4 16))
     ))
 
 ;; open-closed
@@ -186,25 +186,25 @@
 
     ;; current state: "###(eee]###"
     ;;                 123 456 789
-    (Assert (equal (et-range e) '(4 7)))
+    (Assert-equal (et-range e) '(4 7))
 
     (et-insert-at "xxx" 4)
 
     ;; current state: "###xxx(eee]###"
     ;;                 123456 789 012
-    (Assert (equal (et-range e) '(7 10)))
+    (Assert-equal (et-range e) '(7 10))
 
     (et-insert-at "yyy" 8)
 
     ;; current state: "###xxx(eyyyee]###"
     ;;                 123456 789012 345
-    (Assert (equal (et-range e) '(7 13)))
+    (Assert-equal (et-range e) '(7 13))
 
     (et-insert-at "zzz" 13)
 
     ;; current state: "###xxx(eyyyeezzz]###"
     ;;                 123456 789012345 678
-    (Assert (equal (et-range e) '(7 16)))
+    (Assert-equal (et-range e) '(7 16))
     ))
 
 ;; open-open
@@ -216,25 +216,25 @@
 
     ;; current state: "###(eee)###"
     ;;                 123 456 789
-    (Assert (equal (et-range e) '(4 7)))
+    (Assert-equal (et-range e) '(4 7))
 
     (et-insert-at "xxx" 4)
 
     ;; current state: "###xxx(eee)###"
     ;;                 123456 789 012
-    (Assert (equal (et-range e) '(7 10)))
+    (Assert-equal (et-range e) '(7 10))
 
     (et-insert-at "yyy" 8)
 
     ;; current state: "###xxx(eyyyee)###"
     ;;                 123456 789012 345
-    (Assert (equal (et-range e) '(7 13)))
+    (Assert-equal (et-range e) '(7 13))
 
     (et-insert-at "zzz" 13)
 
     ;; current state: "###xxx(eyyyee)zzz###"
     ;;                 123456 789012 345678
-    (Assert (equal (et-range e) '(7 13)))
+    (Assert-equal (et-range e) '(7 13))
     ))
 
 
@@ -256,31 +256,31 @@
 
       ;; current state: xx[xxxxxx]xx
       ;;                12 345678 90
-      (Assert (equal (et-range e) '(3 9)))
+      (Assert-equal (et-range e) '(3 9))
 
       (delete-region 1 2)
 
       ;; current state: x[xxxxxx]xx
       ;;                1 234567 89
-      (Assert (equal (et-range e) '(2 8)))
+      (Assert-equal (et-range e) '(2 8))
 
       (delete-region 2 4)
 
       ;; current state: x[xxxx]xx
       ;;                1 2345 67
-      (Assert (equal (et-range e) '(2 6)))
+      (Assert-equal (et-range e) '(2 6))
 
       (delete-region 1 3)
 
       ;; current state: [xxx]xx
       ;;                 123 45
-      (Assert (equal (et-range e) '(1 4)))
+      (Assert-equal (et-range e) '(1 4))
 
       (delete-region 3 5)
 
       ;; current state: [xx]x
       ;;                 12 3
-      (Assert (equal (et-range e) '(1 3)))
+      (Assert-equal (et-range e) '(1 3))
 
       )))
 
@@ -329,7 +329,7 @@
       (delete-region 4 6)
       ;; ###[]###
       (Assert (not (extent-detached-p e)))
-      (Assert (equal (et-range e) '(4 4)))
+      (Assert-equal (et-range e) '(4 4))
       ))
   )
 
@@ -343,7 +343,7 @@
   (insert "######")
   (let ((e (make-extent 4 4)))
     (et-insert-at "foo" 4)
-    (Assert (equal (et-range e) '(4 4)))))
+    (Assert-equal (et-range e) '(4 4))))
 
 ;; open-closed (should move)
 (with-temp-buffer
@@ -352,7 +352,7 @@
     (put e 'start-open t)
     (put e 'end-closed t)
     (et-insert-at "foo" 4)
-    (Assert (equal (et-range e) '(7 7)))))
+    (Assert-equal (et-range e) '(7 7))))
 
 ;; closed-closed (should extend)
 (with-temp-buffer
@@ -360,7 +360,7 @@
   (let ((e (make-extent 4 4)))
     (put e 'end-closed t)
     (et-insert-at "foo" 4)
-    (Assert (equal (et-range e) '(4 7)))))
+    (Assert-equal (et-range e) '(4 7))))
 
 ;; open-open (illegal; forced to behave like closed-open)
 (with-temp-buffer
@@ -368,4 +368,4 @@
   (let ((e (make-extent 4 4)))
     (put e 'start-open t)
     (et-insert-at "foo" 4)
-    (Assert (equal (et-range e) '(4 4)))))
+    (Assert-equal (et-range e) '(4 4))))