diff options
Diffstat (limited to 'test/lisp/help-tests.el')
| -rw-r--r-- | test/lisp/help-tests.el | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/test/lisp/help-tests.el b/test/lisp/help-tests.el index aff5d1853a6..079b1114a81 100644 --- a/test/lisp/help-tests.el +++ b/test/lisp/help-tests.el @@ -58,23 +58,15 @@ ;;; substitute-command-keys (defmacro with-substitute-command-keys-test (&rest body) - `(cl-flet* ((should-be-same-as-c-version - ;; TODO: Remove this when old C function is removed. - (lambda (orig) - (should (equal-including-properties - (substitute-command-keys orig) - (substitute-command-keys-old orig))))) - (test + `(cl-flet* ((test (lambda (orig result) (should (equal-including-properties (substitute-command-keys orig) - result)) - (should-be-same-as-c-version orig))) + result)))) (test-re (lambda (orig regexp) (should (string-match (concat "^" regexp "$") - (substitute-command-keys orig))) - (should-be-same-as-c-version orig)))) + (substitute-command-keys orig)))))) ,@body)) (ert-deftest help-tests-substitute-command-keys/no-change () @@ -369,29 +361,6 @@ C-b undefined "))))) -;; TODO: This is a temporary test that should be removed together with -;; substitute-command-keys-old. -(ert-deftest help-tests-substitute-command-keys/compare () - (with-substitute-command-keys-test - (with-temp-buffer - (Info-mode) - (outline-minor-mode) - (test-re "\\{Info-mode-map}" ".*"))) - (with-substitute-command-keys-test - (with-temp-buffer - (c-mode) - (outline-minor-mode) - (test-re "\\{c-mode-map}" ".*")))) - -(ert-deftest help-tests-substitute-command-keys/compare-all () - (let (keymaps) - (mapatoms (lambda (var) - (when (keymapp var) - (push var keymaps)))) - (dolist (keymap keymaps) - (with-substitute-command-keys-test - (test-re (concat "\\{" (symbol-name keymap) "}") ".*"))))) - (provide 'help-tests) ;;; help-tests.el ends here |