Merge recently added kbd tests

* test/lisp/subr-tests.el (subr--kbd): Merge test...
(subr-test-kbd): ...with this one.  Fix thinko in my previous commit.
Thanks to Mattias Engdegård <mattiase@acm.org>.
This commit is contained in:
Stefan Kangas 2021-01-08 15:26:02 +01:00
parent 5ac7b48075
commit a31bfd5945

View file

@ -66,9 +66,15 @@
(ert-deftest subr-test-kbd ()
(should (equal (kbd "f") "f"))
(should (equal (kbd "F1") "F1"))
(should (equal (kbd "<f1>") [f1]))
(should (equal (kbd "RET") "\C-m"))
(should (equal (kbd "C-x a") "\C-xa")))
(should (equal (kbd "C-x a") "\C-xa"))
;; Check that kbd handles both new and old style key descriptions
;; (bug#45536).
(should (equal (kbd "s-<return>") [s-return]))
(should (equal (kbd "<s-return>") [s-return]))
(should (equal (kbd "C-M-<return>") [C-M-return]))
(should (equal (kbd "<C-M-return>") [C-M-return])))
(ert-deftest subr-test-define-prefix-command ()
(define-prefix-command 'foo-prefix-map)
@ -653,13 +659,5 @@ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350."
(should (>= (length (apropos-internal "^help" #'commandp)) 15))
(should-not (apropos-internal "^next-line$" #'keymapp)))
(ert-deftest subr--kbd ()
;; Check that kbd handles both new and old style key descriptions
;; (bug#45536).
(should (equal (kbd "s-<return>") [s-return]))
(should (equal (kbd "<s-return>") [s-return]))
(should (equal (kbd "C-M-<return>") [C-M-return]))
(should (equal (kbd "<C-M-return>") [C-M-return])))
(provide 'subr-tests)
;;; subr-tests.el ends here