mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 00:00:39 -08:00
Code Issues Projects Releases Wiki Activity

Support selecting buffer in ert-with-test-buffer

Browse source 
* lisp/emacs-lisp/ert-x.el (ert-with-test-buffer): Add new keyword
argument :selected to make the buffer current and selected.
(ert-with-test-buffer-selected): Make obsolete and redefine in
terms of ert-with-test-buffer.

* doc/misc/ert.texi (Helper Functions): Document above new
:selected keyword argument, and remove documentation of
ert-with-test-buffer-selected.

* test/lisp/emacs-lisp/ert-x-tests.el
(ert-test-with-test-buffer-selected/selected)
(ert-test-with-test-buffer-selected/modification-hooks)
(ert-test-with-test-buffer-selected/read-only)
(ert-test-with-test-buffer-selected/return-value)
(ert-test-with-test-buffer-selected/buffer-name):
* test/lisp/progmodes/hideshow-tests.el
(hideshow-tests-with-temp-buffer-selected):
* test/lisp/simple-tests.el (kill-whole-line-invisible)
(kill-whole-line-read-only, kill-whole-line-after-other-kill)
(kill-whole-line-buffer-boundaries)
(kill-whole-line-line-boundaries):
* test/lisp/whitespace-tests.el
(whitespace-tests--with-test-buffer, whitespace-tests--global): Use
ert-with-test-buffer instead of ert-with-test-buffer-selected.
This commit is contained in:
Stefan Kangas 2025-02-24 18:54:23 +01:00
parent 637c73d3a8
commit 13ca18e1f7
6 changed files with 50 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lisp/emacs-lisp/ert-x.el
View file

@ -90,17 +90,28 @@ ERT--THUNK with that buffer as current."
(kill-buffer ert--buffer)
(remhash ert--buffer ert--test-buffers))))
(cl-defmacro ert-with-test-buffer ((&key ((:name name-form)))
(cl-defmacro ert-with-test-buffer ((&key ((:name name-form))
((:selected select-form)))
&body body)
"Create a test buffer and run BODY in that buffer.
To be used in ERT tests. If BODY finishes successfully, the test
buffer is killed; if there is an error, the test buffer is kept
around for further inspection. Its name is derived from
the name of the test and the result of NAME-FORM."
(declare (debug ((":name" form) def-body))
To be used in ERT tests. If BODY finishes successfully, the test buffer
is killed; if there is an error, the test buffer is kept around for
further inspection. The name of the buffer is derived from the name of
the test and the result of NAME-FORM.
If SELECT-FORM is non-nil, switch to the test buffer before running
BODY, as if body was in `ert-with-buffer-selected'.
The return value is the last form in BODY."
(declare (debug ((":name" form) (":selected" form) def-body))
(indent 1))
`(ert--call-with-test-buffer ,name-form (lambda () ,@body)))
`(ert--call-with-test-buffer
,name-form
,(if select-form
`(lambda () (ert-with-buffer-selected (current-buffer)
,@body))
`(lambda () ,@body))))
(cl-defmacro ert-with-buffer-selected (buffer-or-name &body body)
"Display a buffer in a temporary selected window and run BODY.
@ -124,13 +135,12 @@ value is the last form in BODY."
(cl-defmacro ert-with-test-buffer-selected ((&key name) &body body)
"Create a test buffer, switch to it, and run BODY.
This combines `ert-with-test-buffer' and
`ert-with-buffer-selected'. The return value is the last form in
BODY."
(declare (debug ((":name" form) body)) (indent 1))
`(ert-with-test-buffer (:name ,name)
(ert-with-buffer-selected (current-buffer)
,@body)))
This combines `ert-with-test-buffer' and `ert-with-buffer-selected'.
The return value is the last form in BODY."
(declare (obsolete ert-with-test-buffer "31.1")
(debug ((":name" form) body)) (indent 1))
`(ert-with-test-buffer (:name ,name :selected t)
,@body))
;;;###autoload
(defun ert-kill-all-test-buffers ()