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

Remove ‘ert-with-function-mocked’ macro in favour of ‘cl-letf’ macro

Browse source 
* lisp/emacs-lisp/ert-x.el (ert-with-function-mocked): Remove macro
in favour of ‘cl-letf’ macro which is more generic.  All existing
uses are migrated accordingly.  The macro has not been included in
an official release yet so it should be fine to delete it.
This commit is contained in:
Michal Nazarewicz 2016-06-07 22:32:59 +02:00
parent 027e6fbfe4
commit 7715ee54b3
6 changed files with 3 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -285,46 +285,6 @@ BUFFER defaults to current buffer. Does not modify BUFFER."
(kill-buffer clone)))))))
(defmacro ert-with-function-mocked (name mock &rest body)
"Mocks function NAME with MOCK and run BODY.
Once BODY finishes (be it normally by returning a value or
abnormally by throwing or signaling), the old definition of
function NAME is restored.
BODY may further change the mock with `fset'.
If MOCK is nil, the function NAME is mocked with a function
`ert-fail'ing when called.
For example:
;; Regular use, function is mocked inside the BODY:
(should (eq 2 (+ 1 1)))
(ert-with-function-mocked ((+ (lambda (a b) (- a b))))
(should (eq 0 (+ 1 1))))
(should (eq 2 (+ 1 1)))
;; Macro correctly recovers from a throw or signal:
(should
(catch 'done
(ert-with-function-mocked ((+ (lambda (a b) (- a b))))
(should (eq 0 (+ 1 1))))
(throw 'done t)))
(should (eq 2 (+ 1 1)))
"
(declare (indent 2))
(let ((old-var (make-symbol "old-var"))
(mock-var (make-symbol "mock-var")))
`(let ((,old-var (symbol-function (quote ,name))) (,mock-var ,mock))
(fset (quote ,name)
(or ,mock-var (lambda (&rest _)
(ert-fail (concat "`" ,(symbol-name name)
"' unexpectedly called.")))))
(unwind-protect
(progn ,@body)
(fset (quote ,name) ,old-var)))))
(provide 'ert-x)
;;; ert-x.el ends here