mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

Catch more messages in ert-with-message-capture

Browse Source 
* lisp/emacs-lisp/ert-x.el (ert-with-message-capture): Capture
messages from prin1, princ and print.
(ert--make-message-advice): New function.
(ert--make-print-advice): New function.
This commit is contained in:
Gemini Lasswell 2017-09-21 13:35:45 -07:00
parent 28e0c410c9
commit 68baca3ee1
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lisp/emacs-lisp/ert-x.el
View File

@ -286,27 +286,60 @@ BUFFER defaults to current buffer. Does not modify BUFFER."
(defmacro ert-with-message-capture (var &rest body) (defmacro ert-with-message-capture (var &rest body)
"Execute BODY while collecting anything written with `message' in VAR. "Execute BODY while collecting messages in VAR.
Capture all messages produced by `message' when it is called from Capture messages issued by Lisp code and concatenate them
Lisp, and concatenate them separated by newlines into one string. separated by newlines into one string. This includes messages
written by `message' as well as objects printed by `print',
`prin1' and `princ' to the echo area. Messages issued from C
code using the above mentioned functions will not be captured.
This is useful for separating the issuance of messages by the This is useful for separating the issuance of messages by the
code under test from the behavior of the *Messages* buffer." code under test from the behavior of the *Messages* buffer."
(declare (debug (symbolp body)) (declare (debug (symbolp body))
(indent 1)) (indent 1))
(let ((g-advice (gensym))) (let ((g-message-advice (gensym))
(g-print-advice (gensym))
(g-collector (gensym)))
`(let* ((,var "") `(let* ((,var "")
(,g-advice (lambda (func &rest args) (,g-collector (lambda (msg) (setq ,var (concat ,var msg))))
(if (or (null args) (equal (car args) "")) (,g-message-advice (ert--make-message-advice ,g-collector))
(apply func args) (,g-print-advice (ert--make-print-advice ,g-collector)))
(let ((msg (apply #'format-message args))) (advice-add 'message :around ,g-message-advice)
(setq ,var (concat ,var msg "\n")) (advice-add 'prin1 :around ,g-print-advice)
(funcall func "%s" msg)))))) (advice-add 'princ :around ,g-print-advice)
(advice-add 'message :around ,g-advice) (advice-add 'print :around ,g-print-advice)
(unwind-protect (unwind-protect
(progn ,@body) (progn ,@body)
(advice-remove 'message ,g-advice))))) (advice-remove 'print ,g-print-advice)
(advice-remove 'princ ,g-print-advice)
(advice-remove 'prin1 ,g-print-advice)
(advice-remove 'message ,g-message-advice)))))
(defun ert--make-message-advice (collector)
"Create around advice for `message' for `ert-collect-messages'.
COLLECTOR will be called with the message before it is passed
to the real `message'."
(lambda (func &rest args)
(if (or (null args) (equal (car args) ""))
(apply func args)
(let ((msg (apply #'format-message args)))
(funcall collector (concat msg "\n"))
(funcall func "%s" msg)))))
(defun ert--make-print-advice (collector)
"Create around advice for print functions for `ert-collect-messsges'.
The created advice function will just call the original function
unless the output is going to the echo area (when PRINTCHARFUN is
t or PRINTCHARFUN is nil and `standard-output' is t). If the
output is destined for the echo area, the advice function will
convert it to a string and pass it to COLLECTOR first."
(lambda (func object &optional printcharfun)
(if (not (eq t (or printcharfun standard-output)))
(funcall func object printcharfun)
(funcall collector (with-output-to-string
(funcall func object)))
(funcall func object printcharfun))))
(provide 'ert-x) (provide 'ert-x)