emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/compat f364a280aa 02/13: Add should-equal


From: ELPA Syncer
Subject: [elpa] externals/compat f364a280aa 02/13: Add should-equal
Date: Wed, 4 Jan 2023 09:57:30 -0500 (EST)

branch: externals/compat
commit f364a280aa9bf711314e1f2f9bb2db426cf0f1b7
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Add should-equal
---
 compat-tests.el | 1576 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 789 insertions(+), 787 deletions(-)

diff --git a/compat-tests.el b/compat-tests.el
index ce5d025c0d..0d24c84bf0 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -42,6 +42,9 @@
 (require 'text-property-search nil t)
 (setq ert-quiet t)
 
+(defmacro should-equal (a b)
+  `(should (equal ,a ,b)))
+
 (ert-deftest compat-call ()
   (let (list)
     (setq list (compat-call plist-put list "first" 1 #'string=))
@@ -203,25 +206,25 @@
   (should (compat-call >= 0.4 0.2 0 -0.1)))
 
 (ert-deftest mapcan ()
-  (should (equal nil (mapcan #'identity nil)))
-  (should (equal (list 1)
+  (should-not (mapcan #'identity nil))
+  (should-equal (list 1)
                  (mapcan #'identity
-                         (list (list 1)))))
-  (should (equal (list 1 2 3 4)
+                         (list (list 1))))
+  (should-equal (list 1 2 3 4)
                  (mapcan #'identity
-                         (list (list 1) (list 2 3) (list 4)))))
-  (should (equal (list (list 1) (list 2 3) (list 4))
+                         (list (list 1) (list 2 3) (list 4))))
+  (should-equal (list (list 1) (list 2 3) (list 4))
                  (mapcan #'list
-                         (list (list 1) (list 2 3) (list 4)))))
-  (should (equal (list 1 2 3 4)
+                         (list (list 1) (list 2 3) (list 4))))
+  (should-equal (list 1 2 3 4)
                  (mapcan #'identity
-                         (list (list 1) (list) (list 2 3) (list 4)))))
-  (should (equal (list (list 1) (list) (list 2 3) (list 4))
+                         (list (list 1) (list) (list 2 3) (list 4))))
+  (should-equal (list (list 1) (list) (list 2 3) (list 4))
                  (mapcan #'list
-                         (list (list 1) (list) (list 2 3) (list 4)))))
-  (should (equal (list)
+                         (list (list 1) (list) (list 2 3) (list 4))))
+  (should-equal (list)
                  (mapcan #'identity
-                         (list (list) (list) (list) (list))))))
+                         (list (list) (list) (list) (list)))))
 
 (ert-deftest xor ()
   (should (xor t nil))
@@ -275,14 +278,14 @@
 
 (ert-deftest ensure-list ()
   (should-not (ensure-list nil))           ;; empty list
-  (should (equal '(1) (ensure-list '(1))))         ;; single element list
-  (should (equal '(1 2 3) (ensure-list '(1 2 3)))) ;; multiple element list
-  (should (equal '(1) (ensure-list 1))))           ;; atom
+  (should-equal '(1) (ensure-list '(1)))         ;; single element list
+  (should-equal '(1 2 3) (ensure-list '(1 2 3))) ;; multiple element list
+  (should-equal '(1) (ensure-list 1)))           ;; atom
 
 (ert-deftest proper-list-p ()
-  (should (equal 0 (proper-list-p ())))            ;; empty list
-  (should (equal 1 (proper-list-p '(1))))          ;; single element
-  (should (equal 3 (proper-list-p '(1 2 3))))      ;; multiple elements
+  (should-equal 0 (proper-list-p ()))            ;; empty list
+  (should-equal 1 (proper-list-p '(1)))          ;; single element
+  (should-equal 3 (proper-list-p '(1 2 3)))      ;; multiple elements
   (should-not (proper-list-p '(1 . 2)))    ;; cons
   (should-not (proper-list-p '(1 2 . 3)))  ;; dotted
   (should-not (let ((l (list 1 2 3)))       ;; circular
@@ -295,37 +298,37 @@
   (should-not (proper-list-p [1 2 3])))
 
 (ert-deftest always ()
-  (should (equal t (always)))                      ;; no arguments
-  (should (equal t (always 1)))                    ;; single argument
-  (should (equal t (always 1 2 3 4))))             ;; multiple arguments
+  (should-equal t (always))                      ;; no arguments
+  (should-equal t (always 1))                    ;; single argument
+  (should-equal t (always 1 2 3 4)))             ;; multiple arguments
 
 (ert-deftest file-size-human-readable ()
-  (should (equal "1000" (compat-call file-size-human-readable 1000)))
-  (should (equal "1k" (compat-call file-size-human-readable 1024)))
-  (should (equal "1M" (compat-call file-size-human-readable (* 1024 1024))))
-  (should (equal "1G" (compat-call file-size-human-readable (expt 1024 3))))
-  (should (equal "1T" (compat-call file-size-human-readable (expt 1024 4))))
-  (should (equal "1k" (compat-call file-size-human-readable 1000 'si)))
-  (should (equal "1KiB" (compat-call file-size-human-readable 1024 'iec)))
-  (should (equal "1KiB" (compat-call file-size-human-readable 1024 'iec)))
-  (should (equal "1 KiB" (compat-call file-size-human-readable 1024 'iec " ")))
-  (should (equal "1KiA" (compat-call file-size-human-readable 1024 'iec nil 
"A")))
-  (should (equal "1 KiA" (compat-call file-size-human-readable 1024 'iec " " 
"A")))
-  (should (equal "1kA" (compat-call file-size-human-readable 1000 'si nil 
"A")))
-  (should (equal "1 k" (compat-call file-size-human-readable 1000 'si " ")))
-  (should (equal "1 kA" (compat-call file-size-human-readable 1000 'si " " 
"A"))))
+  (should-equal "1000" (compat-call file-size-human-readable 1000))
+  (should-equal "1k" (compat-call file-size-human-readable 1024))
+  (should-equal "1M" (compat-call file-size-human-readable (* 1024 1024)))
+  (should-equal "1G" (compat-call file-size-human-readable (expt 1024 3)))
+  (should-equal "1T" (compat-call file-size-human-readable (expt 1024 4)))
+  (should-equal "1k" (compat-call file-size-human-readable 1000 'si))
+  (should-equal "1KiB" (compat-call file-size-human-readable 1024 'iec))
+  (should-equal "1KiB" (compat-call file-size-human-readable 1024 'iec))
+  (should-equal "1 KiB" (compat-call file-size-human-readable 1024 'iec " "))
+  (should-equal "1KiA" (compat-call file-size-human-readable 1024 'iec nil 
"A"))
+  (should-equal "1 KiA" (compat-call file-size-human-readable 1024 'iec " " 
"A"))
+  (should-equal "1kA" (compat-call file-size-human-readable 1000 'si nil "A"))
+  (should-equal "1 k" (compat-call file-size-human-readable 1000 'si " "))
+  (should-equal "1 kA" (compat-call file-size-human-readable 1000 'si " " 
"A")))
 
 (ert-deftest file-modes-number-to-symbolic ()
-  (should (equal "-rwx------" (file-modes-number-to-symbolic #o700)))
-  (should (equal "-rwxrwx---" (file-modes-number-to-symbolic #o770)))
-  (should (equal "-rwx---rwx" (file-modes-number-to-symbolic #o707)))
-  (should (equal "-rw-r-xr--" (file-modes-number-to-symbolic #o654)))
-  (should (equal "--wx-w---x" (file-modes-number-to-symbolic #o321)))
-  (should (equal "drwx------" (file-modes-number-to-symbolic #o700 ?d)))
-  (should (equal "?rwx------" (file-modes-number-to-symbolic #o700 ??)))
-  (should (equal "lrwx------" (file-modes-number-to-symbolic #o120700)))
-  (should (equal "prwx------" (file-modes-number-to-symbolic #o10700)))
-  (should (equal "-rwx------" (file-modes-number-to-symbolic #o30700))))
+  (should-equal "-rwx------" (file-modes-number-to-symbolic #o700))
+  (should-equal "-rwxrwx---" (file-modes-number-to-symbolic #o770))
+  (should-equal "-rwx---rwx" (file-modes-number-to-symbolic #o707))
+  (should-equal "-rw-r-xr--" (file-modes-number-to-symbolic #o654))
+  (should-equal "--wx-w---x" (file-modes-number-to-symbolic #o321))
+  (should-equal "drwx------" (file-modes-number-to-symbolic #o700 ?d))
+  (should-equal "?rwx------" (file-modes-number-to-symbolic #o700 ??))
+  (should-equal "lrwx------" (file-modes-number-to-symbolic #o120700))
+  (should-equal "prwx------" (file-modes-number-to-symbolic #o10700))
+  (should-equal "-rwx------" (file-modes-number-to-symbolic #o30700)))
 
 (ert-deftest file-name-absolute-p ()   ;assuming unix
   (should (file-name-absolute-p "/"))
@@ -343,18 +346,17 @@
   (should (file-name-absolute-p "~root/file")))
 
 (ert-deftest file-local-name ()
-  (should (equal "" (file-local-name "")))
-  (should (equal "foo" (file-local-name "foo")))
-  (should (equal "/bar/foo" (file-local-name "/bar/foo")))
+  (should-equal "" (file-local-name ""))
+  (should-equal "foo" (file-local-name "foo"))
+  (should-equal "/bar/foo" (file-local-name "/bar/foo"))
   ;; These tests fails prior to Emacs 26, because /ssh:foo was a valid
   ;; TRAMP path back then.
-  ;;
-  ;; (should (equal "/ssh:foo" "/ssh:foo")
-  ;; (should (equal "/ssh:/bar/foo" "/ssh:/bar/foo")
-  (should (equal "foo" (file-local-name "/ssh::foo")))
-  (should (equal "/bar/foo" (file-local-name "/ssh::/bar/foo")))
-  (should (equal ":foo" (file-local-name "/ssh:::foo")))
-  (should (equal ":/bar/foo" (file-local-name "/ssh:::/bar/foo"))))
+  ;; (should-equal "/ssh:foo" (file-local-name "/ssh:foo"))
+  ;; (should-equal "/ssh:/bar/foo" (file-local-name "/ssh:/bar/foo"))
+  (should-equal "foo" (file-local-name "/ssh::foo"))
+  (should-equal "/bar/foo" (file-local-name "/ssh::/bar/foo"))
+  (should-equal ":foo" (file-local-name "/ssh:::foo"))
+  (should-equal ":/bar/foo" (file-local-name "/ssh:::/bar/foo")))
 
 (ert-deftest file-name-quoted-p ()
   (should-not (compat-call file-name-quoted-p ""))
@@ -371,29 +373,29 @@
   )
 
 (ert-deftest file-name-quote ()
-  (should (equal "/:" (compat-call file-name-quote "")))
-  (should (equal "/::"(compat-call file-name-quote  ":")))
-  (should (equal "/:/" (compat-call file-name-quote "/")))
-  (should (equal "/:" (compat-call file-name-quote "/:")))
-  (should (equal "/:a" (compat-call file-name-quote "a")))
-  (should (equal "/::a" (compat-call file-name-quote ":a")))
-  (should (equal "/:/a" (compat-call file-name-quote "/a")))
-  (should (equal "/:a" (compat-call file-name-quote "/:a")))
-  (should (equal (concat "/ssh:" (system-name) ":/:a") (compat-call 
file-name-quote "/ssh::a"))))
+  (should-equal "/:" (compat-call file-name-quote ""))
+  (should-equal "/::"(compat-call file-name-quote  ":"))
+  (should-equal "/:/" (compat-call file-name-quote "/"))
+  (should-equal "/:" (compat-call file-name-quote "/:"))
+  (should-equal "/:a" (compat-call file-name-quote "a"))
+  (should-equal "/::a" (compat-call file-name-quote ":a"))
+  (should-equal "/:/a" (compat-call file-name-quote "/a"))
+  (should-equal "/:a" (compat-call file-name-quote "/:a"))
+  (should-equal (concat "/ssh:" (system-name) ":/:a") (compat-call 
file-name-quote "/ssh::a")))
 
 (ert-deftest file-name-with-extension ()
-  (should (equal "file.ext" (file-name-with-extension "file" "ext")))
-  (should (equal "file.ext" (file-name-with-extension "file" ".ext")))
-  (should (equal "file.ext" (file-name-with-extension "file." ".ext")))
-  (should (equal "file..ext" (file-name-with-extension "file.." ".ext")))
-  (should (equal "file..ext" (file-name-with-extension "file." "..ext")))
-  (should (equal "file...ext" (file-name-with-extension "file.." "..ext")))
-  (should (equal "/abs/file.ext" (file-name-with-extension "/abs/file" "ext")))
-  (should (equal "/abs/file.ext" (file-name-with-extension "/abs/file" 
".ext")))
-  (should (equal "/abs/file.ext" (file-name-with-extension "/abs/file." 
".ext")))
-  (should (equal "/abs/file..ext" (file-name-with-extension "/abs/file.." 
".ext")))
-  (should (equal "/abs/file..ext" (file-name-with-extension "/abs/file." 
"..ext")))
-  (should (equal "/abs/file...ext" (file-name-with-extension "/abs/file.." 
"..ext")))
+  (should-equal "file.ext" (file-name-with-extension "file" "ext"))
+  (should-equal "file.ext" (file-name-with-extension "file" ".ext"))
+  (should-equal "file.ext" (file-name-with-extension "file." ".ext"))
+  (should-equal "file..ext" (file-name-with-extension "file.." ".ext"))
+  (should-equal "file..ext" (file-name-with-extension "file." "..ext"))
+  (should-equal "file...ext" (file-name-with-extension "file.." "..ext"))
+  (should-equal "/abs/file.ext" (file-name-with-extension "/abs/file" "ext"))
+  (should-equal "/abs/file.ext" (file-name-with-extension "/abs/file" ".ext"))
+  (should-equal "/abs/file.ext" (file-name-with-extension "/abs/file." ".ext"))
+  (should-equal "/abs/file..ext" (file-name-with-extension "/abs/file.." 
".ext"))
+  (should-equal "/abs/file..ext" (file-name-with-extension "/abs/file." 
"..ext"))
+  (should-equal "/abs/file...ext" (file-name-with-extension "/abs/file.." 
"..ext"))
   (should-error (file-name-with-extension "file" "") :type 'error)
   (should-error (file-name-with-extension "" "ext") :type 'error)
   (should-error (file-name-with-extension "file" "") :type 'error)
@@ -402,21 +404,21 @@
 
 (ert-deftest flatten-tree ()
   ;; Example from docstring:
-  (should (equal '(1 2 3 4 5 6 7) (flatten-tree '(1 (2 . 3) nil (4 5 (6)) 7))))
+  (should-equal '(1 2 3 4 5 6 7) (flatten-tree '(1 (2 . 3) nil (4 5 (6)) 7)))
   ;; Trivial example
-  (should (equal nil (flatten-tree ())))
+  (should-not (flatten-tree ()))
   ;; Simple examples
-  (should (equal '(1) (flatten-tree '(1))))
-  (should (equal '(1 2) (flatten-tree '(1 2))))
-  (should (equal '(1 2 3) (flatten-tree '(1 2 3))))
+  (should-equal '(1) (flatten-tree '(1)))
+  (should-equal '(1 2) (flatten-tree '(1 2)))
+  (should-equal '(1 2 3) (flatten-tree '(1 2 3)))
   ;; Regular sublists
-  (should (equal '(1) (flatten-tree '((1)))))
-  (should (equal '(1 2) (flatten-tree '((1) (2)))))
-  (should (equal '(1 2 3) (flatten-tree '((1) (2) (3)))))
+  (should-equal '(1) (flatten-tree '((1))))
+  (should-equal '(1 2) (flatten-tree '((1) (2))))
+  (should-equal '(1 2 3) (flatten-tree '((1) (2) (3))))
   ;; Complex examples
-  (should (equal '(1) (flatten-tree '(((((1))))))))
-  (should (equal '(1 2 3 4) (flatten-tree '((1) nil 2 ((3 4))))))
-  (should (equal '(1 2 3 4) (flatten-tree '(((1 nil)) 2 (((3 nil nil) 4)))))))
+  (should-equal '(1) (flatten-tree '(((((1)))))))
+  (should-equal '(1 2 3 4) (flatten-tree '((1) nil 2 ((3 4)))))
+  (should-equal '(1 2 3 4) (flatten-tree '(((1 nil)) 2 (((3 nil nil) 4))))))
 
 (ert-deftest string-empty-p ()
   (should (string-empty-p ""))
@@ -425,45 +427,45 @@
   (should-not (string-empty-p (make-string 1 ?x))))
 
 (ert-deftest string-join ()
-  (should (equal "" (string-join '(""))))
-  (should (equal "" (string-join '("") " ")))
-  (should (equal "a" (string-join '("a"))))
-  (should (equal "a" (string-join '("a") " ")))
-  (should (equal "abc" (string-join '("a" "b" "c"))))
-  (should (equal "a b c" (string-join '("a" "b" "c") " "))))
+  (should-equal "" (string-join '("")))
+  (should-equal "" (string-join '("") " "))
+  (should-equal "a" (string-join '("a")))
+  (should-equal "a" (string-join '("a") " "))
+  (should-equal "abc" (string-join '("a" "b" "c")))
+  (should-equal "a b c" (string-join '("a" "b" "c") " ")))
 
 (ert-deftest string-blank-p ()
-  (should (equal 0 (string-blank-p "")))
-  (should (equal 0 (string-blank-p " ")))
-  (should (equal 0 (string-blank-p (make-string 0 ?x))))
-  (should (equal nil (string-blank-p (make-string 1 ?x)))))
+  (should-equal 0 (string-blank-p ""))
+  (should-equal 0 (string-blank-p " "))
+  (should-equal 0 (string-blank-p (make-string 0 ?x)))
+  (should-not (string-blank-p (make-string 1 ?x))))
 
 (ert-deftest string-remove-prefix ()
-  (should (equal "" (string-remove-prefix "" "")))
-  (should (equal "a" (string-remove-prefix "" "a")))
-  (should (equal "" (string-remove-prefix "a" "")))
-  (should (equal "bc" (string-remove-prefix "a" "abc")))
-  (should (equal "abc" (string-remove-prefix "c" "abc")))
-  (should (equal "bbcc" (string-remove-prefix "aa" "aabbcc")))
-  (should (equal "aabbcc" (string-remove-prefix "bb" "aabbcc")))
-  (should (equal "aabbcc" (string-remove-prefix "cc" "aabbcc")))
-  (should (equal "aabbcc" (string-remove-prefix "dd" "aabbcc"))))
+  (should-equal "" (string-remove-prefix "" ""))
+  (should-equal "a" (string-remove-prefix "" "a"))
+  (should-equal "" (string-remove-prefix "a" ""))
+  (should-equal "bc" (string-remove-prefix "a" "abc"))
+  (should-equal "abc" (string-remove-prefix "c" "abc"))
+  (should-equal "bbcc" (string-remove-prefix "aa" "aabbcc"))
+  (should-equal "aabbcc" (string-remove-prefix "bb" "aabbcc"))
+  (should-equal "aabbcc" (string-remove-prefix "cc" "aabbcc"))
+  (should-equal "aabbcc" (string-remove-prefix "dd" "aabbcc")))
 
 (ert-deftest string-remove-suffix ()
-  (should (equal "" (string-remove-suffix "" "")))
-  (should (equal "a" (string-remove-suffix "" "a")))
-  (should (equal "" (string-remove-suffix "a" "")))
-  (should (equal "abc" (string-remove-suffix "a" "abc")))
-  (should (equal "ab" (string-remove-suffix "c" "abc")))
-  (should (equal "aabbcc" (string-remove-suffix "aa" "aabbcc")))
-  (should (equal "aabbcc" (string-remove-suffix "bb" "aabbcc")))
-  (should (equal "aabb" (string-remove-suffix "cc" "aabbcc")))
-  (should (equal "aabbcc" (string-remove-suffix "dd" "aabbcc"))))
+  (should-equal "" (string-remove-suffix "" ""))
+  (should-equal "a" (string-remove-suffix "" "a"))
+  (should-equal "" (string-remove-suffix "a" ""))
+  (should-equal "abc" (string-remove-suffix "a" "abc"))
+  (should-equal "ab" (string-remove-suffix "c" "abc"))
+  (should-equal "aabbcc" (string-remove-suffix "aa" "aabbcc"))
+  (should-equal "aabbcc" (string-remove-suffix "bb" "aabbcc"))
+  (should-equal "aabb" (string-remove-suffix "cc" "aabbcc"))
+  (should-equal "aabbcc" (string-remove-suffix "dd" "aabbcc")))
 
 (ert-deftest string-distance ()
-  (should (equal 3 (string-distance "kitten" "sitting")))    ;from wikipedia
+  (should-equal 3 (string-distance "kitten" "sitting"))    ;from wikipedia
   (if (version<= "28" emacs-version) ;trivial examples
-      (should (equal 0 (string-distance "" "")))
+      (should-equal 0 (string-distance "" ""))
     ;; Up until Emacs 28, `string-distance' had a bug
     ;; when comparing two empty strings. This was fixed
     ;; in the following commit:
@@ -474,245 +476,245 @@
     ;; TODO
     ;; (should (= (string-distance "" "") 0))
     )
-  (should (equal 0 (string-distance "a" "a")))
-  (should (equal 1 (string-distance "" "a")))
-  (should (equal 1 (string-distance "b" "a")))
-  (should (equal 2 (string-distance "aa" "bb")))
-  (should (equal 2 (string-distance "aa" "bba")))
-  (should (equal 2 (string-distance "aaa" "bba")))
-  (should (equal 3 (string-distance "a" "あ" t)))             ;byte example
-  (should (equal 1 (string-distance "a" "あ"))))
+  (should-equal 0 (string-distance "a" "a"))
+  (should-equal 1 (string-distance "" "a"))
+  (should-equal 1 (string-distance "b" "a"))
+  (should-equal 2 (string-distance "aa" "bb"))
+  (should-equal 2 (string-distance "aa" "bba"))
+  (should-equal 2 (string-distance "aaa" "bba"))
+  (should-equal 3 (string-distance "a" "あ" t))             ;byte example
+  (should-equal 1 (string-distance "a" "あ")))
 
 (ert-deftest string-width ()
-  (should (equal 0 (compat-string-width "")))                         ;; 
Obsolete
-  (should (equal 0 (compat-call string-width "")))
-  (should (equal 3 (compat-call string-width "abc")))                 ;; no 
argument
-  (should (equal 5 (compat-call string-width "abcあ")))
-  (should (equal (1+ tab-width) (compat-call string-width "a   ")))
-  (should (equal 2 (compat-call string-width "abc" 1)))               ;; with 
from
-  (should (equal 4 (compat-call string-width "abcあ" 1)))
-  (should (equal tab-width (compat-call string-width "a        " 1)))
-  (should (equal 2 (compat-call string-width "abc" 0 2)))             ;; with 
to
-  (should (equal 3 (compat-call string-width "abcあ" 0 3)))
-  (should (equal 1 (compat-call string-width "a        " 0 1)))
-  (should (equal 1 (compat-call string-width "abc" 1 2)))             ;; with 
from and to
-  (should (equal 2 (compat-call string-width "abcあ" 3 4)))
-  (should (equal 0 (compat-call string-width "a        " 1 1))))
+  (should-equal 0 (compat-string-width ""))                         ;; Obsolete
+  (should-equal 0 (compat-call string-width ""))
+  (should-equal 3 (compat-call string-width "abc"))                 ;; no 
argument
+  (should-equal 5 (compat-call string-width "abcあ"))
+  (should-equal (1+ tab-width) (compat-call string-width "a    "))
+  (should-equal 2 (compat-call string-width "abc" 1))               ;; with 
from
+  (should-equal 4 (compat-call string-width "abcあ" 1))
+  (should-equal tab-width (compat-call string-width "a " 1))
+  (should-equal 2 (compat-call string-width "abc" 0 2))             ;; with to
+  (should-equal 3 (compat-call string-width "abcあ" 0 3))
+  (should-equal 1 (compat-call string-width "a " 0 1))
+  (should-equal 1 (compat-call string-width "abc" 1 2))             ;; with 
from and to
+  (should-equal 2 (compat-call string-width "abcあ" 3 4))
+  (should-equal 0 (compat-call string-width "a " 1 1)))
 
 (ert-deftest string-trim-left ()
-  (should (equal "a" (compat-string-trim-left " a"))) ;; Obsolete
-  (should (equal "a" (compat-call string-trim-left "---a" "-+"))) ;; 
Additional regexp
-  (should (equal "" (compat-call string-trim-left "")))                        
  ;empty string
-  (should (equal "a" (compat-call string-trim-left "a")))                      
  ;"full" string
-  (should (equal "aaa" (compat-call string-trim-left "aaa")))
-  (should (equal "へっろ" (compat-call string-trim-left "へっろ")))
-  (should (equal "hello world" (compat-call string-trim-left "hello world")))
-  (should (equal "a " (compat-call string-trim-left "a ")))                    
    ;right trailing
-  (should (equal "aaa " (compat-call string-trim-left "aaa ")))
-  (should (equal "a    " (compat-call string-trim-left "a    ")))
-  (should (equal "a\t\t" (compat-call string-trim-left "a\t\t")))
-  (should (equal "a\n  \t" (compat-call string-trim-left "a\n  \t")))
-  (should (equal "a" (compat-call string-trim-left " a")))                     
   ;left trailing
-  (should (equal "aaa" (compat-call string-trim-left " aaa")))
-  (should (equal "a" (compat-call string-trim-left "a")))
-  (should (equal "a" (compat-call string-trim-left "\t\ta")))
-  (should (equal "a" (compat-call string-trim-left "\n  \ta")))
-  (should (equal "a " (compat-call string-trim-left " a ")))                   
     ;both trailing
-  (should (equal "aaa  " (compat-call string-trim-left " aaa  ")))
-  (should (equal "a\t\n" (compat-call string-trim-left "\t\ta\t\n")))
-  (should (equal "a  \n" (compat-call string-trim-left "\n  \ta  \n"))))
+  (should-equal "a" (compat-string-trim-left " a")) ;; Obsolete
+  (should-equal "a" (compat-call string-trim-left "---a" "-+")) ;; Additional 
regexp
+  (should-equal "" (compat-call string-trim-left ""))                          
;empty string
+  (should-equal "a" (compat-call string-trim-left "a"))                        
;"full" string
+  (should-equal "aaa" (compat-call string-trim-left "aaa"))
+  (should-equal "へっろ" (compat-call string-trim-left "へっろ"))
+  (should-equal "hello world" (compat-call string-trim-left "hello world"))
+  (should-equal "a " (compat-call string-trim-left "a "))                      
  ;right trailing
