Improve test infrastructure, test font lock for operators

Author: sfavazza

sysver-mode.el

@@ -222,8 +222,43 @@ This is useful to let the user customize it via the customization options"
 
   ;; define the code-highlighting
   ;; TODO
-  ;; (setq font-lock-defaults
-  ;;       ())
+  (setq font-lock-defaults
+        ;; keywords argument
+        `((
+           ,(cons (regexp-opt (append
+                               sysver-keywords-design-elements
+                               sysver-keywords-struct-procedures-waits) 'symbols)
+                  font-lock-keyword-face)
+
+           ,(cons (regexp-opt (append
+                               ) 'symbols)
+                  font-lock-function-name-face)
+
+           ,(cons (regexp-opt (append
+                               sysver-keywords-aggregate-data-types sysver-keywords-classes) 'symbols)
+                  font-lock-type-face)
+           ;; operators dedicated highlighting (user option)
+           ,(cons (concat "\\s-" (regexp-opt (append
+                                              sysver-keywords-operators)) "\\s-")
+                  (if sysver-emphasize-operators
+                      font-lock-constant-face
+                    nil))               ; maintain default face
+           ;; block delimiter highlighting (user option)
+           ,(cons (regexp-opt (append
+                               sysver-keywords-block-statements) 'symbols)
+                  (if sysver-emphasize-block-statements
+                      font-lock-constant-face
+                    font-lock-type-face))
+
+           ,(cons (regexp-opt (append
+                               )
+                              'symbols)
+                  font-lock-preprocessor-face))
+          nil                            ; fontify also string and comments
+          nil                            ; make the search case-sensitive
+          ))
+  ;; re-fontify current buffer as the defaults are directly changed
+  (font-lock-refresh-defaults)
   )
 
 (provide 'sysver-mode)

test/sysver-misc.el

@@ -3,6 +3,29 @@
 (require 'ert)
 (require 'sysver-mode)
 
+(defmacro sysver-utc-environment (test-string setup-to-test test-body)
+  "Freshly reload the `sysver' major mode and setup the environment for an unit-test-case (UTC).
+
+The TEST-STRING is a string to be inserted into the current buffer.
+The SETUP-TO-TEST should be an unquoted list of statements to setup the feature under test, while
+the TEST-BODY is an unquoted list of statements to verify the tested feature."
+
+  `(progn
+     ;; reload sysver
+     (unload-feature 'sysver-mode t)
+     (load-file "../sysver-mode.el")
+
+     ;; add the setup features to be tested
+     ,@setup-to-test
+
+     ;; enable sysver
+     (sysver-mode)
+     (insert test-string)
+     (goto-char (point-min))
+     (font-lock-fontify-buffer)
+
+     ,@test-body))
+
 (ert-deftest sysver-test-underscore-part-of-word-on ()
   "Test the behavior of the underscore based on a major-mode option.
 
@@ -17,20 +40,53 @@ the expected values."
     (while options
       (with-temp-buffer
 
-        ;; setup
-        (unload-feature 'sysver-mode t)
-        (load-file "../sysver-mode.el")
-        (setq sysver-underscore-is-word-constituent (pop options))
-        (sysver-mode)
-        (insert test-string)
-        (goto-char (point-min))
+        (sysver-utc-environment
+
+         test-string
+
+         ;; feature to test
+         ((setq sysver-underscore-is-word-constituent (pop options)))
+
+         (;; test
+          (forward-word)
+
+          ;; verify
+          (should (equal (point) (pop exp-results)))))))))
+
+(ert-deftest sysver-test-emphasize-operators ()
+  "Test that the emphasize highlighting for the operators is effective.
+
+A string with the target elements to be highlighted is created and the `sysver-emphasize-operators'
+assigned. The result is checked by evaluating the face-property change of the target string."
+
+  ;; all operators are tested by cycling through their list
+  (let ((operator-list (list
+                        "=" "+=" "-=" "*=" "/=" "%=" "&=" "|=" "^=" "<<=" ">>=" "<<<=" ">>>="
+                        "?" "+" "-" "!" "~" "&" "~&" "|" "~|" "^" "~^" "^~"
+                        "*" "/" "%" "==" "!=" "===" "!==" "==?" "!=?" "&&" "||" "**"
+                        "<" "<=" ">" ">=" ">>>" "<<<" "->" "<->" "##" ">>" "<<" "++" "--")))
+
+    (while operator-list
+      (let* ((test-string (concat "### " (pop operator-list) " "))
+             (options '(nil t))
+             (exp-face '(nil font-lock-constant-face))
+             (exp-points `(,(1+ (length test-string)) 4)))
+
+        (while options
+          (with-temp-buffer
+
+            (sysver-utc-environment
 
-        ;; test
-        (forward-word)
+             test-string
 
-        ;; verify
-        (should (equal (point) (pop exp-results))))))
+             ;; feature to test
+             ((setq sysver-emphasize-operators (pop options)))
 
+             (;; test
+              (goto-char (next-single-property-change (point) 'face nil (point-max)))
 
-  ;; ensure the other tests are not affected
-  (require 'sysver-mode))
+              ;; verify
+              (should (equal (point) (pop exp-points))) ; next reached point
+              (should (equal
+                       (get-text-property (point) 'face)
+                       (pop exp-face)))))))))))