From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 30 Aug 2021 14:52:25 +0000 (-0400)
Subject: (cperl-test-bug-14343): Make it work for perl-mode
X-Git-Tag: emacs-28.0.90~1255
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebd7c52f1169fb61a5f9a4a02959e5eedba79d86;p=emacs.git

(cperl-test-bug-14343): Make it work for perl-mode

* test/lisp/progmodes/cperl-mode-tests.el (cperl--tests-heredoc-face):
New const.
(cperl-test-heredocs, cperl-test-bug-14343): Use it.
(cperl-test-identify-no-heredoc): Remove left-over message.
---

diff --git a/test/lisp/progmodes/cperl-mode-tests.el b/test/lisp/progmodes/cperl-mode-tests.el
index 9ab260cc7ca..c03eb52f17e 100644
--- a/test/lisp/progmodes/cperl-mode-tests.el
+++ b/test/lisp/progmodes/cperl-mode-tests.el
@@ -205,7 +205,6 @@ point in the distant past, and is still broken in perl-mode. "
     (dolist (code not-here-docs)
       (with-temp-buffer
         (insert code "\n\n")
-        (message "inserting: %S" code)
         (funcall cperl-test-mode)
         (goto-char (point-min))
         (forward-line 1)
@@ -243,13 +242,15 @@ issued by CPerl mode."
 (defvar perl-continued-statement-offset)
 (defvar perl-indent-level)
 
+(defconst cperl--tests-heredoc-face
+  (if (equal cperl-test-mode 'perl-mode) 'perl-heredoc
+    'font-lock-string-face))
+
 (ert-deftest cperl-test-heredocs ()
   "Test that HERE-docs are fontified with the appropriate face."
   (require 'perl-mode)
   (let ((file (ert-resource-file "here-docs.pl"))
         (cperl-continued-statement-offset perl-continued-statement-offset)
-        (target-font (if (equal cperl-test-mode 'perl-mode) 'perl-heredoc
-                       'font-lock-string-face))
         (case-fold-search nil))
     (with-temp-buffer
       (insert-file-contents file)
@@ -262,7 +263,7 @@ issued by CPerl mode."
           (while (search-forward "look-here" nil t)
             (should (equal
                      (get-text-property (match-beginning 0) 'face)
-                     target-font))
+                     cperl--tests-heredoc-face))
             (beginning-of-line)
             (should (null (looking-at "[ \t]")))
             (forward-line 1)))
@@ -428,7 +429,6 @@ under timeout control."
 (ert-deftest cperl-test-bug-14343 ()
   "Verify that inserting text into a HERE-doc string with Elisp
 does not break fontification."
-  (skip-unless (eq cperl-test-mode #'cperl-mode))
   (with-temp-buffer
     (insert "my $string = <<HERE;\n")
     (insert "One line of text.\n")
@@ -439,13 +439,13 @@ does not break fontification."
     (goto-char (point-min))
     (search-forward "One line")
     (should (equal (get-text-property (point) 'face)
-                   'font-lock-string-face))
+                   cperl--tests-heredoc-face))
     (beginning-of-line)
     (insert "Another line if text.\n")
     (font-lock-ensure)
     (forward-line -1)
     (should (equal (get-text-property (point) 'face)
-                   'font-lock-string-face))
+                   cperl--tests-heredoc-face))
     ))