+  (should-equal "aaa " (compat-call string-trim-left "aaa "))
+  (should-equal "a    " (compat-call string-trim-left "a    "))
+  (should-equal "a\t\t" (compat-call string-trim-left "a\t\t"))
+  (should-equal "a\n  \t" (compat-call string-trim-left "a\n  \t"))
+  (should-equal "a" (compat-call string-trim-left " a"))                       
 ;left trailing
+  (should-equal "aaa" (compat-call string-trim-left " aaa"))
+  (should-equal "a" (compat-call string-trim-left "a"))
+  (should-equal "a" (compat-call string-trim-left "\t\ta"))
+  (should-equal "a" (compat-call string-trim-left "\n  \ta"))
+  (should-equal "a " (compat-call string-trim-left " a "))                     
  ;both trailing
+  (should-equal "aaa  " (compat-call string-trim-left " aaa  "))
+  (should-equal "a\t\n" (compat-call string-trim-left "\t\ta\t\n"))
+  (should-equal "a  \n" (compat-call string-trim-left "\n  \ta  \n")))
 
 (ert-deftest string-trim-right ()
-  (should (equal "a" (compat-string-trim-right "a    "))) ;; Obsolete
-  (should (equal "a" (compat-call string-trim-right "a---" "-+"))) ;; 
Additional regexp
-  (should (equal "" (compat-call string-trim-right "")))                       
   ;empty string
-  (should (equal "a" (compat-call string-trim-right "a")))                     
   ;"full" string
-  (should (equal "aaa" (compat-call string-trim-right "aaa")))
-  (should (equal "へっろ" (compat-call string-trim-right "へっろ")))
-  (should (equal "hello world" (compat-call string-trim-right "hello world")))
-  (should (equal "a" (compat-call string-trim-right "a")))                     
 ;right trailing
-  (should (equal "aaa" (compat-call string-trim-right "aaa")))
-  (should (equal "a" (compat-call string-trim-right "a    ")))
-  (should (equal "a" (compat-call string-trim-right "a\t\t")))
-  (should (equal "a" (compat-call string-trim-right "a\n  \t")))
-  (should (equal " a" (compat-call string-trim-right " a")))                   
    ;left trailing
-  (should (equal " aaa" (compat-call string-trim-right " aaa")))
-  (should (equal "a" (compat-call string-trim-right "a")))
-  (should (equal "\t\ta" (compat-call string-trim-right "\t\ta")))
-  (should (equal "\n  \ta" (compat-call string-trim-right "\n  \ta")))
-  (should (equal " a" (compat-call string-trim-right " a ")))                  
      ;both trailing
-  (should (equal " aaa" (compat-call string-trim-right " aaa")))
-  (should (equal "\t\ta" (compat-call string-trim-right "\t\ta\t\n")))
-  (should (equal "\n  \ta" (compat-call string-trim-right "\n  \ta  \n"))))
+  (should-equal "a" (compat-string-trim-right "a    ")) ;; Obsolete
+  (should-equal "a" (compat-call string-trim-right "a---" "-+")) ;; Additional 
regexp
+  (should-equal "" (compat-call string-trim-right ""))                         
 ;empty string
+  (should-equal "a" (compat-call string-trim-right "a"))                       
 ;"full" string
+  (should-equal "aaa" (compat-call string-trim-right "aaa"))
+  (should-equal "へっろ" (compat-call string-trim-right "へっろ"))
+  (should-equal "hello world" (compat-call string-trim-right "hello world"))
+  (should-equal "a" (compat-call string-trim-right "a"))                      
;right trailing
+  (should-equal "aaa" (compat-call string-trim-right "aaa"))
+  (should-equal "a" (compat-call string-trim-right "a    "))
+  (should-equal "a" (compat-call string-trim-right "a\t\t"))
+  (should-equal "a" (compat-call string-trim-right "a\n  \t"))
+  (should-equal " a" (compat-call string-trim-right " a"))                     
  ;left trailing
+  (should-equal " aaa" (compat-call string-trim-right " aaa"))
+  (should-equal "a" (compat-call string-trim-right "a"))
+  (should-equal "\t\ta" (compat-call string-trim-right "\t\ta"))
+  (should-equal "\n  \ta" (compat-call string-trim-right "\n  \ta"))
+  (should-equal " a" (compat-call string-trim-right " a "))                    
    ;both trailing
