22bbf7ca22
* CONTRIBUTE,Makefile.in,configure.ac: Update to reflect test directory moves. * test/file-organisation.org: New file. * test/automated/Makefile.in test/automated/data/decompress/foo.gz test/automated/data/epg/pubkey.asc test/automated/data/epg/seckey.asc test/automated/data/files-bug18141.el.gz test/automated/data/flymake/test.c test/automated/data/flymake/test.pl test/automated/data/package/archive-contents test/automated/data/package/key.pub test/automated/data/package/key.sec test/automated/data/package/multi-file-0.2.3.tar test/automated/data/package/multi-file-readme.txt test/automated/data/package/newer-versions/archive-contents test/automated/data/package/newer-versions/new-pkg-1.0.el test/automated/data/package/newer-versions/simple-single-1.4.el test/automated/data/package/package-test-server.py test/automated/data/package/signed/archive-contents test/automated/data/package/signed/archive-contents.sig test/automated/data/package/signed/signed-bad-1.0.el test/automated/data/package/signed/signed-bad-1.0.el.sig test/automated/data/package/signed/signed-good-1.0.el test/automated/data/package/signed/signed-good-1.0.el.sig test/automated/data/package/simple-depend-1.0.el test/automated/data/package/simple-single-1.3.el test/automated/data/package/simple-single-readme.txt test/automated/data/package/simple-two-depend-1.1.el test/automated/abbrev-tests.el test/automated/auto-revert-tests.el test/automated/calc-tests.el test/automated/icalendar-tests.el test/automated/character-fold-tests.el test/automated/comint-testsuite.el test/automated/descr-text-test.el test/automated/electric-tests.el test/automated/cl-generic-tests.el test/automated/cl-lib-tests.el test/automated/eieio-test-methodinvoke.el test/automated/eieio-test-persist.el test/automated/eieio-tests.el test/automated/ert-tests.el test/automated/ert-x-tests.el test/automated/generator-tests.el test/automated/let-alist.el test/automated/map-tests.el test/automated/advice-tests.el test/automated/package-test.el test/automated/pcase-tests.el test/automated/regexp-tests.el test/automated/seq-tests.el test/automated/subr-x-tests.el test/automated/tabulated-list-test.el test/automated/thunk-tests.el test/automated/timer-tests.el test/automated/epg-tests.el test/automated/eshell.el test/automated/faces-tests.el test/automated/file-notify-tests.el test/automated/auth-source-tests.el test/automated/gnus-tests.el test/automated/message-mode-tests.el test/automated/help-fns.el test/automated/imenu-test.el test/automated/info-xref.el test/automated/mule-util.el test/automated/isearch-tests.el test/automated/json-tests.el test/automated/bytecomp-tests.el test/automated/coding-tests.el test/automated/core-elisp-tests.el test/automated/decoder-tests.el test/automated/files.el test/automated/font-parse-tests.el test/automated/lexbind-tests.el test/automated/occur-tests.el test/automated/process-tests.el test/automated/syntax-tests.el test/automated/textprop-tests.el test/automated/undo-tests.el test/automated/man-tests.el test/automated/completion-tests.el test/automated/dbus-tests.el test/automated/newsticker-tests.el test/automated/sasl-scram-rfc-tests.el test/automated/tramp-tests.el test/automated/obarray-tests.el test/automated/compile-tests.el test/automated/elisp-mode-tests.el test/automated/f90.el test/automated/flymake-tests.el test/automated/python-tests.el test/automated/ruby-mode-tests.el test/automated/subword-tests.el test/automated/replace-tests.el test/automated/simple-test.el test/automated/sort-tests.el test/automated/subr-tests.el test/automated/reftex-tests.el test/automated/sgml-mode-tests.el test/automated/tildify-tests.el test/automated/thingatpt.el test/automated/url-future-tests.el test/automated/url-util-tests.el test/automated/add-log-tests.el test/automated/vc-bzr.el test/automated/vc-tests.el test/automated/xml-parse-tests.el test/BidiCharacterTest.txt test/biditest.el test/cedet/cedet-utests.el test/cedet/ede-tests.el test/cedet/semantic-ia-utest.el test/cedet/semantic-tests.el test/cedet/semantic-utest-c.el test/cedet/semantic-utest.el test/cedet/srecode-tests.el test/cedet/tests/test.c test/cedet/tests/test.el test/cedet/tests/test.make test/cedet/tests/testdoublens.cpp test/cedet/tests/testdoublens.hpp test/cedet/tests/testfriends.cpp test/cedet/tests/testjavacomp.java test/cedet/tests/testnsp.cpp test/cedet/tests/testpolymorph.cpp test/cedet/tests/testspp.c test/cedet/tests/testsppcomplete.c test/cedet/tests/testsppreplace.c test/cedet/tests/testsppreplaced.c test/cedet/tests/testsubclass.cpp test/cedet/tests/testsubclass.hh test/cedet/tests/testtypedefs.cpp test/cedet/tests/testvarnames.c test/etags/CTAGS.good test/etags/ETAGS.good_1 test/etags/ETAGS.good_2 test/etags/ETAGS.good_3 test/etags/ETAGS.good_4 test/etags/ETAGS.good_5 test/etags/ETAGS.good_6 test/etags/a-src/empty.zz test/etags/a-src/empty.zz.gz test/etags/ada-src/2ataspri.adb test/etags/ada-src/2ataspri.ads test/etags/ada-src/etags-test-for.ada test/etags/ada-src/waroquiers.ada test/etags/c-src/a/b/b.c test/etags/c-src/abbrev.c test/etags/c-src/c.c test/etags/c-src/dostorture.c test/etags/c-src/emacs/src/gmalloc.c test/etags/c-src/emacs/src/keyboard.c test/etags/c-src/emacs/src/lisp.h test/etags/c-src/emacs/src/regex.h test/etags/c-src/etags.c test/etags/c-src/exit.c test/etags/c-src/exit.strange_suffix test/etags/c-src/fail.c test/etags/c-src/getopt.h test/etags/c-src/h.h test/etags/c-src/machsyscalls.c test/etags/c-src/machsyscalls.h test/etags/c-src/sysdep.h test/etags/c-src/tab.c test/etags/c-src/torture.c test/etags/cp-src/MDiagArray2.h test/etags/cp-src/Range.h test/etags/cp-src/burton.cpp test/etags/cp-src/c.C test/etags/cp-src/clheir.cpp.gz test/etags/cp-src/clheir.hpp test/etags/cp-src/conway.cpp test/etags/cp-src/conway.hpp test/etags/cp-src/fail.C test/etags/cp-src/functions.cpp test/etags/cp-src/screen.cpp test/etags/cp-src/screen.hpp test/etags/cp-src/x.cc test/etags/el-src/TAGTEST.EL test/etags/el-src/emacs/lisp/progmodes/etags.el test/etags/erl-src/gs_dialog.erl test/etags/f-src/entry.for test/etags/f-src/entry.strange.gz test/etags/f-src/entry.strange_suffix test/etags/forth-src/test-forth.fth test/etags/html-src/algrthms.html test/etags/html-src/index.shtml test/etags/html-src/software.html test/etags/html-src/softwarelibero.html test/etags/lua-src/allegro.lua test/etags/objc-src/PackInsp.h test/etags/objc-src/PackInsp.m test/etags/objc-src/Subprocess.h test/etags/objc-src/Subprocess.m test/etags/objcpp-src/SimpleCalc.H test/etags/objcpp-src/SimpleCalc.M test/etags/pas-src/common.pas test/etags/perl-src/htlmify-cystic test/etags/perl-src/kai-test.pl test/etags/perl-src/yagrip.pl test/etags/php-src/lce_functions.php test/etags/php-src/ptest.php test/etags/php-src/sendmail.php test/etags/prol-src/natded.prolog test/etags/prol-src/ordsets.prolog test/etags/ps-src/rfc1245.ps test/etags/pyt-src/server.py test/etags/tex-src/gzip.texi test/etags/tex-src/nonewline.tex test/etags/tex-src/testenv.tex test/etags/tex-src/texinfo.tex test/etags/y-src/atest.y test/etags/y-src/cccp.c test/etags/y-src/cccp.y test/etags/y-src/parse.c test/etags/y-src/parse.y test/indent/css-mode.css test/indent/js-indent-init-dynamic.js test/indent/js-indent-init-t.js test/indent/js-jsx.js test/indent/js.js test/indent/latex-mode.tex test/indent/modula2.mod test/indent/nxml.xml test/indent/octave.m test/indent/pascal.pas test/indent/perl.perl test/indent/prolog.prolog test/indent/ps-mode.ps test/indent/ruby.rb test/indent/scheme.scm test/indent/scss-mode.scss test/indent/sgml-mode-attribute.html test/indent/shell.rc test/indent/shell.sh test/redisplay-testsuite.el test/rmailmm.el test/automated/buffer-tests.el test/automated/cmds-tests.el test/automated/data-tests.el test/automated/finalizer-tests.el test/automated/fns-tests.el test/automated/inotify-test.el test/automated/keymap-tests.el test/automated/print-tests.el test/automated/libxml-tests.el test/automated/zlib-tests.el: Files Moved.
211 lines
8.9 KiB
EmacsLisp
211 lines
8.9 KiB
EmacsLisp
;;; advice-tests.el --- Test suite for the new advice thingy.
|
|
|
|
;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
|
|
(ert-deftest advice-tests-nadvice ()
|
|
"Test nadvice code."
|
|
(advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
|
|
(advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 2)))
|
|
(advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 5)))
|
|
(defun sm-test1 (x) (+ x 4))
|
|
(should (equal (sm-test1 6) 20))
|
|
(advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 2)))
|
|
(should (equal (sm-test1 6) 10))
|
|
(advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
|
|
(should (equal (sm-test1 6) 50))
|
|
(defun sm-test1 (x) (+ x 14))
|
|
(should (equal (sm-test1 6) 100))
|
|
(should (equal (null (get 'sm-test1 'defalias-fset-function)) nil))
|
|
(advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 5)))
|
|
(should (equal (sm-test1 6) 20))
|
|
(should (equal (get 'sm-test1 'defalias-fset-function) nil))
|
|
|
|
(advice-add 'sm-test3 :around
|
|
(lambda (f &rest args) `(toto ,(apply f args)))
|
|
'((name . wrap-with-toto)))
|
|
(defmacro sm-test3 (x) `(call-test3 ,x))
|
|
(should (equal (macroexpand '(sm-test3 56)) '(toto (call-test3 56)))))
|
|
|
|
(ert-deftest advice-tests-macroaliases ()
|
|
"Test nadvice code on aliases to macros."
|
|
(defmacro sm-test1 (a) `(list ',a))
|
|
(defalias 'sm-test1-alias 'sm-test1)
|
|
(should (equal (macroexpand '(sm-test1-alias 5)) '(list '5)))
|
|
(advice-add 'sm-test1-alias :around
|
|
(lambda (f &rest args) `(cons 1 ,(apply f args))))
|
|
(should (equal (macroexpand '(sm-test1-alias 5)) '(cons 1 (list '5))))
|
|
(defmacro sm-test1 (a) `(list 0 ',a))
|
|
(should (equal (macroexpand '(sm-test1-alias 5)) '(cons 1 (list 0 '5)))))
|
|
|
|
|
|
(ert-deftest advice-tests-advice ()
|
|
"Test advice code."
|
|
(defun sm-test2 (x) (+ x 4))
|
|
(should (equal (sm-test2 6) 10))
|
|
(defadvice sm-test2 (around sm-test activate)
|
|
ad-do-it (setq ad-return-value (* ad-return-value 5)))
|
|
(should (equal (sm-test2 6) 50))
|
|
(ad-deactivate 'sm-test2)
|
|
(should (equal (sm-test2 6) 10))
|
|
(ad-activate 'sm-test2)
|
|
(should (equal (sm-test2 6) 50))
|
|
(defun sm-test2 (x) (+ x 14))
|
|
(should (equal (sm-test2 6) 100))
|
|
(should (equal (null (get 'sm-test2 'defalias-fset-function)) nil))
|
|
(ad-remove-advice 'sm-test2 'around 'sm-test)
|
|
(should (equal (sm-test2 6) 100))
|
|
(ad-activate 'sm-test2)
|
|
(should (equal (sm-test2 6) 20))
|
|
(should (equal (null (get 'sm-test2 'defalias-fset-function)) t))
|
|
|
|
(defadvice sm-test4 (around wrap-with-toto activate)
|
|
ad-do-it (setq ad-return-value `(toto ,ad-return-value)))
|
|
(defmacro sm-test4 (x) `(call-test4 ,x))
|
|
(should (equal (macroexpand '(sm-test4 56)) '(toto (call-test4 56))))
|
|
(defmacro sm-test4 (x) `(call-testq ,x))
|
|
(should (equal (macroexpand '(sm-test4 56)) '(toto (call-testq 56))))
|
|
|
|
;; This used to signal an error (bug#12858).
|
|
(autoload 'sm-test6 "foo")
|
|
(defadvice sm-test6 (around test activate)
|
|
ad-do-it))
|
|
|
|
(ert-deftest advice-tests-combination ()
|
|
"Combining old style and new style advices."
|
|
(defun sm-test5 (x) (+ x 4))
|
|
(should (equal (sm-test5 6) 10))
|
|
(advice-add 'sm-test5 :around (lambda (f y) (* (funcall f y) 5)))
|
|
(should (equal (sm-test5 6) 50))
|
|
(defadvice sm-test5 (around test activate)
|
|
ad-do-it (setq ad-return-value (+ ad-return-value 0.1)))
|
|
(should (equal (sm-test5 5) 45.1))
|
|
(ad-deactivate 'sm-test5)
|
|
(should (equal (sm-test5 6) 50))
|
|
(ad-activate 'sm-test5)
|
|
(should (equal (sm-test5 6) 50.1))
|
|
(defun sm-test5 (x) (+ x 14))
|
|
(should (equal (sm-test5 6) 100.1))
|
|
(advice-remove 'sm-test5 (lambda (f y) (* (funcall f y) 5)))
|
|
(should (equal (sm-test5 6) 20.1)))
|
|
|
|
(ert-deftest advice-test-called-interactively-p ()
|
|
"Check interaction between advice and called-interactively-p."
|
|
(defun sm-test7 (&optional x) (interactive) (+ (or x 7) 4))
|
|
(advice-add 'sm-test7 :around
|
|
(lambda (f &rest args)
|
|
(list (cons 1 (called-interactively-p)) (apply f args))))
|
|
(should (equal (sm-test7) '((1 . nil) 11)))
|
|
(should (equal (call-interactively 'sm-test7) '((1 . t) 11)))
|
|
(let ((smi 7))
|
|
(advice-add 'sm-test7 :before
|
|
(lambda (&rest args)
|
|
(setq smi (called-interactively-p))))
|
|
(should (equal (list (sm-test7) smi)
|
|
'(((1 . nil) 11) nil)))
|
|
(should (equal (list (call-interactively 'sm-test7) smi)
|
|
'(((1 . t) 11) t))))
|
|
(advice-add 'sm-test7 :around
|
|
(lambda (f &rest args)
|
|
(cons (cons 2 (called-interactively-p)) (apply f args))))
|
|
(should (equal (call-interactively 'sm-test7) '((2 . t) (1 . t) 11))))
|
|
|
|
(ert-deftest advice-test-called-interactively-p-around ()
|
|
"Check interaction between around advice and called-interactively-p.
|
|
|
|
This tests the currently broken case of the innermost advice to a
|
|
function being an around advice."
|
|
:expected-result :failed
|
|
(defun sm-test7.2 () (interactive) (cons 1 (called-interactively-p)))
|
|
(advice-add 'sm-test7.2 :around
|
|
(lambda (f &rest args)
|
|
(list (cons 1 (called-interactively-p)) (apply f args))))
|
|
(should (equal (sm-test7.2) '((1 . nil) (1 . nil))))
|
|
(should (equal (call-interactively 'sm-test7.2) '((1 . t) (1 . t)))))
|
|
|
|
(ert-deftest advice-test-called-interactively-p-filter-args ()
|
|
"Check interaction between filter-args advice and called-interactively-p."
|
|
:expected-result :failed
|
|
(defun sm-test7.3 () (interactive) (cons 1 (called-interactively-p)))
|
|
(advice-add 'sm-test7.3 :filter-args #'list)
|
|
(should (equal (sm-test7.3) '(1 . nil)))
|
|
(should (equal (call-interactively 'sm-test7.3) '(1 . t))))
|
|
|
|
(ert-deftest advice-test-call-interactively ()
|
|
"Check interaction between advice on call-interactively and called-interactively-p."
|
|
(defun sm-test7.4 () (interactive) (cons 1 (called-interactively-p)))
|
|
(let ((old (symbol-function 'call-interactively)))
|
|
(unwind-protect
|
|
(progn
|
|
(advice-add 'call-interactively :before #'ignore)
|
|
(should (equal (sm-test7.4) '(1 . nil)))
|
|
(should (equal (call-interactively 'sm-test7.4) '(1 . t))))
|
|
(advice-remove 'call-interactively #'ignore)
|
|
(should (eq (symbol-function 'call-interactively) old)))))
|
|
|
|
(ert-deftest advice-test-interactive ()
|
|
"Check handling of interactive spec."
|
|
(defun sm-test8 (a) (interactive "p") a)
|
|
(defadvice sm-test8 (before adv1 activate) nil)
|
|
(defadvice sm-test8 (before adv2 activate) (interactive "P") nil)
|
|
(should (equal (interactive-form 'sm-test8) '(interactive "P"))))
|
|
|
|
(ert-deftest advice-test-preactivate ()
|
|
(should (equal (null (get 'sm-test9 'defalias-fset-function)) t))
|
|
(defun sm-test9 (a) (interactive "p") a)
|
|
(should (equal (null (get 'sm-test9 'defalias-fset-function)) t))
|
|
(defadvice sm-test9 (before adv1 pre act protect compile) nil)
|
|
(should (equal (null (get 'sm-test9 'defalias-fset-function)) nil))
|
|
(defadvice sm-test9 (before adv2 pre act protect compile)
|
|
(interactive "P") nil)
|
|
(should (equal (interactive-form 'sm-test9) '(interactive "P"))))
|
|
|
|
(ert-deftest advice-test-multiples ()
|
|
(let ((sm-test10 (lambda (a) (+ a 10)))
|
|
(sm-advice (lambda (x) (if (consp x) (list (* 5 (car x))) (* 4 x)))))
|
|
(should (equal (funcall sm-test10 5) 15))
|
|
(add-function :filter-args (var sm-test10) sm-advice)
|
|
(should (advice-function-member-p sm-advice sm-test10))
|
|
(should (equal (funcall sm-test10 5) 35))
|
|
(add-function :filter-return (var sm-test10) sm-advice)
|
|
(should (equal (funcall sm-test10 5) 60))
|
|
;; Make sure we can add multiple times the same function, under the
|
|
;; condition that they have different `name' properties.
|
|
(add-function :filter-args (var sm-test10) sm-advice '((name . "args")))
|
|
(should (equal (funcall sm-test10 5) 140))
|
|
(remove-function (var sm-test10) "args")
|
|
(should (equal (funcall sm-test10 5) 60))
|
|
(add-function :filter-args (var sm-test10) sm-advice '((name . "args")))
|
|
(add-function :filter-return (var sm-test10) sm-advice '((name . "ret")))
|
|
(should (equal (funcall sm-test10 5) 560))
|
|
;; Make sure that if we specify to remove a function that was added
|
|
;; multiple times, they are all removed, rather than removing only some
|
|
;; arbitrary subset of them.
|
|
(remove-function (var sm-test10) sm-advice)
|
|
(should (equal (funcall sm-test10 5) 15))))
|
|
|
|
;; Local Variables:
|
|
;; no-byte-compile: t
|
|
;; End:
|
|
|
|
;;; advice-tests.el ends here.
|