; Pacify new nadvice-tests byte-compiler warnings.

1 files changed, 20 insertions, 14 deletions

diff --git a/test/lisp/emacs-lisp/nadvice-tests.el b/test/lisp/emacs-lisp/nadvice-tests.el
index f6bd5733ba3..7dfa936214a 100644
--- a/test/lisp/emacs-lisp/nadvice-tests.el
+++ b/test/lisp/emacs-lisp/nadvice-tests.el
@@ -65,8 +65,9 @@
   (defun sm-test2 (x) (+ x 4))
   (declare-function sm-test2 nil)
   (should (equal (sm-test2 6) 10))
-  (defadvice sm-test2 (around sm-test activate)
-    ad-do-it (setq ad-return-value (* ad-return-value 5)))
+  (with-suppressed-warnings ((obsolete defadvice))
+    (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))
@@ -81,8 +82,9 @@
   (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)))
+  (with-suppressed-warnings ((obsolete defadvice))
+    (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))
@@ -90,8 +92,9 @@
 
   ;; This used to signal an error (bug#12858).
   (autoload 'sm-test6 "foo")
-  (defadvice sm-test6 (around test activate)
-    ad-do-it))
+  (with-suppressed-warnings ((obsolete defadvice))
+    (defadvice sm-test6 (around test activate)
+      ad-do-it)))
 
 (ert-deftest advice-tests-combination ()
   "Combining old style and new style advices."
@@ -100,8 +103,9 @@
   (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)))
+  (with-suppressed-warnings ((obsolete defadvice))
+    (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))
@@ -174,18 +178,20 @@ function being an around advice."
 (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)
+  (with-suppressed-warnings ((obsolete defadvice))
+    (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)
+  (with-suppressed-warnings ((obsolete defadvice))
+    (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 ()