+  (should-equal " aaa" (compat-call string-trim-right " aaa"))
+  (should-equal "\t\ta" (compat-call string-trim-right "\t\ta\t\n"))
+  (should-equal "\n  \ta" (compat-call string-trim-right "\n  \ta  \n")))
 
 (ert-deftest string-trim ()
-  (should (equal "aaa" (compat-string-trim " aaa  "))) ;; Obsolete
-  (should (equal "aaa" (compat-call string-trim "--aaa__" "-+" "_+"))) ;; 
Additional regexp
-  (should (equal "" (compat-call string-trim "")))                          
;empty string
-  (should (equal "a" (compat-call string-trim "a")))                        
;"full" string
-  (should (equal "aaa" (compat-call string-trim "aaa")))
-  (should (equal "へっろ" (compat-call string-trim "へっろ")))
-  (should (equal "hello world" (compat-call string-trim "hello world")))
-  (should (equal "a" (compat-call string-trim "a ")))                       
;right trailing
-  (should (equal "aaa" (compat-call string-trim "aaa ")))
-  (should (equal "a" (compat-call string-trim "a    ")))
-  (should (equal "a" (compat-call string-trim "a\t\t")))
-  (should (equal "a" (compat-call string-trim "a\n  \t")))
-  (should (equal "a" (compat-call string-trim " a")))                       
;left trailing
-  (should (equal "aaa" (compat-call string-trim " aaa")))
-  (should (equal "a" (compat-call string-trim "a")))
-  (should (equal "a" (compat-call string-trim "\t\ta")))
-  (should (equal "a" (compat-call string-trim "\n  \ta")))
-  (should (equal "a" (compat-call string-trim " a ")))                      
;both trailing
-  (should (equal "aaa" (compat-call string-trim " aaa  ")))
-  (should (equal "t\ta" (compat-call string-trim "t\ta\t\n")))
-  (should (equal "a" (compat-call string-trim "\n  \ta  \n"))))
+  (should-equal "aaa" (compat-string-trim " aaa  ")) ;; Obsolete
+  (should-equal "aaa" (compat-call string-trim "--aaa__" "-+" "_+")) ;; 
Additional regexp
+  (should-equal "" (compat-call string-trim ""))                          
;empty string
+  (should-equal "a" (compat-call string-trim "a"))                        
;"full" string
+  (should-equal "aaa" (compat-call string-trim "aaa"))
+  (should-equal "へっろ" (compat-call string-trim "へっろ"))
+  (should-equal "hello world" (compat-call string-trim "hello world"))
+  (should-equal "a" (compat-call string-trim "a "))                       
;right trailing
+  (should-equal "aaa" (compat-call string-trim "aaa "))
+  (should-equal "a" (compat-call string-trim "a    "))
+  (should-equal "a" (compat-call string-trim "a\t\t"))
+  (should-equal "a" (compat-call string-trim "a\n  \t"))
+  (should-equal "a" (compat-call string-trim " a"))                       
;left trailing
+  (should-equal "aaa" (compat-call string-trim " aaa"))
+  (should-equal "a" (compat-call string-trim "a"))
+  (should-equal "a" (compat-call string-trim "\t\ta"))
+  (should-equal "a" (compat-call string-trim "\n  \ta"))
+  (should-equal "a" (compat-call string-trim " a "))                      
;both trailing
+  (should-equal "aaa" (compat-call string-trim " aaa  "))
+  (should-equal "t\ta" (compat-call string-trim "t\ta\t\n"))
+  (should-equal "a" (compat-call string-trim "\n  \ta  \n")))
 
 (ert-deftest string-search ()
   ;; Find needle at the beginning of a haystack:
-  (should (equal 0 (string-search "a" "abb")))
+  (should-equal 0 (string-search "a" "abb"))
   ;; Find needle at the begining of a haystack, with more potential
   ;; needles that could be found:
-  (should (equal 0 (string-search "a" "abba")))
+  (should-equal 0 (string-search "a" "abba"))
   ;; Find needle with more than one charachter at the beginning of
   ;; a line:
-  (should (equal 0 (string-search "aa" "aabbb")))
+  (should-equal 0 (string-search "aa" "aabbb"))
   ;; Find a needle midstring:
-  (should (equal 1 (string-search "a" "bab")))
+  (should-equal 1 (string-search "a" "bab"))
   ;; Find a needle at the end:
-  (should (equal 2 (string-search "a" "bba")))
+  (should-equal 2 (string-search "a" "bba"))
   ;; Find a longer needle midstring:
-  (should (equal 1 (string-search "aa" "baab")))
+  (should-equal 1 (string-search "aa" "baab"))
   ;; Find a longer needle at the end:
-  (should (equal 2 (string-search "aa" "bbaa")))
+  (should-equal 2 (string-search "aa" "bbaa"))
   ;; Find a case-sensitive needle:
-  (should (equal 2 (string-search "a" "AAa")))
+  (should-equal 2 (string-search "a" "AAa"))
   ;; Find another case-sensitive needle:
-  (should (equal 2 (string-search "aa" "AAaa")))
+  (should-equal 2 (string-search "aa" "AAaa"))
   ;; Test regular expression quoting (1):
-  (should (equal 5 (string-search "." "abbbb.b")))
+  (should-equal 5 (string-search "." "abbbb.b"))
   ;; Test regular expression quoting (2):
-  (should (equal 5 (string-search ".*" "abbbb.*b")))
+  (should-equal 5 (string-search ".*" "abbbb.*b"))
   ;; Attempt to find non-existent needle:
-  (should (equal nil (string-search "a" "bbb")))
+  (should-not (string-search "a" "bbb"))
   ;; Attempt to find non-existent needle that has the form of a
   ;; regular expression:
-  (should (equal nil (string-search "." "bbb")))
+  (should-not (string-search "." "bbb"))
   ;; Handle empty string as needle:
-  (should (equal 0 (string-search "" "abc")))
+  (should-equal 0 (string-search "" "abc"))
   ;; Handle empty string as haystack:
-  (should (equal nil (string-search "a" "")))
+  (should-not (string-search "a" ""))
   ;; Handle empty string as needle and haystack:
-  (should (equal 0 (string-search "" "")))
+  (should-equal 0 (string-search "" ""))
   ;; Handle START argument:
-  (should (equal 3 (string-search "a" "abba" 1)))
+  (should-equal 3 (string-search "a" "abba" 1))
   ;; Additional test copied from:
-  (should (equal 6 (string-search "zot" "foobarzot")))
-  (should (equal 0 (string-search "foo" "foobarzot")))
-  (should (equal nil (string-search "fooz" "foobarzot")))
-  (should (equal nil (string-search "zot" "foobarzo")))
-  (should (equal 0 (string-search "ab" "ab")))
-  (should (equal nil (string-search "ab\0" "ab")))
-  (should (equal 4 (string-search "ab" "abababab" 3)))
-  (should (equal nil (string-search "ab" "ababac" 3)))
-  (should (equal nil (string-search "aaa" "aa")))
+  (should-equal 6 (string-search "zot" "foobarzot"))
+  (should-equal 0 (string-search "foo" "foobarzot"))
+  (should-not (string-search "fooz" "foobarzot"))
+  (should-not (string-search "zot" "foobarzo"))
+  (should-equal 0 (string-search "ab" "ab"))
+  (should-not (string-search "ab\0" "ab"))
+  (should-equal 4 (string-search "ab" "abababab" 3))
+  (should-not (string-search "ab" "ababac" 3))
+  (should-not (string-search "aaa" "aa"))
   ;; The `make-string' calls with three arguments have been replaced
   ;; here with the result of their evaluation, to avoid issues with
   ;; older versions of Emacs that only support two arguments.
-  (should (equal 5
+  (should-equal 5
                  (string-search (make-string 2 130)
                                 ;; Per (concat "helló" (make-string 5 130 t) 
"bár")
-                                "hell󂂂‚‚bár")))
-  (should (equal 5
+                                "hell󂂂‚‚bár"))
+  (should-equal 5
                   (string-search (make-string 2 127)
                                  ;; Per (concat "helló" (make-string 5 127 t) 
"bár")
-                                 "hellóbár")))
-  (should (equal 1 (string-search "\377" "a\377ø")))
-  (should (equal 1 (string-search "\377" "a\377a")))
-  (should (equal nil (string-search (make-string 1 255) "a\377ø")))
-  (should (equal nil (string-search (make-string 1 255) "a\377a")))
-  (should (equal 3 (string-search "fóo" "zotfóo")))
-  (should (equal nil (string-search "\303" "aøb")))
-  (should (equal nil (string-search "\270" "aøb")))
-  (should (equal nil (string-search "ø" "\303\270")))
-  (should (equal nil (string-search "ø" (make-string 32 ?a))))
-  (should (equal nil (string-search "ø" (string-to-multibyte (make-string 32 
?a)))))
-  (should (equal 14 (string-search "o" (string-to-multibyte
-                                        (apply #'string (number-sequence ?a 
?z))))))
-  (should (equal 2 (string-search "a\U00010f98z" "a\U00010f98a\U00010f98z")))
+                                 "hellóbár"))
+  (should-equal 1 (string-search "\377" "a\377ø"))
+  (should-equal 1 (string-search "\377" "a\377a"))
+  (should-not (string-search (make-string 1 255) "a\377ø"))
+  (should-not (string-search (make-string 1 255) "a\377a"))
+  (should-equal 3 (string-search "fóo" "zotfóo"))
+  (should-not (string-search "\303" "aøb"))
+  (should-not (string-search "\270" "aøb"))
+  (should-not (string-search "ø" "\303\270"))
+  (should-not (string-search "ø" (make-string 32 ?a)))
+  (should-not (string-search "ø" (string-to-multibyte (make-string 32 ?a))))
+  (should-equal 14 (string-search "o" (string-to-multibyte
+                                        (apply #'string (number-sequence ?a 
?z)))))
+  (should-equal 2 (string-search "a\U00010f98z" "a\U00010f98a\U00010f98z"))
   (should-error (string-search "a" "abc" -1) :type '(args-out-of-range -1))
   (should-error (string-search "a" "abc" 4) :type '(args-out-of-range 4))
   (should-error (string-search "a" "abc" 100000000000) :type 
'(args-out-of-range 100000000000))
-  (should (equal nil (string-search "a" "aaa" 3)))
-  (should (equal nil (string-search "aa" "aa" 1)))
-  (should (equal nil (string-search "\0" "")))
-  (should (equal 0 (string-search "" "")))
+  (should-not (string-search "a" "aaa" 3))
+  (should-not (string-search "aa" "aa" 1))
+  (should-not (string-search "\0" ""))
+  (should-equal 0 (string-search "" ""))
   (should-error (string-search "" "" 1) :type '(args-out-of-range 1))
-  (should (equal 0 (string-search "" "abc")))
-  (should (equal 2 (string-search "" "abc" 2)))
-  (should (equal 3 (string-search "" "abc" 3)))
+  (should-equal 0 (string-search "" "abc"))
+  (should-equal 2 (string-search "" "abc" 2))
+  (should-equal 3 (string-search "" "abc" 3))
   (should-error (string-search "" "abc" 4) :type '(args-out-of-range 4))
   (should-error (string-search "" "abc" -1) :type '(args-out-of-range -1))
-  (should (equal nil (string-search "ø" "foo\303\270")))
-  (should (equal nil (string-search "\303\270" "ø")))
-  (should (equal nil (string-search "\370" "ø")))
-  (should (equal nil (string-search (string-to-multibyte "\370") "ø")))
-  (should (equal nil (string-search "ø" "\370")))
-  (should (equal nil (string-search "ø" (string-to-multibyte "\370"))))
-  (should (equal nil (string-search "\303\270" "\370")))
-  (should (equal nil (string-search (string-to-multibyte "\303\270") "\370")))
-  (should (equal nil (string-search "\303\270" (string-to-multibyte "\370"))))
-  (should (equal nil
+  (should-not (string-search "ø" "foo\303\270"))
+  (should-not (string-search "\303\270" "ø"))
+  (should-not (string-search "\370" "ø"))
+  (should-not (string-search (string-to-multibyte "\370") "ø"))
+  (should-not (string-search "ø" "\370"))
+  (should-not (string-search "ø" (string-to-multibyte "\370")))
+  (should-not (string-search "\303\270" "\370"))
+  (should-not (string-search (string-to-multibyte "\303\270") "\370"))
+  (should-not (string-search "\303\270" (string-to-multibyte "\370")))
+  (should-not
                   (string-search (string-to-multibyte "\303\270")
-                                 (string-to-multibyte "\370"))))
-  (should (equal nil (string-search "\370" "\303\270")))
-  (should (equal nil (string-search (string-to-multibyte "\370") "\303\270")))
-  (should (equal nil (string-search "\370" (string-to-multibyte "\303\270"))))
-  (should (equal nil
+                                 (string-to-multibyte "\370")))
+  (should-not (string-search "\370" "\303\270"))
+  (should-not (string-search (string-to-multibyte "\370") "\303\270"))
+  (should-not (string-search "\370" (string-to-multibyte "\303\270")))
+  (should-not
                  (string-search (string-to-multibyte "\370")
-                                (string-to-multibyte "\303\270"))))
-  (should (equal 3 (string-search "\303\270" "foo\303\270")))
+                                (string-to-multibyte "\303\270")))
+  (should-equal 3 (string-search "\303\270" "foo\303\270"))
   (when (version<= "27" emacs-version)
     ;; FIXME The commit a1f76adfb03c23bb4242928e8efe6193c301f0c1 in
     ;; emacs.git fixes the behaviour of regular expressions matching
     ;; raw bytes.  The compatibility functions should updated to
     ;; backport this behaviour.
-    (should (equal 2 (string-search (string-to-multibyte "\377") "ab\377c")))
-    (should (equal 2
+    (should-equal 2 (string-search (string-to-multibyte "\377") "ab\377c"))
+    (should-equal 2
                     (string-search (string-to-multibyte "o\303\270")
-                                   "foo\303\270")))))
+                                   "foo\303\270"))))
 
 (ert-deftest string-replace ()
-  (should (equal "bba" (string-replace "aa" "bb" "aaa")))
-  (should (equal "AAA" (string-replace "aa" "bb" "AAA")))
+  (should-equal "bba" (string-replace "aa" "bb" "aaa"))
+  (should-equal "AAA" (string-replace "aa" "bb" "AAA"))
   ;; Additional test copied from subr-tests.el:
-  (should (equal "zot" (string-replace "foo" "bar" "zot")))
-  (should (equal "barzot" (string-replace "foo" "bar" "foozot")))
-  (should (equal "barbarzot" (string-replace "foo" "bar" "barfoozot")))
-  (should (equal "barfoobar" (string-replace "zot" "bar" "barfoozot")))
-  (should (equal "barfoobarot" (string-replace "z" "bar" "barfoozot")))
-  (should (equal "zat" (string-replace "zot" "bar" "zat")))
-  (should (equal "zat" (string-replace "azot" "bar" "zat")))
-  (should (equal "bar" (string-replace "azot" "bar" "azot")))
-  (should (equal "foozotbar" (string-replace "azot" "bar" "foozotbar")))
-  (should (equal "labarbarbarzot" (string-replace "fo" "bar" "lafofofozot")))
-  (should (equal "axb" (string-replace "\377" "x" "a\377b")))
-  (should (equal "axø" (string-replace "\377" "x" "a\377ø")))
+  (should-equal "zot" (string-replace "foo" "bar" "zot"))
+  (should-equal "barzot" (string-replace "foo" "bar" "foozot"))
+  (should-equal "barbarzot" (string-replace "foo" "bar" "barfoozot"))
+  (should-equal "barfoobar" (string-replace "zot" "bar" "barfoozot"))
+  (should-equal "barfoobarot" (string-replace "z" "bar" "barfoozot"))
+  (should-equal "zat" (string-replace "zot" "bar" "zat"))
+  (should-equal "zat" (string-replace "azot" "bar" "zat"))
+  (should-equal "bar" (string-replace "azot" "bar" "azot"))
+  (should-equal "foozotbar" (string-replace "azot" "bar" "foozotbar"))
+  (should-equal "labarbarbarzot" (string-replace "fo" "bar" "lafofofozot"))
+  (should-equal "axb" (string-replace "\377" "x" "a\377b"))
+  (should-equal "axø" (string-replace "\377" "x" "a\377ø"))
   (when (version<= "27" emacs-version)
     ;; FIXME The commit a1f76adfb03c23bb4242928e8efe6193c301f0c1
     ;; in emacs.git fixes the behaviour of regular
     ;; expressions matching raw bytes.  The compatibility
     ;; functions should updated to backport this
     ;; behaviour.
-    (should (equal "axb" (string-replace (string-to-multibyte "\377") "x" 
"a\377b")))
-    (should (equal "axø" (string-replace (string-to-multibyte "\377") "x" 
"a\377ø"))))
-  (should (equal "ANAnas" (string-replace "ana" "ANA" "ananas")))
-  (should (equal "" (string-replace "a" "" "")))
-  (should (equal "" (string-replace "a" "" "aaaaa")))
-  (should (equal "" (string-replace "ab" "" "ababab")))
-  (should (equal "ccc" (string-replace "ab" "" "abcabcabc")))
-  (should (equal "aaaaaa" (string-replace "a" "aa" "aaa")))
-  (should (equal "defg" (string-replace "abc" "defg" "abc")))
+    (should-equal "axb" (string-replace (string-to-multibyte "\377") "x" 
"a\377b"))
+    (should-equal "axø" (string-replace (string-to-multibyte "\377") "x" 
"a\377ø")))
+  (should-equal "ANAnas" (string-replace "ana" "ANA" "ananas"))
+  (should-equal "" (string-replace "a" "" ""))
+  (should-equal "" (string-replace "a" "" "aaaaa"))
+  (should-equal "" (string-replace "ab" "" "ababab"))
+  (should-equal "ccc" (string-replace "ab" "" "abcabcabc"))
+  (should-equal "aaaaaa" (string-replace "a" "aa" "aaa"))
+  (should-equal "defg" (string-replace "abc" "defg" "abc"))
   (when (version<= "24.4" emacs-version)
     ;; FIXME: Emacs 24.3 do not know of `wrong-length-argument' and
     ;; therefore fail this test, even if the right symbol is being
@@ -721,31 +723,31 @@
 
 (ert-deftest hash-table-keys ()
   (let ((ht (make-hash-table)))
-    (should (null (hash-table-keys ht)))
+    (should-not (hash-table-keys ht))
     (puthash 1 'one ht)
-    (should (equal '(1) (hash-table-keys ht)))
+    (should-equal '(1) (hash-table-keys ht))
     (puthash 1 'one ht)
-    (should (equal '(1) (hash-table-keys ht)))
+    (should-equal '(1) (hash-table-keys ht))
     (puthash 2 'two ht)
     (should (memq 1 (hash-table-keys ht)))
     (should (memq 2 (hash-table-keys ht)))
     (should (= 2 (length (hash-table-keys ht))))
     (remhash 1 ht)
-    (should (equal '(2) (hash-table-keys ht)))))
+    (should-equal '(2) (hash-table-keys ht))))
 
 (ert-deftest hash-table-values ()
   (let ((ht (make-hash-table)))
-    (should (null (hash-table-values ht)))
+    (should-not (hash-table-values ht))
     (puthash 1 'one ht)
-    (should (equal '(one) (hash-table-values ht)))
+    (should-equal '(one) (hash-table-values ht))
     (puthash 1 'one ht)
-    (should (equal '(one) (hash-table-values ht)))
+    (should-equal '(one) (hash-table-values ht))
     (puthash 2 'two ht)
     (should (memq 'one (hash-table-values ht)))
     (should (memq 'two (hash-table-values ht)))
     (should (= 2 (length (hash-table-values ht))))
     (remhash 1 ht)
-    (should (equal '(two) (hash-table-values ht)))))
+    (should-equal '(two) (hash-table-values ht))))
 
 (ert-deftest named-let ()
   (should (= (named-let l ((i 0)) (if (= i 8) i (l (1+ i))))
@@ -810,21 +812,21 @@
                        (cons "three" 3))))
 
     (setf (compat-call alist-get 1 alist-1) "eins")
-    (should (equal (compat-call alist-get 1 alist-1) "eins"))
+    (should-equal (compat-call alist-get 1 alist-1) "eins")
     (setf (compat-call alist-get 2 alist-1 nil 'remove) nil)
-    (should (equal alist-1 '((1 . "eins") (3 . "three"))))
+    (should-equal alist-1 '((1 . "eins") (3 . "three")))
     (setf (compat-call alist-get "one" alist-2 nil nil #'string=) "eins")
-    (should (equal (compat-call alist-get "one" alist-2 nil nil #'string=)
-                   "eins"))
+    (should-equal (compat-call alist-get "one" alist-2 nil nil #'string=)
+                   "eins")
 
     ;; Obsolete compat-alist-get
     (setf (compat-alist-get 1 alist-1) "eins")
-    (should (equal (compat-alist-get 1 alist-1) "eins"))
+    (should-equal (compat-alist-get 1 alist-1) "eins")
     (setf (compat-alist-get 2 alist-1 nil 'remove) nil)
-    (should (equal alist-1 '((1 . "eins") (3 . "three"))))
+    (should-equal alist-1 '((1 . "eins") (3 . "three")))
     (setf (compat-alist-get "one" alist-2 nil nil #'string=) "eins")
-    (should (equal (compat-alist-get "one" alist-2 nil nil #'string=)
-                   "eins"))))
+    (should-equal (compat-alist-get "one" alist-2 nil nil #'string=)
+                   "eins")))
 
 (ert-deftest json-serialize ()
   (let ((input-1 '((:key . ["abc" 2]) (yek . t)))
@@ -833,15 +835,15 @@
                    (puthash "key" ["abc" 2] ht)
                    (puthash "yek" t ht)
                    ht)))
-    (should (equal (json-serialize input-1)
-                   "{\":key\":[\"abc\",2],\"yek\":true}"))
-    (should (equal (json-serialize input-2)
-                   "{\"key\":[\"abc\",2],\"yek\":true}"))
+    (should-equal (json-serialize input-1)
+                   "{\":key\":[\"abc\",2],\"yek\":true}")
+    (should-equal (json-serialize input-2)
+                   "{\"key\":[\"abc\",2],\"yek\":true}")
     (should (member (json-serialize input-2)
                     '("{\"key\":[\"abc\",2],\"yek\":true}"
                       "{\"yek\":true,\"key\":[\"abc\",2]}")))
     ;; TODO fix broken test
-    ;; (should (equal (json-serialize input-3)
+    ;; (should-equal (json-serialize input-3)
     ;;                "{\"key\":[\"abc\",2],\"yek\":true}"))
     (should-error (json-serialize '(("a" . 1)))
                   :type '(wrong-type-argument symbolp "a"))
@@ -860,19 +862,19 @@
 (ert-deftest json-parse-string ()
   (let ((input "{\"key\":[\"abc\", 2], \"yek\": null}"))
     (let ((obj (json-parse-string input :object-type 'alist)))
-      (should (equal (cdr (assq 'key obj)) ["abc" 2]))
-      (should (equal (cdr (assq 'yek obj)) :null)))
+      (should-equal (cdr (assq 'key obj)) ["abc" 2])
+      (should-equal (cdr (assq 'yek obj)) :null))
     (let ((obj (json-parse-string input :object-type 'plist)))
-      (should (equal (plist-get obj :key) ["abc" 2]))
-      (should (equal (plist-get obj :yek) :null)))
+      (should-equal (plist-get obj :key) ["abc" 2])
+      (should-equal (plist-get obj :yek) :null))
     (let ((obj (json-parse-string input)))
-      (should (equal (gethash "key" obj) ["abc" 2]))
-      (should (equal (gethash "yek" obj) :null)))))
+      (should-equal (gethash "key" obj) ["abc" 2])
+      (should-equal (gethash "yek" obj) :null))))
 
 (ert-deftest json-insert ()
   (with-temp-buffer
     (json-insert '((:key . ["abc" 2]) (yek . t)))
-    (should (equal (buffer-string) "{\":key\":[\"abc\",2],\"yek\":true}"))))
+    (should-equal (buffer-string) "{\":key\":[\"abc\",2],\"yek\":true}")))
 
 (ert-deftest text-property-search-forward ()
   (with-temp-buffer
@@ -883,16 +885,16 @@
             "five ")
     (goto-char (point-min))
     (let ((match (text-property-search-forward 'prop)))
-      (should (eq (prop-match-beginning match) 5))
-      (should (eq (prop-match-end match) 9))
-      (should (eq (prop-match-value match) 'val)))
+      (should-equal (prop-match-beginning match) 5)
+      (should-equal (prop-match-end match) 9)
+      (should-equal (prop-match-value match) 'val))
     (let ((match (text-property-search-forward 'prop)))
-      (should (eq (prop-match-beginning match) 15))
-      (should (eq (prop-match-end match) 20))
-      (should (eq (prop-match-value match) 'wert)))
-    (should (null (text-property-search-forward 'prop)))
+      (should-equal (prop-match-beginning match) 15)
+      (should-equal (prop-match-end match) 20)
+      (should-equal (prop-match-value match) 'wert))
+    (should-not (text-property-search-forward 'prop))
     (goto-char (point-min))
-    (should (null (text-property-search-forward 'non-existant)))))
+    (should-not (text-property-search-forward 'non-existant))))
 
 (ert-deftest text-property-search-backward ()
   (with-temp-buffer
@@ -903,16 +905,16 @@
             "five ")
     (goto-char (point-max))
     (let ((match (text-property-search-backward 'prop)))
-      (should (eq (prop-match-beginning match) 15))
-      (should (eq (prop-match-end match) 20))
-      (should (eq (prop-match-value match) 'wert)))
+      (should-equal (prop-match-beginning match) 15)
+      (should-equal (prop-match-end match) 20)
+      (should-equal (prop-match-value match) 'wert))
     (let ((match (text-property-search-backward 'prop)))
-      (should (eq (prop-match-beginning match) 5))
-      (should (eq (prop-match-end match) 9))
-      (should (eq (prop-match-value match) 'val)))
-    (should (null (text-property-search-backward 'prop)))
+      (should-equal (prop-match-beginning match) 5)
+      (should-equal (prop-match-end match) 9)
+      (should-equal (prop-match-value match) 'val))
+    (should-not (text-property-search-backward 'prop))
     (goto-char (point-max))
-    (should (null (text-property-search-backward 'non-existant)))))
+    (should-not (text-property-search-backward 'non-existant))))
 
 
 ;; (ert-deftest insert-into-buffer ()
@@ -977,12 +979,12 @@
 ;; (ert-deftest regexp-opt
 ;;   ;; Ensure `compat--regexp-opt' doesn't change the existing
 ;;   ;; behaviour:
-;;   (should (equal (regexp-opt '("a" "b" "c")) '("a" "b" "c"))
-;;   (should (equal (regexp-opt '("abc" "def" "ghe")) '("abc" "def" "ghe"))
-;;   (should (equal (regexp-opt '("a" "b" "c") 'words) '("a" "b" "c") 'words)
+;;   (should-equal (regexp-opt '("a" "b" "c")) '("a" "b" "c"))
+;;   (should-equal (regexp-opt '("abc" "def" "ghe")) '("abc" "def" "ghe"))
+;;   (should-equal (regexp-opt '("a" "b" "c") 'words) '("a" "b" "c") 'words)
 ;;   ;; Test empty list:
-;;   (should (equal "\\(?:\\`a\\`\\)" '())
-;;   (should (equal "\\<\\(\\`a\\`\\)\\>" '() 'words))
+;;   (should-equal "\\(?:\\`a\\`\\)" '())
+;;   (should-equal "\\<\\(\\`a\\`\\)\\>" '() 'words))
 
 ;; (ert-deftest regexp-opt ()
 ;;   (let ((unmatchable "\\(?:\\`a\\`\\)"))
@@ -994,20 +996,20 @@
 
 ;; (ert-deftest assoc
 ;;   ;; Fallback behaviour:
-;;   (should (equal nil 1 nil)               ;empty list
-;;   (should (equal '(1) 1 '((1)))            ;single element list
-;;   (should (equal nil 1 '(1))
-;;   (should (equal '(2) 2 '((1) (2) (3)))    ;multiple element list
-;;   (should (equal nil 2 '(1 2 3))
-;;   (should (equal '(2) 2 '(1 (2) 3))
-;;   (should (equal nil 2 '((1) 2 (3)))
-;;   (should (equal '(1) 1 '((3) (2) (1)))
-;;   (should (equal '("a") "a" '(("a") ("b") ("c")))  ;non-primitive elements
-;;   (should (equal '("a" 0) "a" '(("c" . "a") "b" ("a" 0)))
+;;   (should-equal nil 1 nil)               ;empty list
+;;   (should-equal '(1) 1 '((1)))            ;single element list
+;;   (should-equal nil 1 '(1))
+;;   (should-equal '(2) 2 '((1) (2) (3)))    ;multiple element list
+;;   (should-equal nil 2 '(1 2 3))
+;;   (should-equal '(2) 2 '(1 (2) 3))
+;;   (should-equal nil 2 '((1) 2 (3)))
+;;   (should-equal '(1) 1 '((3) (2) (1)))
+;;   (should-equal '("a") "a" '(("a") ("b") ("c")))  ;non-primitive elements
+;;   (should-equal '("a" 0) "a" '(("c" . "a") "b" ("a" 0)))
 ;;   ;; With testfn (advised behaviour):
-;;   (should (equal '(1) 3 '((10) (4) (1) (9)) #'<)
-;;   (should (equal '("a") "b" '(("c") ("a") ("b")) #'string-lessp)
-;;   (should (equal '("b") "a" '(("a") ("a") ("b"))
+;;   (should-equal '(1) 3 '((10) (4) (1) (9)) #'<)
+;;   (should-equal '("a") "b" '(("c") ("a") ("b")) #'string-lessp)
+;;   (should-equal '("b") "a" '(("a") ("a") ("b"))
 ;;          (lambda (s1 s2) (not (string= s1 s2))))
 ;;   (ought
 ;;    '("\\.el\\'" . emacs-lisp-mode)
@@ -1022,58 +1024,58 @@
 ;; ;;   (ert-deftest alist-get-1 ()
 ;; ;;     (ert-deftest alist-get
 ;; ;;       ;; Fallback behaviour:
-;; ;;       (should (equal nil 1 nil)                      ;empty list
-;; ;;       (should (equal 'a 1 '((1 . a)))                  ;single element 
list
-;; ;;       (should (equal nil 1 '(1))
-;; ;;       (should (equal 'b 2 '((1 . a) (2 . b) (3 . c)))  ;multiple element 
list
-;; ;;       (should (equal nil 2 '(1 2 3))
-;; ;;       (should (equal 'b 2 '(1 (2 . b) 3))
-;; ;;       (should (equal nil 2 '((1 . a) 2 (3 . c)))
-;; ;;       (should (equal 'a 1 '((3 . c) (2 . b) (1 . a)))
-;; ;;       (should (equal nil "a" '(("a" . 1) ("b" . 2) ("c" . 3)))  
;non-primitive elements
+;; ;;       (should-equal nil 1 nil)                      ;empty list
+;; ;;       (should-equal 'a 1 '((1 . a)))                  ;single element 
list
+;; ;;       (should-equal nil 1 '(1))
+;; ;;       (should-equal 'b 2 '((1 . a) (2 . b) (3 . c)))  ;multiple element 
list
+;; ;;       (should-equal nil 2 '(1 2 3))
+;; ;;       (should-equal 'b 2 '(1 (2 . b) 3))
+;; ;;       (should-equal nil 2 '((1 . a) 2 (3 . c)))
+;; ;;       (should-equal 'a 1 '((3 . c) (2 . b) (1 . a)))
+;; ;;       (should-equal nil "a" '(("a" . 1) ("b" . 2) ("c" . 3)))  
;non-primitive elements
 
 ;; ;;       ;; With testfn (advised behaviour):
-;; ;;       (should (equal 1 "a" '(("a" . 1) ("b" . 2) ("c" . 3)) nil nil 
#'equal)
-;; ;;       (should (equal 1 3 '((10 . 10) (4 . 4) (1 . 1) (9 . 9)) nil nil 
#'<)
-;; ;;       (should (equal '(a) "b" '(("c" c) ("a" a) ("b" b)) nil nil 
#'string-lessp)
-;; ;;       (should (equal 'c "a" '(("a" . a) ("a" . b) ("b" . c)) nil nil
+;; ;;       (should-equal 1 "a" '(("a" . 1) ("b" . 2) ("c" . 3)) nil nil 
#'equal)
+;; ;;       (should-equal 1 3 '((10 . 10) (4 . 4) (1 . 1) (9 . 9)) nil nil #'<)
+;; ;;       (should-equal '(a) "b" '(("c" c) ("a" a) ("b" b)) nil nil 
#'string-lessp)
+;; ;;       (should-equal 'c "a" '(("a" . a) ("a" . b) ("b" . c)) nil nil
 ;; ;;                        (lambda (s1 s2) (not (string= s1 s2))))
-;; ;;       (should (equal 'emacs-lisp-mode
+;; ;;       (should-equal 'emacs-lisp-mode
 ;; ;;                        "file.el"
 ;; ;;                        '(("\\.c\\'" . c-mode)
 ;; ;;                          ("\\.p\\'" . pascal-mode)
 ;; ;;                          ("\\.el\\'" . emacs-lisp-mode)
 ;; ;;                          ("\\.awk\\'" . awk-mode))
 ;; ;;                        nil nil #'string-match-p)
-;; ;;       (should (equal 'd 0 '((1 . a) (2 . b) (3 . c)) 'd) ;default value
-;; ;;       (should (equal 'd 2 '((1 . a) (2 . b) (3 . c)) 'd nil #'ignore))))
+;; ;;       (should-equal 'd 0 '((1 . a) (2 . b) (3 . c)) 'd) ;default value
+;; ;;       (should-equal 'd 2 '((1 . a) (2 . b) (3 . c)) 'd nil #'ignore))))
 
 ;; (ert-deftest (alist-get compat--alist-get-full-elisp)
 ;;   ;; Fallback behaviour:
-;;   (should (equal nil 1 nil)                      ;empty list
-;;   (should (equal 'a 1 '((1 . a)))                  ;single element list
-;;   (should (equal nil 1 '(1))
-;;   (should (equal 'b 2 '((1 . a) (2 . b) (3 . c)))  ;multiple element list
-;;   (should (equal nil 2 '(1 2 3))
-;;   (should (equal 'b 2 '(1 (2 . b) 3))
-;;   (should (equal nil 2 '((1 . a) 2 (3 . c)))
-;;   (should (equal 'a 1 '((3 . c) (2 . b) (1 . a)))
-;;   (should (equal nil "a" '(("a" . 1) ("b" . 2) ("c" . 3))) ;non-primitive 
elements
+;;   (should-equal nil 1 nil)                      ;empty list
+;;   (should-equal 'a 1 '((1 . a)))                  ;single element list
+;;   (should-equal nil 1 '(1))
+;;   (should-equal 'b 2 '((1 . a) (2 . b) (3 . c)))  ;multiple element list
+;;   (should-equal nil 2 '(1 2 3))
+;;   (should-equal 'b 2 '(1 (2 . b) 3))
+;;   (should-equal nil 2 '((1 . a) 2 (3 . c)))
+;;   (should-equal 'a 1 '((3 . c) (2 . b) (1 . a)))
+;;   (should-equal nil "a" '(("a" . 1) ("b" . 2) ("c" . 3))) ;non-primitive 
elements
 ;;   ;; With testfn (advised behaviour):
-;;   (should (equal 1 "a" '(("a" . 1) ("b" . 2) ("c" . 3)) nil nil #'equal)
-;;   (should (equal 1 3 '((10 . 10) (4 . 4) (1 . 1) (9 . 9)) nil nil #'<)
-;;   (should (equal '(a) "b" '(("c" c) ("a" a) ("b" b)) nil nil #'string-lessp)
-;;   (should (equal 'c "a" '(("a" . a) ("a" . b) ("b" . c)) nil nil
+;;   (should-equal 1 "a" '(("a" . 1) ("b" . 2) ("c" . 3)) nil nil #'equal)
+;;   (should-equal 1 3 '((10 . 10) (4 . 4) (1 . 1) (9 . 9)) nil nil #'<)
+;;   (should-equal '(a) "b" '(("c" c) ("a" a) ("b" b)) nil nil #'string-lessp)
+;;   (should-equal 'c "a" '(("a" . a) ("a" . b) ("b" . c)) nil nil
 ;;          (lambda (s1 s2) (not (string= s1 s2))))
-;;   (should (equal 'emacs-lisp-mode
+;;   (should-equal 'emacs-lisp-mode
 ;;          "file.el"
 ;;          '(("\\.c\\'" . c-mode)
 ;;            ("\\.p\\'" . pascal-mode)
 ;;            ("\\.el\\'" . emacs-lisp-mode)
 ;;            ("\\.awk\\'" . awk-mode))
 ;;          nil nil #'string-match-p)
-;;   (should (equal 'd 0 '((1 . a) (2 . b) (3 . c)) 'd) ;default value
-;;   (should (equal 'd 2 '((1 . a) (2 . b) (3 . c)) 'd nil #'ignore))
+;;   (should-equal 'd 0 '((1 . a) (2 . b) (3 . c)) 'd) ;default value
+;;   (should-equal 'd 2 '((1 . a) (2 . b) (3 . c)) 'd nil #'ignore))
 
 ;; ;; Note: as the cXXX+r implementations are relatively trivial, their
 ;; ;; tests are not as extensive.
@@ -1088,217 +1090,217 @@
 ;;   "Testcase for cXXXXr functions.")
 
 ;; (ert-deftest caaar
-;;   (should (equal nil ())
-;;   (should (equal 'a compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'a compat-cXXXr-test))
 
 ;; (ert-deftest caadr
-;;   (should (equal nil ())
-;;   (should (equal 'e compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'e compat-cXXXr-test))
 
 ;; (ert-deftest cadar
-;;   (should (equal nil ())
-;;   (should (equal 'c compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'c compat-cXXXr-test))
 
 ;; (ert-deftest caddr
-;;   (should (equal nil ())
-;;   (should (equal 'g compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'g compat-cXXXr-test))
 
 ;; (ert-deftest cdaar
-;;   (should (equal nil ())
-;;   (should (equal 'b compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'b compat-cXXXr-test))
 
 ;; (ert-deftest cdadr
-;;   (should (equal nil ())
-;;   (should (equal 'f compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'f compat-cXXXr-test))
 
 ;; (ert-deftest cddar
-;;   (should (equal nil ())
-;;   (should (equal 'd compat-cXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'd compat-cXXXr-test))
 
 ;; (ert-deftest cdddr
-;;   (should (equal nil ())
-;;   (should (equal 'h compat-cXXXr-test)
+;;   (should-equal nil ())
+;;   (should-equal 'h compat-cXXXr-test)
 ;;   #'cdddr)
 
 ;; (ert-deftest caaaar
-;;   (should (equal nil ())
-;;   (should (equal 'a compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'a compat-cXXXXr-test))
 
 ;; (ert-deftest caaadr
-;;   (should (equal nil ())
-;;   (should (equal 'i compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'i compat-cXXXXr-test))
 
 ;; (ert-deftest caadar
-;;   (should (equal nil ())
-;;   (should (equal 'e compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'e compat-cXXXXr-test))
 
 ;; (ert-deftest caaddr
-;;   (should (equal nil ())
-;;   (should (equal 'm compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'm compat-cXXXXr-test))
 
 ;; (ert-deftest cadaar
-;;   (should (equal nil ())
-;;   (should (equal 'c compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'c compat-cXXXXr-test))
 
 ;; (ert-deftest cadadr
-;;   (should (equal nil ())
-;;   (should (equal 'k compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'k compat-cXXXXr-test))
 
 ;; (ert-deftest caddar
-;;   (should (equal nil ())
-;;   (should (equal 'g compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'g compat-cXXXXr-test))
 
 ;; (ert-deftest cadddr
-;;   (should (equal nil ())
-;;   (should (equal 'o compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'o compat-cXXXXr-test))
 
 ;; (ert-deftest cdaaar
-;;   (should (equal nil ())
-;;   (should (equal 'b compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'b compat-cXXXXr-test))
 
 ;; (ert-deftest cdaadr
-;;   (should (equal nil ())
-;;   (should (equal 'j compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'j compat-cXXXXr-test))
 
 ;; (ert-deftest cdadar
-;;   (should (equal nil ())
-;;   (should (equal 'f compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'f compat-cXXXXr-test))
 
 ;; (ert-deftest cdaddr
-;;   (should (equal nil ())
-;;   (should (equal 'j compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'j compat-cXXXXr-test))
 
 ;; (ert-deftest cddaar
-;;   (should (equal nil ())
-;;   (should (equal 'd compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'd compat-cXXXXr-test))
 
 ;; (ert-deftest cddadr
-;;   (should (equal nil ())
-;;   (should (equal 'l compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'l compat-cXXXXr-test))
 
 ;; (ert-deftest cdddar
-;;   (should (equal nil ())
-;;   (should (equal 'h compat-cXXXXr-test))
+;;   (should-equal nil ())
+;;   (should-equal 'h compat-cXXXXr-test))
 
 ;; (ert-deftest string-greaterp
-;;   (should (equal t "b" "a")
-;;   (should (equal nil "a" "b")
-;;   (should (equal t "aaab" "aaaa")
-;;   (should (equal nil "aaaa" "aaab"))
+;;   (should-equal t "b" "a")
+;;   (should-equal nil "a" "b")
+;;   (should-equal t "aaab" "aaaa")
+;;   (should-equal nil "aaaa" "aaab"))
 
 ;; (ert-deftest sort
-;;   (should (equal (list 1 2 3) (list 1 2 3) #'<)
-;;   (should (equal (list 1 2 3) (list 3 2 1) #'<)
-;;   (should (equal '[1 2 3] '[1 2 3] #'<)
-;;   (should (equal '[1 2 3] '[3 2 1] #'<))
+;;   (should-equal (list 1 2 3) (list 1 2 3) #'<)
+;;   (should-equal (list 1 2 3) (list 3 2 1) #'<)
+;;   (should-equal '[1 2 3] '[1 2 3] #'<)
+;;   (should-equal '[1 2 3] '[3 2 1] #'<))
 
 ;; (ert-deftest string-suffix-p
-;;   (should (equal t "a" "abba")
-;;   (should (equal t "ba" "abba")
-;;   (should (equal t "abba" "abba")
-;;   (should (equal nil "a" "ABBA")
-;;   (should (equal nil "bA" "ABBA")
-;;   (should (equal nil "aBBA" "ABBA")
-;;   (should (equal nil "c" "ABBA")
-;;   (should (equal nil "c" "abba")
-;;   (should (equal nil "cddc" "abba")
-;;   (should (equal nil "aabba" "abba"))
+;;   (should-equal t "a" "abba")
+;;   (should-equal t "ba" "abba")
+;;   (should-equal t "abba" "abba")
+;;   (should-equal nil "a" "ABBA")
+;;   (should-equal nil "bA" "ABBA")
+;;   (should-equal nil "aBBA" "ABBA")
+;;   (should-equal nil "c" "ABBA")
+;;   (should-equal nil "c" "abba")
+;;   (should-equal nil "cddc" "abba")
+;;   (should-equal nil "aabba" "abba"))
 
 ;; (ert-deftest split-string
-;;   (should (equal '("a" "b" "c") "a b c")
-;;   (should (equal '("..a.." "..b.." "..c..") "..a.. ..b.. ..c..")
-;;   (should (equal '("a" "b" "c") "..a.. ..b.. ..c.." nil nil "\\.+"))
+;;   (should-equal '("a" "b" "c") "a b c")
+;;   (should-equal '("..a.." "..b.." "..c..") "..a.. ..b.. ..c..")
+;;   (should-equal '("a" "b" "c") "..a.. ..b.. ..c.." nil nil "\\.+"))
 
 ;; (ert-deftest delete-consecutive-dups
-;;   (should (equal '(1 2 3 4) '(1 2 3 4))
-;;   (should (equal '(1 2 3 4) '(1 2 2 3 4 4))
-;;   (should (equal '(1 2 3 2 4) '(1 2 2 3 2 4 4)))
+;;   (should-equal '(1 2 3 4) '(1 2 3 4))
+;;   (should-equal '(1 2 3 4) '(1 2 2 3 4 4))
+;;   (should-equal '(1 2 3 2 4) '(1 2 2 3 2 4 4)))
 
 ;; (ert-deftest string-clean-whitespace
-;;   (should (equal "a b c" "a b c")
-;;   (should (equal "a b c" "   a b c")
-;;   (should (equal "a b c" "a b c   ")
-;;   (should (equal "a b c" "a    b c")
-;;   (should (equal "a b c" "a b    c")
-;;   (should (equal "a b c" "a    b    c")
-;;   (should (equal "a b c" "   a    b    c")
-;;   (should (equal "a b c" "a    b    c    ")
-;;   (should (equal "a b c" "   a    b    c    ")
-;;   (should (equal "aa bb cc" "aa bb cc")
-;;   (should (equal "aa bb cc" "   aa bb cc")
-;;   (should (equal "aa bb cc" "aa bb cc   ")
-;;   (should (equal "aa bb cc" "aa    bb cc")
-;;   (should (equal "aa bb cc" "aa bb    cc")
-;;   (should (equal "aa bb cc" "aa    bb    cc")
-;;   (should (equal "aa bb cc" "   aa    bb    cc")
-;;   (should (equal "aa bb cc" "aa    bb    cc    ")
-;;   (should (equal "aa bb cc" "   aa    bb    cc    "))
+;;   (should-equal "a b c" "a b c")
+;;   (should-equal "a b c" "   a b c")
+;;   (should-equal "a b c" "a b c   ")
+;;   (should-equal "a b c" "a    b c")
+;;   (should-equal "a b c" "a b    c")
+;;   (should-equal "a b c" "a    b    c")
+;;   (should-equal "a b c" "   a    b    c")
+;;   (should-equal "a b c" "a    b    c    ")
+;;   (should-equal "a b c" "   a    b    c    ")
+;;   (should-equal "aa bb cc" "aa bb cc")
+;;   (should-equal "aa bb cc" "   aa bb cc")
+;;   (should-equal "aa bb cc" "aa bb cc   ")
+;;   (should-equal "aa bb cc" "aa    bb cc")
+;;   (should-equal "aa bb cc" "aa bb    cc")
+;;   (should-equal "aa bb cc" "aa    bb    cc")
+;;   (should-equal "aa bb cc" "   aa    bb    cc")
+;;   (should-equal "aa bb cc" "aa    bb    cc    ")
+;;   (should-equal "aa bb cc" "   aa    bb    cc    "))
 
 ;; (ert-deftest string-fill
-;;   (should (equal "a a a a a" "a a a a a" 9)
-;;   (should (equal "a a a a a" "a a a a a" 10)
-;;   (should (equal "a a a a\na" "a a a a a" 8)
-;;   (should (equal "a a a a\na" "a  a  a  a  a" 8)
-;;   (should (equal "a a\na a\na" "a a a a a" 4)
-;;   (should (equal "a\na\na\na\na" "a a a a a" 2)
-;;   (should (equal "a\na\na\na\na" "a a a a a" 1))
+;;   (should-equal "a a a a a" "a a a a a" 9)
+;;   (should-equal "a a a a a" "a a a a a" 10)
+;;   (should-equal "a a a a\na" "a a a a a" 8)
+;;   (should-equal "a a a a\na" "a  a  a  a  a" 8)
+;;   (should-equal "a a\na a\na" "a a a a a" 4)
+;;   (should-equal "a\na\na\na\na" "a a a a a" 2)
+;;   (should-equal "a\na\na\na\na" "a a a a a" 1))
 
 ;; (ert-deftest string-lines
-;;   (should (equal '("a" "b" "c") "a\nb\nc")
-;;   (should (equal '("a" "b" "c" "") "a\nb\nc\n")
-;;   (should (equal '("a" "b" "c") "a\nb\nc\n" t)
-;;   (should (equal '("abc" "bcd" "cde") "abc\nbcd\ncde")
-;;   (should (equal '(" abc" " bcd " "cde ") " abc\n bcd \ncde "))
+;;   (should-equal '("a" "b" "c") "a\nb\nc")
+;;   (should-equal '("a" "b" "c" "") "a\nb\nc\n")
+;;   (should-equal '("a" "b" "c") "a\nb\nc\n" t)
+;;   (should-equal '("abc" "bcd" "cde") "abc\nbcd\ncde")
+;;   (should-equal '(" abc" " bcd " "cde ") " abc\n bcd \ncde "))
 
 ;; (ert-deftest string-pad
-;;   (should (equal "a   " "a" 4)
-;;   (should (equal "aaaa" "aaaa" 4)
-;;   (should (equal "aaaaaa" "aaaaaa" 4)
-;;   (should (equal "a..." "a" 4 ?.)
-;;   (should (equal "   a" "a" 4 nil t)
-;;   (should (equal "...a" "a" 4 ?. t))
+;;   (should-equal "a   " "a" 4)
+;;   (should-equal "aaaa" "aaaa" 4)
+;;   (should-equal "aaaaaa" "aaaaaa" 4)
+;;   (should-equal "a..." "a" 4 ?.)
+;;   (should-equal "   a" "a" 4 nil t)
+;;   (should-equal "...a" "a" 4 ?. t))
 
 ;; (ert-deftest string-chop-newline
-;;   (should (equal "" "")
-;;   (should (equal "" "\n")
-;;   (should (equal "aaa" "aaa")
-;;   (should (equal "aaa" "aaa\n")
-;;   (should (equal "aaa\n" "aaa\n\n"))
+;;   (should-equal "" "")
+;;   (should-equal "" "\n")
+;;   (should-equal "aaa" "aaa")
+;;   (should-equal "aaa" "aaa\n")
+;;   (should-equal "aaa\n" "aaa\n\n"))
 
 ;; (ert-deftest macroexpand-1
-;;   (should (equal '(if a b c) '(if a b c))
-;;   (should (equal '(if a (progn b)) '(when a b))
-;;   (should (equal '(if a (progn (unless b c))) '(when a (unless b c))))
+;;   (should-equal '(if a b c) '(if a b c))
+;;   (should-equal '(if a (progn b)) '(when a b))
+;;   (should-equal '(if a (progn (unless b c))) '(when a (unless b c))))
 
 ;; (ert-deftest format-prompt
-;;   (should (equal "Prompt: " "Prompt" nil)
-;;   (should (equal "Prompt: " "Prompt" "")
-;;   (should (equal "Prompt (default  ): " "Prompt" " ")
-;;   (should (equal "Prompt (default 3): " "Prompt" 3)
-;;   (should (equal "Prompt (default abc): " "Prompt" "abc")
-;;   (should (equal "Prompt (default abc def): " "Prompt" "abc def")
-;;   (should (equal "Prompt 10: " "Prompt %d" nil 10)
-;;   (should (equal "Prompt \"abc\" (default 3): " "Prompt %S" 3 "abc"))
+;;   (should-equal "Prompt: " "Prompt" nil)
+;;   (should-equal "Prompt: " "Prompt" "")
+;;   (should-equal "Prompt (default  ): " "Prompt" " ")
+;;   (should-equal "Prompt (default 3): " "Prompt" 3)
+;;   (should-equal "Prompt (default abc): " "Prompt" "abc")
+;;   (should-equal "Prompt (default abc def): " "Prompt" "abc def")
+;;   (should-equal "Prompt 10: " "Prompt %d" nil 10)
+;;   (should-equal "Prompt \"abc\" (default 3): " "Prompt %S" 3 "abc"))
 
 ;; ;; TODO fix broken test
 ;; ;;(ert-deftest directory-files-recursively
-;; ;;  (should (equal
+;; ;;  (should-equal
 ;; ;;           (compat-sort (directory-files-recursively "." 
"make\\|copying") #'string<)
 ;; ;;           '("./.github/workflows/makefile.yml" "./COPYING" 
"./Makefile"))))
 
 ;; (ert-deftest directory-name-p
-;;   (should (equal t "/")
-;;   (should (equal nil "/file")
-;;   (should (equal nil "/dir/file")
-;;   (should (equal t "/dir/")
-;;   (should (equal nil "/dir")
-;;   (should (equal t "/dir/subdir/")
-;;   (should (equal nil "/dir/subdir")
-;;   (should (equal t "dir/")
-;;   (should (equal nil "file")
-;;   (should (equal nil "dir/file")
-;;   (should (equal t "dir/subdir/")
-;;   (should (equal nil "dir/subdir"))
+;;   (should-equal t "/")
+;;   (should-equal nil "/file")
+;;   (should-equal nil "/dir/file")
+;;   (should-equal t "/dir/")
+;;   (should-equal nil "/dir")
+;;   (should-equal t "/dir/subdir/")
+;;   (should-equal nil "/dir/subdir")
+;;   (should-equal t "dir/")
+;;   (should-equal nil "file")
+;;   (should-equal nil "dir/file")
+;;   (should-equal t "dir/subdir/")
+;;   (should-equal nil "dir/subdir"))
 
 ;; (ert-deftest if-let* ()
 ;;   (should
@@ -1344,36 +1346,36 @@
 ;;    (compat--t-and-let* (((= 5 6))) t)))
 
 ;; (ert-deftest json-parse-string
-;;   (should (equal 0 "0")
-;;   (should (equal 1 "1")
-;;   (should (equal 0.5 "0.5")
-;;   (should (equal [1 2 3] "[1,2,3]")
-;;   (should (equal ["a" 2 3] "[\"a\",2,3]")
-;;   (should (equal [["a" 2] 3] "[[\"a\",2],3]")
-;;   (should (equal '(("a" 2) 3) "[[\"a\",2],3]" :array-type 'list)
-;;   (should (equal 'foo "null" :null-object 'foo)
-;;   (should (equal ["false" t] "[false, true]" :false-object "false"))
+;;   (should-equal 0 "0")
+;;   (should-equal 1 "1")
+;;   (should-equal 0.5 "0.5")
+;;   (should-equal [1 2 3] "[1,2,3]")
+;;   (should-equal ["a" 2 3] "[\"a\",2,3]")
+;;   (should-equal [["a" 2] 3] "[[\"a\",2],3]")
+;;   (should-equal '(("a" 2) 3) "[[\"a\",2],3]" :array-type 'list)
+;;   (should-equal 'foo "null" :null-object 'foo)
+;;   (should-equal ["false" t] "[false, true]" :false-object "false"))
 
 ;; (ert-deftest lookup-key
 ;;   (let ((a-map (make-sparse-keymap))
 ;;         (b-map (make-sparse-keymap)))
 ;;     (define-key a-map "x" 'foo)
 ;;     (define-key b-map "x" 'bar)
-;;     (should (equal 'foo a-map "x")
-;;     (should (equal 'bar b-map "x")
-;;     (should (equal 'foo (list a-map b-map) "x")
-;;     (should (equal 'bar (list b-map a-map) "x")))
+;;     (should-equal 'foo a-map "x")
+;;     (should-equal 'bar b-map "x")
+;;     (should-equal 'foo (list a-map b-map) "x")
+;;     (should-equal 'bar (list b-map a-map) "x")))
 
 ;; (let ((a (bool-vector t t nil nil))
 ;;       (b (bool-vector t nil t nil)))
 ;;   (ert-deftest bool-vector-exclusive-or
-;;     (should (equal (bool-vector nil t t nil) a b)
-;;     (should (equal (bool-vector nil t t nil) b a)
+;;     (should-equal (bool-vector nil t t nil) a b)
+;;     (should-equal (bool-vector nil t t nil) b a)
 ;;     (ert-deftest bool-vector-exclusive-or-sideeffect ()
 ;;       (let ((c (make-bool-vector 4 nil)))
 ;;         (compat--t-bool-vector-exclusive-or a b c)
-;;         (should (equal (bool-vector nil t t nil) c))
-;;         (should (equal (bool-vector nil t t nil) c))))
+;;         (should-equal (bool-vector nil t t nil) c))
+;;         (should-equal (bool-vector nil t t nil) c))))
 ;;     (when (version<= "24.4" emacs-version)
 ;;       (should-error wrong-length-argument a (bool-vector))
 ;;       (should-error wrong-length-argument a b (bool-vector)))
@@ -1388,12 +1390,12 @@
 ;; (let ((a (bool-vector t t nil nil))
 ;;       (b (bool-vector t nil t nil)))
 ;;   (ert-deftest bool-vector-union
-;;     (should (equal (bool-vector t t t nil) a b)
-;;     (should (equal (bool-vector t t t nil) b a)
+;;     (should-equal (bool-vector t t t nil) a b)
+;;     (should-equal (bool-vector t t t nil) b a)
 ;;     (ert-deftest bool-vector-union-sideeffect ()
 ;;       (let ((c (make-bool-vector 4 nil)))
 ;;         (compat--t-bool-vector-union a b c)
-;;         (should (equal (bool-vector t t t nil) c))))
+;;         (should-equal (bool-vector t t t nil) c))))
 ;;     (when (version<= "24.4" emacs-version)
 ;;       (should-error wrong-length-argument a (bool-vector))
 ;;       (should-error wrong-length-argument a b (bool-vector)))
@@ -1408,12 +1410,12 @@
 ;; (let ((a (bool-vector t t nil nil))
 ;;       (b (bool-vector t nil t nil)))
 ;;   (ert-deftest bool-vector-intersection
-;;     (should (equal (bool-vector t nil nil nil) a b)
-;;     (should (equal (bool-vector t nil nil nil) b a)
+;;     (should-equal (bool-vector t nil nil nil) a b)
+;;     (should-equal (bool-vector t nil nil nil) b a)
 ;;     (ert-deftest bool-vector-intersection-sideeffect ()
 ;;       (let ((c (make-bool-vector 4 nil)))
 ;;         (compat--t-bool-vector-intersection a b c)
-;;         (should (equal (bool-vector t nil nil nil) c))))
+;;         (should-equal (bool-vector t nil nil nil) c))))
 ;;     (when (version<= "24.4" emacs-version)
 ;;       (should-error wrong-length-argument a (bool-vector))
 ;;       (should-error wrong-length-argument a b (bool-vector)))
@@ -1428,15 +1430,15 @@
 ;; (let ((a (bool-vector t t nil nil))
 ;;       (b (bool-vector t nil t nil)))
 ;;   (ert-deftest bool-vector-set-difference
-;;     (should (equal (bool-vector nil t nil nil) a b)
-;;     (should (equal (bool-vector nil nil t nil) b a)
+;;     (should-equal (bool-vector nil t nil nil) a b)
+;;     (should-equal (bool-vector nil nil t nil) b a)
 ;;     (ert-deftest bool-vector-set-difference-sideeffect ()
 ;;       (let ((c (make-bool-vector 4 nil)))
 ;;         (compat--t-bool-vector-set-difference a b c)
-;;         (should (equal (bool-vector nil t nil nil) c)))
+;;         (should-equal (bool-vector nil t nil nil) c)))
 ;;       (let ((c (make-bool-vector 4 nil)))
 ;;         (compat--t-bool-vector-set-difference b a c)
-;;         (should (equal (bool-vector nil nil t nil) c))))
+;;         (should-equal (bool-vector nil nil t nil) c))))
 ;;     (when (version<= "24.4" emacs-version)
 ;;       (should-error wrong-length-argument a (bool-vector))
 ;;       (should-error wrong-length-argument a b (bool-vector)))
@@ -1449,28 +1451,28 @@
 ;;     (should-error wrong-type-argument (vector) (vector) (vector))))
 
 ;; (ert-deftest bool-vector-not
-;;   (should (equal (bool-vector) (bool-vector))
-;;   (should (equal (bool-vector t) (bool-vector nil))
-;;   (should (equal (bool-vector nil) (bool-vector t))
-;;   (should (equal (bool-vector t t) (bool-vector nil nil))
-;;   (should (equal (bool-vector t nil) (bool-vector nil t))
-;;   (should (equal (bool-vector nil t) (bool-vector t nil))
-;;   (should (equal (bool-vector nil nil) (bool-vector t t))
+;;   (should-equal (bool-vector) (bool-vector))
+;;   (should-equal (bool-vector t) (bool-vector nil))
+;;   (should-equal (bool-vector nil) (bool-vector t))
+;;   (should-equal (bool-vector t t) (bool-vector nil nil))
+;;   (should-equal (bool-vector t nil) (bool-vector nil t))
+;;   (should-equal (bool-vector nil t) (bool-vector t nil))
+;;   (should-equal (bool-vector nil nil) (bool-vector t t))
 ;;   (should-error wrong-type-argument (vector))
 ;;   (should-error wrong-type-argument (vector) (vector)))
 
 ;; (ert-deftest bool-vector-subsetp
-;;   (should (equal t (bool-vector) (bool-vector))
-;;   (should (equal t (bool-vector t) (bool-vector t))
-;;   (should (equal t (bool-vector nil) (bool-vector t))
-;;   (should (equal nil (bool-vector t) (bool-vector nil))
-;;   (should (equal t (bool-vector nil) (bool-vector nil))
-;;   (should (equal t (bool-vector t t) (bool-vector t t))
-;;   (should (equal t (bool-vector nil nil) (bool-vector t t))
-;;   (should (equal t (bool-vector nil nil) (bool-vector t nil))
-;;   (should (equal t (bool-vector nil nil) (bool-vector nil t))
-;;   (should (equal nil (bool-vector t nil) (bool-vector nil nil))
-;;   (should (equal nil (bool-vector nil t) (bool-vector nil nil))
+;;   (should-equal t (bool-vector) (bool-vector))
+;;   (should-equal t (bool-vector t) (bool-vector t))
+;;   (should-equal t (bool-vector nil) (bool-vector t))
+;;   (should-equal nil (bool-vector t) (bool-vector nil))
+;;   (should-equal t (bool-vector nil) (bool-vector nil))
+;;   (should-equal t (bool-vector t t) (bool-vector t t))
+;;   (should-equal t (bool-vector nil nil) (bool-vector t t))
+;;   (should-equal t (bool-vector nil nil) (bool-vector t nil))
+;;   (should-equal t (bool-vector nil nil) (bool-vector nil t))
+;;   (should-equal nil (bool-vector t nil) (bool-vector nil nil))
+;;   (should-equal nil (bool-vector nil t) (bool-vector nil nil))
 ;;   (when (version<= "24.4" emacs-version)
 ;;     (should-error wrong-length-argument (bool-vector nil) (bool-vector nil 
nil)))
 ;;   (should-error wrong-type-argument (bool-vector) (vector))
@@ -1478,245 +1480,245 @@
 ;;   (should-error wrong-type-argument (vector) (vector)))
 
 ;; (ert-deftest bool-vector-count-consecutive
-;;   (should (equal 0 (bool-vector nil) (bool-vector nil) 0)
-;;   (should (equal 0 (make-bool-vector 10 nil) t 0)
-;;   (should (equal 10 (make-bool-vector 10 nil) nil 0)
-;;   (should (equal 0 (make-bool-vector 10 nil) t 1)
-;;   (should (equal 9 (make-bool-vector 10 nil) nil 1)
-;;   (should (equal 0 (make-bool-vector 10 nil) t 1)
-;;   (should (equal 9 (make-bool-vector 10 t) t 1)
-;;   (should (equal 0 (make-bool-vector 10 nil) t 8)
-;;   (should (equal 2 (make-bool-vector 10 nil) nil 8)
-;;   (should (equal 2 (make-bool-vector 10 t) t 8)
-;;   (should (equal 10 (make-bool-vector 10 t) (make-bool-vector 10 t) 0)
-;;   (should (equal 4 (bool-vector t t t t nil t t t t t) t 0)
-;;   (should (equal 0 (bool-vector t t t t nil t t t t t) t 4)
-;;   (should (equal 5 (bool-vector t t t t nil t t t t t) t 5)
+;;   (should-equal 0 (bool-vector nil) (bool-vector nil) 0)
+;;   (should-equal 0 (make-bool-vector 10 nil) t 0)
+;;   (should-equal 10 (make-bool-vector 10 nil) nil 0)
+;;   (should-equal 0 (make-bool-vector 10 nil) t 1)
+;;   (should-equal 9 (make-bool-vector 10 nil) nil 1)
+;;   (should-equal 0 (make-bool-vector 10 nil) t 1)
+;;   (should-equal 9 (make-bool-vector 10 t) t 1)
+;;   (should-equal 0 (make-bool-vector 10 nil) t 8)
+;;   (should-equal 2 (make-bool-vector 10 nil) nil 8)
+;;   (should-equal 2 (make-bool-vector 10 t) t 8)
+;;   (should-equal 10 (make-bool-vector 10 t) (make-bool-vector 10 t) 0)
+;;   (should-equal 4 (bool-vector t t t t nil t t t t t) t 0)
+;;   (should-equal 0 (bool-vector t t t t nil t t t t t) t 4)
+;;   (should-equal 5 (bool-vector t t t t nil t t t t t) t 5)
 ;;   (should-error wrong-type-argument (vector) nil 0))
 
 ;; (ert-deftest bool-vector-count-population
-;;   (should (equal  0 (bool-vector))
-;;   (should (equal  0 (make-bool-vector 10 nil))
-;;   (should (equal 10 (make-bool-vector 10 t))
-;;   (should (equal  1 (bool-vector nil nil t nil))
-;;   (should (equal  1 (bool-vector nil nil nil t))
-;;   (should (equal  1 (bool-vector t nil nil nil))
-;;   (should (equal  2 (bool-vector t nil nil t))
-;;   (should (equal  2 (bool-vector t nil t nil))
-;;   (should (equal  3 (bool-vector t nil t t))
+;;   (should-equal  0 (bool-vector))
+;;   (should-equal  0 (make-bool-vector 10 nil))
+;;   (should-equal 10 (make-bool-vector 10 t))
+;;   (should-equal  1 (bool-vector nil nil t nil))
+;;   (should-equal  1 (bool-vector nil nil nil t))
+;;   (should-equal  1 (bool-vector t nil nil nil))
+;;   (should-equal  2 (bool-vector t nil nil t))
+;;   (should-equal  2 (bool-vector t nil t nil))
+;;   (should-equal  3 (bool-vector t nil t t))
 ;;   (should-error wrong-type-argument (vector)))
 
 ;; (ert-deftest assoc-delete-all
-;;   (should (equal (list) 0 (list))
+;;   (should-equal (list) 0 (list))
 ;;   ;; Test `eq'
-;;   (should (equal '((1 . one)) 0 (list (cons 1 'one)))
-;;   (should (equal '((1 . one) a) 0 (list (cons 1 'one) 'a))
-;;   (should (equal '((1 . one)) 0 (list (cons 0 'zero) (cons 1 'one)))
-;;   (should (equal '((1 . one)) 0 (list (cons 0 'zero) (cons 0 'zero) (cons 1 
'one)))
-;;   (should (equal '((1 . one)) 0 (list (cons 0 'zero) (cons 1 'one) (cons 0 
'zero)))
-;;   (should (equal '((1 . one) a) 0 (list (cons 0 'zero) (cons 1 'one) 'a  
(cons 0 'zero)))
-;;   (should (equal '(a (1 . one)) 0 (list 'a (cons 0 'zero) (cons 1 'one) 
(cons 0 'zero)))
+;;   (should-equal '((1 . one)) 0 (list (cons 1 'one)))
+;;   (should-equal '((1 . one) a) 0 (list (cons 1 'one) 'a))
+;;   (should-equal '((1 . one)) 0 (list (cons 0 'zero) (cons 1 'one)))
+;;   (should-equal '((1 . one)) 0 (list (cons 0 'zero) (cons 0 'zero) (cons 1 
'one)))
+;;   (should-equal '((1 . one)) 0 (list (cons 0 'zero) (cons 1 'one) (cons 0 
'zero)))
+;;   (should-equal '((1 . one) a) 0 (list (cons 0 'zero) (cons 1 'one) 'a  
(cons 0 'zero)))
+;;   (should-equal '(a (1 . one)) 0 (list 'a (cons 0 'zero) (cons 1 'one) 
(cons 0 'zero)))
 ;;   ;; Test `equal'
-;;   (should (equal '(("one" . one)) "zero" (list (cons "one" 'one)))
-;;   (should (equal '(("one" . one) a) "zero" (list (cons "one" 'one) 'a))
-;;   (should (equal '(("one" . one)) "zero" (list (cons "zero" 'zero) (cons 
"one" 'one)))
-;;   (should (equal '(("one" . one)) "zero" (list (cons "zero" 'zero) (cons 
"zero" 'zero) (cons "one" 'one)))
-;;   (should (equal '(("one" . one)) "zero" (list (cons "zero" 'zero) (cons 
"one" 'one) (cons "zero" 'zero)))
-;;   (should (equal '(("one" . one) a) "zero" (list (cons "zero" 'zero) (cons 
"one" 'one) 'a  (cons "zero" 'zero)))
-;;   (should (equal '(a ("one" . one)) "zero" (list 'a (cons "zero" 'zero) 
(cons "one" 'one) (cons "zero" 'zero)))
+;;   (should-equal '(("one" . one)) "zero" (list (cons "one" 'one)))
+;;   (should-equal '(("one" . one) a) "zero" (list (cons "one" 'one) 'a))
+;;   (should-equal '(("one" . one)) "zero" (list (cons "zero" 'zero) (cons 
"one" 'one)))
+;;   (should-equal '(("one" . one)) "zero" (list (cons "zero" 'zero) (cons 
"zero" 'zero) (cons "one" 'one)))
+;;   (should-equal '(("one" . one)) "zero" (list (cons "zero" 'zero) (cons 
"one" 'one) (cons "zero" 'zero)))
+;;   (should-equal '(("one" . one) a) "zero" (list (cons "zero" 'zero) (cons 
"one" 'one) 'a  (cons "zero" 'zero)))
+;;   (should-equal '(a ("one" . one)) "zero" (list 'a (cons "zero" 'zero) 
(cons "one" 'one) (cons "zero" 'zero)))
 ;;   ;; Test custom predicate
-;;   (should (equal '() 0 (list (cons 1 'one)) #'/=)
-;;   (should (equal '(a) 0 (list (cons 1 'one) 'a) #'/=)
-;;   (should (equal '((0 . zero)) 0 (list (cons 0 'zero) (cons 1 'one)) #'/=)
-;;   (should (equal '((0 . zero) (0 . zero)) 0 (list (cons 0 'zero) (cons 0 
'zero) (cons 1 'one)) #'/=)
-;;   (should (equal '((0 . zero) (0 . zero)) 0 (list (cons 0 'zero) (cons 1 
'one) (cons 0 'zero)) #'/=)
-;;   (should (equal '((0 . zero) a (0 . zero)) 0 (list (cons 0 'zero) (cons 1 
'one) 'a  (cons 0 'zero)) #'/=)
-;;   (should (equal '(a (0 . zero) (0 . zero)) 0 (list 'a (cons 0 'zero) (cons 
1 'one) (cons 0 'zero)) #'/=))
+;;   (should-equal '() 0 (list (cons 1 'one)) #'/=)
+;;   (should-equal '(a) 0 (list (cons 1 'one) 'a) #'/=)
+;;   (should-equal '((0 . zero)) 0 (list (cons 0 'zero) (cons 1 'one)) #'/=)
+;;   (should-equal '((0 . zero) (0 . zero)) 0 (list (cons 0 'zero) (cons 0 
'zero) (cons 1 'one)) #'/=)
+;;   (should-equal '((0 . zero) (0 . zero)) 0 (list (cons 0 'zero) (cons 1 
'one) (cons 0 'zero)) #'/=)
+;;   (should-equal '((0 . zero) a (0 . zero)) 0 (list (cons 0 'zero) (cons 1 
'one) 'a  (cons 0 'zero)) #'/=)
+;;   (should-equal '(a (0 . zero) (0 . zero)) 0 (list 'a (cons 0 'zero) (cons 
1 'one) (cons 0 'zero)) #'/=))
 
 ;; (ert-deftest color-values-from-color-spec
 ;;   ;; #RGB notation
-;;   (should (equal '(0 0 0) "#000")
-;;   (should (equal '(0 0 0) "#000000")
-;;   (should (equal '(0 0 0) "#000000000")
-;;   (should (equal '(0 0 0) "#000000000000")
-;;   (should (equal '(0 0 65535) "#00F")
-;;   (should (equal '(0 0 65535) "#0000FF")
-;;   (should (equal '(0 0 65535) "#000000FFF")
-;;   (should (equal '(0 0 65535) "#00000000FFFF")
-;;   (should (equal '(0 0 65535) "#00f")
-;;   (should (equal '(0 0 65535) "#0000ff")
-;;   (should (equal '(0 0 65535) "#000000fff")
-;;   (should (equal '(0 0 65535) "#00000000ffff")
-;;   (should (equal '(0 0 65535) "#00000000ffFF")
-;;   (should (equal '(#xffff #x0000 #x5555) "#f05")
-;;   (should (equal '(#x1f1f #xb0b0 #xc5c5) "#1fb0C5")
-;;   (should (equal '(#x1f83 #xb0ad #xc5e2) "#1f83b0ADC5e2")
-;;   (should (equal nil "")
-;;   (should (equal nil "#")
-;;   (should (equal nil "#0")
-;;   (should (equal nil "#00")
-;;   (should (equal nil "#0000FG")
-;;   (should (equal nil "#0000FFF")
-;;   (should (equal nil "#0000FFFF")
-;;   (should (equal '(0 4080 65535) "#0000FFFFF")
-;;   (should (equal nil "#000FF")
-;;   (should (equal nil "#0000F")
-;;   (should (equal nil " #000000")
-;;   (should (equal nil "#000000 ")
-;;   (should (equal nil " #000000 ")
-;;   (should (equal nil "#1f83b0ADC5e2g")
-;;   (should (equal nil "#1f83b0ADC5e20")
-;;   (should (equal nil "#12345")
+;;   (should-equal '(0 0 0) "#000")
+;;   (should-equal '(0 0 0) "#000000")
+;;   (should-equal '(0 0 0) "#000000000")
+;;   (should-equal '(0 0 0) "#000000000000")
+;;   (should-equal '(0 0 65535) "#00F")
+;;   (should-equal '(0 0 65535) "#0000FF")
+;;   (should-equal '(0 0 65535) "#000000FFF")
+;;   (should-equal '(0 0 65535) "#00000000FFFF")
+;;   (should-equal '(0 0 65535) "#00f")
+;;   (should-equal '(0 0 65535) "#0000ff")
+;;   (should-equal '(0 0 65535) "#000000fff")
+;;   (should-equal '(0 0 65535) "#00000000ffff")
+;;   (should-equal '(0 0 65535) "#00000000ffFF")
+;;   (should-equal '(#xffff #x0000 #x5555) "#f05")
+;;   (should-equal '(#x1f1f #xb0b0 #xc5c5) "#1fb0C5")
+;;   (should-equal '(#x1f83 #xb0ad #xc5e2) "#1f83b0ADC5e2")
+;;   (should-equal nil "")
+;;   (should-equal nil "#")
+;;   (should-equal nil "#0")
+;;   (should-equal nil "#00")
+;;   (should-equal nil "#0000FG")
+;;   (should-equal nil "#0000FFF")
+;;   (should-equal nil "#0000FFFF")
+;;   (should-equal '(0 4080 65535) "#0000FFFFF")
+;;   (should-equal nil "#000FF")
+;;   (should-equal nil "#0000F")
+;;   (should-equal nil " #000000")
+;;   (should-equal nil "#000000 ")
+;;   (should-equal nil " #000000 ")
+;;   (should-equal nil "#1f83b0ADC5e2g")
+;;   (should-equal nil "#1f83b0ADC5e20")
+;;   (should-equal nil "#12345")
 ;;   ;; rgb: notation
-;;   (should (equal '(0 0 0) "rgb:0/0/0")
-;;   (should (equal '(0 0 0) "rgb:0/0/00")
-;;   (should (equal '(0 0 0) "rgb:0/00/000")
-;;   (should (equal '(0 0 0) "rgb:0/000/0000")
-;;   (should (equal '(0 0 0) "rgb:000/0000/0")
-;;   (should (equal '(0 0 65535) "rgb:000/0000/F")
-;;   (should (equal '(65535 0 65535) "rgb:FFF/0000/F")
-;;   (should (equal '(65535 0 65535) "rgb:FFFF/0000/FFFF")
-;;   (should (equal '(0 255 65535) "rgb:0/00FF/FFFF")
-;;   (should (equal '(#xffff #x2323 #x28a2) "rgb:f/23/28a")
-;;   (should (equal '(#x1234 #x5678 #x09ab) "rgb:1234/5678/09ab")
-;;   (should (equal nil "rgb:/0000/FFFF")
-;;   (should (equal nil "rgb:0000/0000/FFFG")
-;;   (should (equal nil "rgb:0000/0000/FFFFF")
-;;   (should (equal nil "rgb:0000/0000")
-;;   (should (equal nil "rg:0000/0000/0000")
-;;   (should (equal nil "rgb: 0000/0000/0000")
-;;   (should (equal nil "rgbb:0000/0000/0000")
-;;   (should (equal nil "rgb:0000/0000/0000   ")
-;;   (should (equal nil " rgb:0000/0000/0000  ")
-;;   (should (equal nil "  rgb:0000/0000/0000")
-;;   (should (equal nil "rgb:0000/ 0000 /0000")
-;;   (should (equal nil "rgb: 0000 /0000 /0000")
-;;   (should (equal nil "rgb:0//0")
+;;   (should-equal '(0 0 0) "rgb:0/0/0")
+;;   (should-equal '(0 0 0) "rgb:0/0/00")
+;;   (should-equal '(0 0 0) "rgb:0/00/000")
+;;   (should-equal '(0 0 0) "rgb:0/000/0000")
+;;   (should-equal '(0 0 0) "rgb:000/0000/0")
+;;   (should-equal '(0 0 65535) "rgb:000/0000/F")
+;;   (should-equal '(65535 0 65535) "rgb:FFF/0000/F")
+;;   (should-equal '(65535 0 65535) "rgb:FFFF/0000/FFFF")
+;;   (should-equal '(0 255 65535) "rgb:0/00FF/FFFF")
+;;   (should-equal '(#xffff #x2323 #x28a2) "rgb:f/23/28a")
+;;   (should-equal '(#x1234 #x5678 #x09ab) "rgb:1234/5678/09ab")
+;;   (should-equal nil "rgb:/0000/FFFF")
+;;   (should-equal nil "rgb:0000/0000/FFFG")
+;;   (should-equal nil "rgb:0000/0000/FFFFF")
+;;   (should-equal nil "rgb:0000/0000")
+;;   (should-equal nil "rg:0000/0000/0000")
+;;   (should-equal nil "rgb: 0000/0000/0000")
+;;   (should-equal nil "rgbb:0000/0000/0000")
+;;   (should-equal nil "rgb:0000/0000/0000   ")
+;;   (should-equal nil " rgb:0000/0000/0000  ")
+;;   (should-equal nil "  rgb:0000/0000/0000")
+;;   (should-equal nil "rgb:0000/ 0000 /0000")
+;;   (should-equal nil "rgb: 0000 /0000 /0000")
+;;   (should-equal nil "rgb:0//0")
 ;;   ;; rgbi: notation
-;;   (should (equal '(0 0 0) "rgbi:0/0/0")
-;;   (should (equal '(0 0 0) "rgbi:0.0/0.0/0.0")
-;;   (should (equal '(0 0 0) "rgbi:0.0/0/0")
-;;   (should (equal '(0 0 0) "rgbi:0.0/0/0")
-;;   (should (equal '(0 0 0) "rgbi:0/0/0.")
-;;   (should (equal '(0 0 0) "rgbi:0/0/0.0000")
-;;   (should (equal '(0 0 0) "rgbi:0/0/.0")
-;;   (should (equal '(0 0 0) "rgbi:0/0/.0000")
-;;   (should (equal '(65535 0 0) "rgbi:1/0/0.0000")
-;;   (should (equal '(65535 0 0) "rgbi:1./0/0.0000")
-;;   (should (equal '(65535 0 0) "rgbi:1.0/0/0.0000")
-;;   (should (equal '(65535 32768 0) "rgbi:1.0/0.5/0.0000")
-;;   (should (equal '(6554 21843 65469) "rgbi:0.1/0.3333/0.999")
-;;   (should (equal '(0 32768 6554) "rgbi:0/0.5/0.1")
-;;   (should (equal '(66 655 65535) "rgbi:1e-3/1.0e-2/1e0")
-;;   (should (equal '(6554 21843 65469) "rgbi:1e-1/+0.3333/0.00999e2")
-;;   (should (equal nil "rgbi:1.0001/0/0")
-;;   (should (equal nil "rgbi:2/0/0")
-;;   (should (equal nil "rgbi:0.a/0/0")
-;;   (should (equal nil "rgbi:./0/0")
-;;   (should (equal nil "rgbi:./0/0")
-;;   (should (equal nil " rgbi:0/0/0")
-;;   (should (equal nil "rgbi:0/0/0 ")
-;;   (should (equal nil "      rgbi:0/0/0 ")
-;;   (should (equal nil "rgbi:0 /0/ 0")
-;;   (should (equal nil "rgbi:0/ 0 /0")
-;;   (should (equal nil "rgbii:0/0/0")
-;;   (should (equal nil "rgbi :0/0/0")
+;;   (should-equal '(0 0 0) "rgbi:0/0/0")
+;;   (should-equal '(0 0 0) "rgbi:0.0/0.0/0.0")
+;;   (should-equal '(0 0 0) "rgbi:0.0/0/0")
+;;   (should-equal '(0 0 0) "rgbi:0.0/0/0")
+;;   (should-equal '(0 0 0) "rgbi:0/0/0.")
+;;   (should-equal '(0 0 0) "rgbi:0/0/0.0000")
+;;   (should-equal '(0 0 0) "rgbi:0/0/.0")
+;;   (should-equal '(0 0 0) "rgbi:0/0/.0000")
+;;   (should-equal '(65535 0 0) "rgbi:1/0/0.0000")
+;;   (should-equal '(65535 0 0) "rgbi:1./0/0.0000")
+;;   (should-equal '(65535 0 0) "rgbi:1.0/0/0.0000")
+;;   (should-equal '(65535 32768 0) "rgbi:1.0/0.5/0.0000")
+;;   (should-equal '(6554 21843 65469) "rgbi:0.1/0.3333/0.999")
+;;   (should-equal '(0 32768 6554) "rgbi:0/0.5/0.1")
+;;   (should-equal '(66 655 65535) "rgbi:1e-3/1.0e-2/1e0")
+;;   (should-equal '(6554 21843 65469) "rgbi:1e-1/+0.3333/0.00999e2")
+;;   (should-equal nil "rgbi:1.0001/0/0")
+;;   (should-equal nil "rgbi:2/0/0")
+;;   (should-equal nil "rgbi:0.a/0/0")
+;;   (should-equal nil "rgbi:./0/0")
+;;   (should-equal nil "rgbi:./0/0")
+;;   (should-equal nil " rgbi:0/0/0")
+;;   (should-equal nil "rgbi:0/0/0 ")
+;;   (should-equal nil "       rgbi:0/0/0 ")
+;;   (should-equal nil "rgbi:0 /0/ 0")
+;;   (should-equal nil "rgbi:0/ 0 /0")
+;;   (should-equal nil "rgbii:0/0/0")
+;;   (should-equal nil "rgbi :0/0/0")
 ;;   ;; strtod ignores leading whitespace, making these legal colour
 ;;   ;; specifications:
 ;;   ;;
-;;   ;; (should (equal nil "rgbi: 0/0/0")
-;;   ;; (should (equal nil "rgbi: 0/ 0/ 0")
-;;   (should (equal nil "rgbi : 0/0/0")
-;;   (should (equal nil "rgbi:0/0.5/10"))
+;;   ;; (should-equal nil "rgbi: 0/0/0")
+;;   ;; (should-equal nil "rgbi: 0/ 0/ 0")
+;;   (should-equal nil "rgbi : 0/0/0")
+;;   (should-equal nil "rgbi:0/0.5/10"))
 
 ;; (ert-deftest make-lock-file-name
-;;   (should (equal (expand-file-name ".#") "")
-;;   (should (equal (expand-file-name ".#a") "a")
-;;   (should (equal (expand-file-name ".#foo") "foo")
-;;   (should (equal (expand-file-name ".#.") ".")
-;;   (should (equal (expand-file-name ".#.#") ".#")
-;;   (should (equal (expand-file-name ".#.a") ".a")
-;;   (should (equal (expand-file-name ".#.#") ".#")
-;;   (should (equal (expand-file-name "a/.#") "a/")
-;;   (should (equal (expand-file-name "a/.#b") "a/b")
-;;   (should (equal (expand-file-name "a/.#.#") "a/.#")
-;;   (should (equal (expand-file-name "a/.#.") "a/.")
-;;   (should (equal (expand-file-name "a/.#.b") "a/.b")
-;;   (should (equal (expand-file-name "a/.#foo") "a/foo")
-;;   (should (equal (expand-file-name "bar/.#b") "bar/b")
-;;   (should (equal (expand-file-name "bar/.#foo") "bar/foo"))
+;;   (should-equal (expand-file-name ".#") "")
+;;   (should-equal (expand-file-name ".#a") "a")
+;;   (should-equal (expand-file-name ".#foo") "foo")
+;;   (should-equal (expand-file-name ".#.") ".")
+;;   (should-equal (expand-file-name ".#.#") ".#")
+;;   (should-equal (expand-file-name ".#.a") ".a")
+;;   (should-equal (expand-file-name ".#.#") ".#")
+;;   (should-equal (expand-file-name "a/.#") "a/")
+;;   (should-equal (expand-file-name "a/.#b") "a/b")
+;;   (should-equal (expand-file-name "a/.#.#") "a/.#")
+;;   (should-equal (expand-file-name "a/.#.") "a/.")
+;;   (should-equal (expand-file-name "a/.#.b") "a/.b")
+;;   (should-equal (expand-file-name "a/.#foo") "a/foo")
+;;   (should-equal (expand-file-name "bar/.#b") "bar/b")
+;;   (should-equal (expand-file-name "bar/.#foo") "bar/foo"))
 
 ;; (ert-deftest time-equal-p
-;;   (should (equal t nil nil)
+;;   (should-equal t nil nil)
 
 ;;   ;; FIXME: Testing these values can be tricky, because the timestamp
 ;;   ;; might change between evaluating (current-time) and evaluating
 ;;   ;; `time-equal-p', especially in the interpreted compatibility
 ;;   ;; version.
 
-;;   ;; (should (equal t (current-time) nil)
-;;   ;; (should (equal t nil (current-time))
+;;   ;; (should-equal t (current-time) nil)
+;;   ;; (should-equal t nil (current-time))
 
 ;;   ;; While `sleep-for' returns nil, indicating the current time, this
 ;;   ;; behaviour seems to be undefined.  Relying on it is therefore not
 ;;   ;; advised.
-;;   (should (equal nil (current-time) (ignore (sleep-for 0.01)))
-;;   (should (equal nil (current-time) (progn
+;;   (should-equal nil (current-time) (ignore (sleep-for 0.01)))
+;;   (should-equal nil (current-time) (progn
 ;;                               (sleep-for 0.01)
 ;;                               (current-time)))
-;;   (should (equal t '(1 2 3 4) '(1 2 3 4))
-;;   (should (equal nil '(1 2 3 4) '(1 2 3 5))
-;;   (should (equal nil '(1 2 3 5) '(1 2 3 4))
-;;   (should (equal nil '(1 2 3 4) '(1 2 4 4))
-;;   (should (equal nil '(1 2 4 4) '(1 2 3 4))
-;;   (should (equal nil '(1 2 3 4) '(1 3 3 4))
-;;   (should (equal nil '(1 3 3 4) '(1 2 3 4))
-;;   (should (equal nil '(1 2 3 4) '(2 2 3 4))
-;;   (should (equal nil '(2 2 3 4) '(1 2 3 4)))
+;;   (should-equal t '(1 2 3 4) '(1 2 3 4))
+;;   (should-equal nil '(1 2 3 4) '(1 2 3 5))
+;;   (should-equal nil '(1 2 3 5) '(1 2 3 4))
+;;   (should-equal nil '(1 2 3 4) '(1 2 4 4))
+;;   (should-equal nil '(1 2 4 4) '(1 2 3 4))
+;;   (should-equal nil '(1 2 3 4) '(1 3 3 4))
+;;   (should-equal nil '(1 3 3 4) '(1 2 3 4))
+;;   (should-equal nil '(1 2 3 4) '(2 2 3 4))
+;;   (should-equal nil '(2 2 3 4) '(1 2 3 4)))
 
 ;; (ert-deftest date-days-in-month
-;;   (should (equal 31 2020 1)
-;;   (should (equal 30 2020 4)
-;;   (should (equal 29 2020 2)
-;;   (should (equal 28 2021 2))
+;;   (should-equal 31 2020 1)
+;;   (should-equal 30 2020 4)
+;;   (should-equal 29 2020 2)
+;;   (should-equal 28 2021 2))
 
 ;; (ert-deftest decoded-time-period
-;;   (should (equal 0 '())
-;;   (should (equal 0 '(0))
-;;   (should (equal 1 '(1))
-;;   (should (equal 0.125 '((1 . 8)))
-
-;;   (should (equal 60 '(0 1))
-;;   (should (equal 61 '(1 1))
-;;   (should (equal -59 '(1 -1))
-
-;;   (should (equal (* 60 60) '(0 0 1))
-;;   (should (equal (+ (* 60 60) 60) '(0 1 1))
-;;   (should (equal (+ (* 60 60) 120 1) '(1 2 1))
-
-;;   (should (equal (* 60 60 24) '(0 0 0 1))
-;;   (should (equal (+ (* 60 60 24) 1) '(1 0 0 1))
-;;   (should (equal (+ (* 60 60 24) (* 60 60) 60 1) '(1 1 1 1))
-;;   (should (equal (+ (* 60 60 24) (* 60 60) 120 1) '(1 2 1 1))
-
-;;   (should (equal (* 60 60 24 30) '(0 0 0 0 1))
-;;   (should (equal (+ (* 60 60 24 30) 1) '(1 0 0 0 1))
-;;   (should (equal (+ (* 60 60 24 30) 60 1) '(1 1 0 0 1))
-;;   (should (equal (+ (* 60 60 24 30) (* 60 60) 60 1)
+;;   (should-equal 0 '())
+;;   (should-equal 0 '(0))
+;;   (should-equal 1 '(1))
+;;   (should-equal 0.125 '((1 . 8)))
+
+;;   (should-equal 60 '(0 1))
+;;   (should-equal 61 '(1 1))
+;;   (should-equal -59 '(1 -1))
+
+;;   (should-equal (* 60 60) '(0 0 1))
+;;   (should-equal (+ (* 60 60) 60) '(0 1 1))
+;;   (should-equal (+ (* 60 60) 120 1) '(1 2 1))
+
+;;   (should-equal (* 60 60 24) '(0 0 0 1))
+;;   (should-equal (+ (* 60 60 24) 1) '(1 0 0 1))
+;;   (should-equal (+ (* 60 60 24) (* 60 60) 60 1) '(1 1 1 1))
+;;   (should-equal (+ (* 60 60 24) (* 60 60) 120 1) '(1 2 1 1))
+
+;;   (should-equal (* 60 60 24 30) '(0 0 0 0 1))
+;;   (should-equal (+ (* 60 60 24 30) 1) '(1 0 0 0 1))
+;;   (should-equal (+ (* 60 60 24 30) 60 1) '(1 1 0 0 1))
+;;   (should-equal (+ (* 60 60 24 30) (* 60 60) 60 1)
 ;;          '(1 1 1 0 1))
-;;   (should (equal (+ (* 60 60 24 30) (* 60 60 24) (* 60 60) 120 1)
+;;   (should-equal (+ (* 60 60 24 30) (* 60 60 24) (* 60 60) 120 1)
 ;;          '(1 2 1 1 1))
 
-;;   (should (equal (* 60 60 24 365) '(0 0 0 0 0 1))
-;;   (should (equal (+ (* 60 60 24 365) 1)
+;;   (should-equal (* 60 60 24 365) '(0 0 0 0 0 1))
+;;   (should-equal (+ (* 60 60 24 365) 1)
 ;;          '(1 0 0 0 0 1))
-;;   (should (equal (+ (* 60 60 24 365) 60 1)
+;;   (should-equal (+ (* 60 60 24 365) 60 1)
 ;;          '(1 1 0 0 0 1))
-;;   (should (equal (+ (* 60 60 24 365) (* 60 60) 60 1)
+;;   (should-equal (+ (* 60 60 24 365) (* 60 60) 60 1)
 ;;          '(1 1 1 0 0 1))
-;;   (should (equal (+ (* 60 60 24 365) (* 60 60 24) (* 60 60) 60 1)
+;;   (should-equal (+ (* 60 60 24 365) (* 60 60 24) (* 60 60) 60 1)
 ;;          '(1 1 1 1 0 1))
-;;   (should (equal (+ (* 60 60 24 365)
+;;   (should-equal (+ (* 60 60 24 365)
 ;;             (* 60 60 24 30)
 ;;             (* 60 60 24)
 ;;             (* 60 60)
@@ -1732,15 +1734,15 @@
 
 ;; ;; TODO func-arity seems broken
 ;; ;; (ert-deftest func-arity
-;; ;;   (should (equal '(0 . 0) (func-arity (lambda ()))))
-;; ;;   (should (equal '(1 . 1) (func-arity (lambda (x) x))))
-;; ;;   (should (equal '(1 . 2) (func-arity (lambda (x &optional _) x))))
-;; ;;   (should (equal '(0 . many) (func-arity (lambda (&rest _)))))
-;; ;;   (should (equal '(1 . 1) 'identity)
-;; ;;   (should (equal '(0 . many) 'ignore)
-;; ;;   (should (equal '(2 . many) 'defun)
-;; ;;   (should (equal '(2 . 3) 'defalias)
-;; ;;   (should (equal '(1 . unevalled) 'defvar))
+;; ;;   (should-equal '(0 . 0) (func-arity (lambda ()))))
+;; ;;   (should-equal '(1 . 1) (func-arity (lambda (x) x))))
+;; ;;   (should-equal '(1 . 2) (func-arity (lambda (x &optional _) x))))
+;; ;;   (should-equal '(0 . many) (func-arity (lambda (&rest _)))))
+;; ;;   (should-equal '(1 . 1) 'identity)
+;; ;;   (should-equal '(0 . many) 'ignore)
+;; ;;   (should-equal '(2 . many) 'defun)
+;; ;;   (should-equal '(2 . 3) 'defalias)
+;; ;;   (should-equal '(1 . unevalled) 'defvar))
 
 ;; (let ((one (make-symbol "1"))
 ;;       (two (make-symbol "2"))
@@ -1751,19 +1753,19 @@
 ;;   (put one.5 'derived-mode-parent one)
 ;;   (put three 'derived-mode-parent two)
 ;;   (ert-deftest provided-mode-derived-p
-;;     (should (equal one one one)
-;;     (should (equal one two one)
-;;     (should (equal one three one)
-;;     (should (equal nil one eins)
-;;     (should (equal nil two eins)
-;;     (should (equal nil two one.5)
-;;     (should (equal one two one.5 one)
-;;     (should (equal two two one.5 two)
-;;     (should (equal one three one.5 one)
-;;     (should (equal two three one.5 one two)
-;;     (should (equal two three one.5 two one)
-;;     (should (equal three three one.5 two one three)
-;;     (should (equal three three one.5 three two one)))
+;;     (should-equal one one one)
+;;     (should-equal one two one)
+;;     (should-equal one three one)
+;;     (should-equal nil one eins)
+;;     (should-equal nil two eins)
+;;     (should-equal nil two one.5)
+;;     (should-equal one two one.5 one)
+;;     (should-equal two two one.5 two)
+;;     (should-equal one three one.5 one)
+;;     (should-equal two three one.5 one two)
+;;     (should-equal two three one.5 two one)
+;;     (should-equal three three one.5 two one three)
+;;     (should-equal three three one.5 three two one)))
 
 ;; (unless (fboundp 'make-prop-match)
 ;;   (defalias 'make-prop-match



reply via email to

[Prev in Thread] Current Thread [Next in Thread]