Fix font-locking tests

Author: bbatsov

test/clojure-mode-font-lock-test.el

@@ -41,6 +41,17 @@
      (goto-char (point-min))
      ,@body))
 
+(defmacro clojurex-test-with-temp-buffer (content &rest body)
+  "Evaluate BODY in a temporary buffer with CONTENTS."
+  (declare (debug t)
+           (indent 1))
+  `(with-temp-buffer
+     (insert ,content)
+     (clojurex-mode)
+     (font-lock-fontify-buffer)
+     (goto-char (point-min))
+     ,@body))
+
 (defun clojure-get-face-at-range (start end)
   (let ((start-face (get-text-property start 'face))
         (all-faces (cl-loop for i from start to end collect (get-text-property i 'face))))
@@ -58,6 +69,16 @@ buffer."
         (clojure-get-face-at-range start end))
     (clojure-get-face-at-range start end)))
 
+(defun clojurex-test-face-at (start end &optional content)
+  "Get the face between START and END in CONTENT.
+
+If CONTENT is not given, return the face at the specified range in the current
+buffer."
+  (if content
+      (clojurex-test-with-temp-buffer content
+                                      (clojure-get-face-at-range start end))
+    (clojure-get-face-at-range start end)))
+
 (defconst clojure-test-syntax-classes
   [whitespace punctuation word symbol open-paren close-paren expression-prefix
               string-quote paired-delim escape character-quote comment-start
@@ -209,10 +230,10 @@ POS."
   (should (eq (clojure-test-face-at 1 2 "\\,") 'clojure-character-face))
   (should (eq (clojure-test-face-at 1 2 "\\;") 'clojure-character-face)))
 
-(ert-deftest clojure-mode-syntax-table/cljx ()
+(ert-deftest clojurex-mode-syntax-table/cljx ()
   :tags '(fontification syntax-table)
-  (should (eq (clojure-test-face-at 1 5 "#+clj x") 'font-lock-preprocessor-face))
-  (should (eq (clojure-test-face-at 1 6 "#+cljs x") 'font-lock-preprocessor-face)))
+  (should (eq (clojurex-test-face-at 1 5 "#+clj x") 'font-lock-preprocessor-face))
+  (should (eq (clojurex-test-face-at 1 6 "#+cljs x") 'font-lock-preprocessor-face)))
 
 (ert-deftest clojure-mode-syntax-table/refer-ns ()
   :tags '(fontification syntax-table)