From e7cd4bae44585b4fc0d57fbb98f49930b945a817 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 4 Apr 2022 09:55:03 -0400 Subject: test/lisp/edmacro-tests.el: Adjust to recent changes --- test/lisp/edmacro-tests.el | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'test/lisp/edmacro-tests.el') diff --git a/test/lisp/edmacro-tests.el b/test/lisp/edmacro-tests.el index b5809ad0b77..e386342f6ee 100644 --- a/test/lisp/edmacro-tests.el +++ b/test/lisp/edmacro-tests.el @@ -25,23 +25,24 @@ (require 'edmacro) (ert-deftest edmacro-test-edmacro-parse-keys () - (should (equal (edmacro-parse-keys "") "")) - (should (equal (edmacro-parse-keys "x") "x")) - (should (equal (edmacro-parse-keys "C-a") "\C-a")) + (should (equal (edmacro-parse-keys "") [])) + (should (equal (edmacro-parse-keys "x") [?x])) + (should (equal (edmacro-parse-keys "C-a") [?\C-a])) ;; comments - (should (equal (edmacro-parse-keys ";; foobar") "")) - (should (equal (edmacro-parse-keys ";;;") "")) - (should (equal (edmacro-parse-keys "; ; ;") ";;;")) - (should (equal (edmacro-parse-keys "REM foobar") "")) - (should (equal (edmacro-parse-keys "x ;; foobar") "x")) - (should (equal (edmacro-parse-keys "x REM foobar") "x")) + (should (equal (edmacro-parse-keys ";; foobar") [])) + (should (equal (edmacro-parse-keys ";;;") [])) + (should (equal (edmacro-parse-keys "; ; ;") [?\; ?\; ?\;])) + (should (equal (edmacro-parse-keys "REM foobar") [])) + (should (equal (edmacro-parse-keys "x ;; foobar") [?x])) + (should (equal (edmacro-parse-keys "x REM foobar") [?x])) (should (equal (edmacro-parse-keys "<>") - [134217848 103 111 116 111 45 108 105 110 101 13])) + [?\M-x ?g ?o ?t ?o ?- ?l ?i ?n ?e ?\r])) ;; repetitions - (should (equal (edmacro-parse-keys "3*x") "xxx")) - (should (equal (edmacro-parse-keys "3*C-m") "\C-m\C-m\C-m")) - (should (equal (edmacro-parse-keys "10*foo") "foofoofoofoofoofoofoofoofoofoo"))) + (should (equal (edmacro-parse-keys "3*x") [?x ?x ?x])) + (should (equal (edmacro-parse-keys "3*C-m") [?\C-m ?\C-m ?\C-m])) + (should (equal (edmacro-parse-keys "10*foo") + (apply #'vconcat (make-list 10 [?f ?o ?o]))))) ;;; edmacro-tests.el ends here -- cgit v1.2.3