[elpa] externals/hyperbole 712f2f3 1/2: Compatibility changes for tests with Emacs 27.1 (#74)

[ELPA Syncer]

branch: externals/hyperbole
commit 712f2f3739ca92a53729a3dbec40146b2fcba31e
Author: Mats Lidell <mats.lidell@lidells.se>
Commit: GitHub <noreply@github.com>

    Compatibility changes for tests with Emacs 27.1 (#74)
---
 Changes            | 11 +++++++++++
 test/hbut-tests.el |  4 ++--
 test/hui-tests.el  |  2 +-
 test/hypb-tests.el |  5 ++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Changes b/Changes
index 7a1507f..d77741e 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,14 @@
+2021-04-27  Mats Lidell  <matsl@gnu.org>
+
+* test/hypb-tests.el (hypb:replace-match-string-after-27.1-test): Use
+    separate test for replace matches that were fixed after Emacs 27.1.
+
+* test/hui-tests.el (hui-ibut-label-create-fails-if-label-exists): Use
+    string-match.
+
+* test/hbut-tests.el (hbut-ib-create-label-fails-if-label-exists)
+(hbut-pathname-dot-slash-in-other-folder-should-fail-test): Use string-match.
+
 2021-04-26  Bob Weiner  <rsw@gnu.org>
 
 * hui.el (hui:global-bind-key): Renamed from hui:bind-key and made that
diff --git a/test/hbut-tests.el b/test/hbut-tests.el
index 49de855..06b4c4e 100644
--- a/test/hbut-tests.el
+++ b/test/hbut-tests.el
@@ -192,7 +192,7 @@
         (error
          (progn
            (should (equal (car err) 'error))
-           (should (string-search "ibutton at point already has a label" (cadr 
err)))))))))
+           (should (string-match "ibutton at point already has a label" (cadr 
err)))))))))
 
 (ert-deftest hbut-pathname-path-variable-test ()
   "Find file in path variable value."
@@ -352,7 +352,7 @@
         (error
          (progn
            (should (equal (car err) 'error))
-           (should (string-search
+           (should (string-match
                     "(Hyperbole Action Key): No action defined for this 
context; try another location"
                     (cadr err)))))))))
 
diff --git a/test/hui-tests.el b/test/hui-tests.el
index 81a48de..29c70c1 100644
--- a/test/hui-tests.el
+++ b/test/hui-tests.el
@@ -38,7 +38,7 @@
         (error
          (progn
            (should (equal (car err) 'error))
-           (should (string-search "ibutton at point already has a label" (cadr 
err)))))))))
+           (should (string-match "ibutton at point already has a label" (cadr 
err)))))))))
 
 (provide 'hui-tests)
 ;;; hui-tests.el ends here
diff --git a/test/hypb-tests.el b/test/hypb-tests.el
index c64ee4e..c89c6f3 100644
--- a/test/hypb-tests.el
+++ b/test/hypb-tests.el
@@ -79,8 +79,11 @@
                             s
                             (match-beginning 0) (match-end 0)
                             (match-beginning 1) (match-end 1))))
-                 "b<abbc,0,4,1,3>a<ac,0,2,1,1><abc,0,3,1,2>"))
+                 "b<abbc,0,4,1,3>a<ac,0,2,1,1><abc,0,3,1,2>")))
+
+(ert-deftest hypb:replace-match-string-after-27.1-test ()
   ;; anchors (bug#15107, bug#44861)
+  (skip-unless (version< "27.1" emacs-version))
   (should (equal (hypb:replace-match-string "a\\B" "a aaaa" "b")
                  "a bbba"))
   (should (equal (hypb:replace-match-string "\\`\\|x" "--xx--" "z")