procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use ert-resource-file in the shorthand tests

Browse source 
Also move to the standard directory naming.
This commit is contained in:
Lars Ingebrigtsen 2021-09-28 06:49:03 +02:00
parent 3cabf64131
commit 7757e9b204
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
test/lisp/progmodes/elisp-resources/simple-shorthand-test.el → test/lisp/progmodes/elisp-mode-resources/simple-shorthand-test.el
View file

22
test/lisp/progmodes/elisp-mode-tests.el
View file

@ -23,6 +23,7 @@
;;; Code:
(require 'ert)
(require 'ert-x)
(require 'xref)
(eval-when-compile (require 'cl-lib))
@ -1047,15 +1048,8 @@ evaluation of BODY."
expected))
(should (not (intern-soft shorthand-sname)))))
(defvar elisp--test-resources-dir
(expand-file-name "elisp-resources/"
(file-name-directory
(or load-file-name
(error "this file needs to be loaded")))))
(ert-deftest elisp-shorthand-load-a-file ()
(let ((test-file (expand-file-name "simple-shorthand-test.el"
elisp--test-resources-dir)))
(let ((test-file (ert-resource-file "simple-shorthand-test.el")))
(mapatoms (lambda (s)
(when (string-match "^elisp--foo-" (symbol-name s))
(unintern s obarray))))
@ -1065,10 +1059,8 @@ evaluation of BODY."
(ert-deftest elisp-shorthand-byte-compile-a-file ()
(let ((test-file (expand-file-name "simple-shorthand-test.el"
elisp--test-resources-dir))
(byte-compiled (expand-file-name "simple-shorthand-test.elc"
elisp--test-resources-dir)))
(let ((test-file (ert-resource-file "simple-shorthand-test.el"))
(byte-compiled (ert-resource-file "simple-shorthand-test.elc")))
(mapatoms (lambda (s)
(when (string-match "^elisp--foo-" (symbol-name s))
(unintern s obarray))))
@ -1081,8 +1073,7 @@ evaluation of BODY."
(should-not (intern-soft "f-test"))))
(ert-deftest elisp-shorthand-completion-at-point ()
(let ((test-file (expand-file-name "simple-shorthand-test.el"
elisp--test-resources-dir)))
(let ((test-file (ert-resource-file "simple-shorthand-test.el")))
(load test-file)
(with-current-buffer (find-file-noselect test-file)
(revert-buffer t t)
@ -1097,8 +1088,7 @@ evaluation of BODY."
(revert-buffer t t))))
(ert-deftest elisp-shorthand-escape ()
(let ((test-file (expand-file-name "simple-shorthand-test.el"
elisp--test-resources-dir)))
(let ((test-file (ert-resource-file "simple-shorthand-test.el")))
(load test-file)
(should (intern-soft "f-test4---"))
(should-not (intern-soft "elisp--foo-test4---"))