From: Glenn Morris <rgm@gnu.org>
Date: Thu, 9 Jul 2020 00:35:54 +0000 (-0700)
Subject: Update tests for recent changes
X-Git-Tag: emacs-28.0.90~7041
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef8bd7d8561be7ae2749127606bc40eed421601e;p=emacs.git

Update tests for recent changes

* test/lisp/descr-text-tests.el (descr-text-test-desc):
Update for recent change to describe-char-eldoc.
* test/lisp/progmodes/elisp-mode-tests.el
(elisp--highlight-function-argument-indexed)
(elisp--highlight-function-argument-keyed-1)
(elisp--highlight-function-argument-keyed-2):
Update for recent change to elisp--highlight-function-argument.
---

diff --git a/test/lisp/descr-text-tests.el b/test/lisp/descr-text-tests.el
index 74fcdf5af37..b060dffb0ff 100644
--- a/test/lisp/descr-text-tests.el
+++ b/test/lisp/descr-text-tests.el
@@ -75,18 +75,18 @@
     (goto-char (point-min))
     (should (eq ?a (following-char))) ; make sure we are where we think we are
     ;; Function should return nil for an ASCII character.
-    (should (not (describe-char-eldoc)))
+    (should (not (describe-char-eldoc 'ignore)))
 
     (goto-char (1+ (point)))
     (should (eq ?… (following-char)))
     (let ((eldoc-echo-area-use-multiline-p t))
       ;; Function should return description of an Unicode character.
       (should (equal "U+2026: Horizontal ellipsis (Po: Punctuation, Other)"
-                     (describe-char-eldoc))))
+                     (describe-char-eldoc 'ignore))))
 
     (goto-char (point-max))
     ;; At the end of the buffer, function should return nil and not blow up.
-    (should (not (describe-char-eldoc)))))
+    (should (not (describe-char-eldoc 'ignore)))))
 
 
 (provide 'descr-text-test)
diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index 2ba00656862..2de533e5eb9 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -194,7 +194,7 @@
   (dotimes (i 3)
     (should
      (equal (elisp-mode-tests--face-propertized-string
-             (elisp--highlight-function-argument 'foo "(A B C)" (1+ i) "foo: "))
+             (elisp--highlight-function-argument 'foo "(A B C)" (1+ i)))
             (propertize (nth i '("A" "B" "C"))
                         'face 'eldoc-highlight-function-argument)))))
 
@@ -206,7 +206,7 @@
     (cl-flet ((bold-arg (i)
                (elisp-mode-tests--face-propertized-string
                 (elisp--highlight-function-argument
-                 'foo "(PROMPT LST &key A B C)" i "foo: "))))
+                 'foo "(PROMPT LST &key A B C)" i))))
       (should-not (bold-arg 0))
       (progn (forward-sexp) (forward-char))
       (should (equal (bold-arg 1) "PROMPT"))
@@ -226,7 +226,7 @@
     (cl-flet ((bold-arg (i)
                (elisp-mode-tests--face-propertized-string
                 (elisp--highlight-function-argument
-                 'foo "(X &key A B C)" i "foo: "))))
+                 'foo "(X &key A B C)" i))))
       (should-not (bold-arg 0))
       ;; The `:b' specifies positional arg `X'.
       (progn (forward-sexp) (forward-char))