[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/flymake-refactor f3b8a72 13/18: Refactor flymake-t
From: |
João Távora |
Subject: |
[Emacs-diffs] scratch/flymake-refactor f3b8a72 13/18: Refactor flymake-tests.el in preparation for more tests |
Date: |
Thu, 21 Sep 2017 20:35:26 -0400 (EDT) |
branch: scratch/flymake-refactor
commit f3b8a72c5023052bbd8db568d97b697b7cfe98c3
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Refactor flymake-tests.el in preparation for more tests
Introduce a slightly more generic fixture macro.
* test/lisp/progmodes/flymake-tests.el
(flymake-tests--call-with-fixture): New helper from
flymake-tests--current-face.
(flymake-tests--with-flymake): New macro.
(flymake-tests--current-face): Delete.
(warning-predicate-rx-gcc, warning-predicate-function-gcc)
(warning-predicate-rx-perl, warning-predicate-function-perl):
Use flymake-test--with-flymake.
---
test/lisp/progmodes/flymake-tests.el | 55 +++++++++++++++++++++++++-----------
1 file changed, 39 insertions(+), 16 deletions(-)
diff --git a/test/lisp/progmodes/flymake-tests.el
b/test/lisp/progmodes/flymake-tests.el
index d17f78e..cbef584 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -34,8 +34,14 @@
"Directory containing flymake test data.")
-;; Warning predicate
-(defun flymake-tests--current-face (file predicate)
+;;
+;;
+(cl-defun flymake-tests--call-with-fixture (fn file
+ &key (severity-predicate
+ nil sev-pred-supplied-p))
+ "Call FN after flymake setup in FILE, using `flymake-proc`.
+SEVERITY-PREDICATE is used to setup
+`flymake-proc-warning-predicate'."
(let* ((file (expand-file-name file flymake-tests-data-directory))
(visiting (find-buffer-visiting file))
(buffer (or visiting (find-file-noselect file)))
@@ -43,7 +49,8 @@
(i 0))
(unwind-protect
(with-current-buffer buffer
- (setq-local flymake-proc-warning-predicate predicate)
+ (when sev-pred-supplied-p
+ (setq-local flymake-proc-warning-predicate severity-predicate))
(goto-char (point-min))
(flymake-mode 1)
;; Weirdness here... http://debbugs.gnu.org/17647#25
@@ -58,38 +65,54 @@
(while (and flymake-is-running (< (setq i (1+ i)) 10))
(unless noninteractive (read-event "" nil 0.1))
(sleep-for (+ 0.5 flymake-no-changes-timeout)))
- (flymake-goto-next-error)
- (face-at-point))
+ (funcall fn))
(and buffer
(not visiting)
(let (kill-buffer-query-functions) (kill-buffer buffer))))))
+(cl-defmacro flymake-tests--with-flymake ((file &rest args)
+ &body body)
+ (declare (indent 1)
+ (debug (sexp &rest form)))
+ `(flymake-tests--call-with-fixture (lambda () ,@body) ,file ,@args))
+
(ert-deftest warning-predicate-rx-gcc ()
"Test GCC warning via regexp predicate."
(skip-unless (and (executable-find "gcc") (executable-find "make")))
- (should (eq 'flymake-warning
- (flymake-tests--current-face "test.c" "^[Ww]arning"))))
+ (flymake-tests--with-flymake
+ ("test.c" :severity-predicate "^[Ww]arning")
+ (flymake-goto-next-error)
+ (should (eq 'flymake-warning
+ (face-at-point)))))
(ert-deftest warning-predicate-function-gcc ()
"Test GCC warning via function predicate."
(skip-unless (and (executable-find "gcc") (executable-find "make")))
- (should (eq 'flymake-warning
- (flymake-tests--current-face "test.c"
- (lambda (msg) (string-match "^[Ww]arning" msg))))))
+ (flymake-tests--with-flymake
+ ("test.c" :severity-predicate
+ (lambda (msg) (string-match "^[Ww]arning" msg)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-warning
+ (face-at-point)))))
(ert-deftest warning-predicate-rx-perl ()
"Test perl warning via regular expression predicate."
(skip-unless (executable-find "perl"))
- (should (eq 'flymake-warning
- (flymake-tests--current-face "test.pl" "^Scalar value"))))
+ (flymake-tests--with-flymake
+ ("test.pl" :severity-predicate "^Scalar value")
+ (flymake-goto-next-error)
+ (should (eq 'flymake-warning
+ (face-at-point)))))
(ert-deftest warning-predicate-function-perl ()
"Test perl warning via function predicate."
(skip-unless (executable-find "perl"))
- (should (eq 'flymake-warning
- (flymake-tests--current-face
- "test.pl"
- (lambda (msg) (string-match "^Scalar value" msg))))))
+ (flymake-tests--with-flymake
+ ("test.pl" :severity-predicate
+ (lambda (msg) (string-match "^Scalar value" msg)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-warning
+ (face-at-point)))))
(provide 'flymake-tests)
- [Emacs-diffs] scratch/flymake-refactor updated (fea31e2 -> 7140018), João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 50a6920 04/18: Make flymake-tests.el friendlier to interactive runs, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 2693054 07/18: Flymake faces are not just for "lines" anymore, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 991c88f 11/18: flymake-warning face easier to distinguish from flymake-error, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 7140018 18/18: Protect flymake-ui against commands like fill-paragraph, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 593d4303 16/18: Add a new flymake test for multiple errors and warnings, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 46e0721 01/18: Fix test failure introduced by previous commit, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 46b4391 09/18: flymake-proc.el parses column numbers from gcc/javac errors, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 205c444 03/18: Use non-obsolete variable names in flymake-tests.el, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor f3b8a72 13/18: Refactor flymake-tests.el in preparation for more tests,
João Távora <=
- [Emacs-diffs] scratch/flymake-refactor bac7512 05/18: New flymake-diagnostic-types-alist and more cleanup, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor d3168cf 02/18: Make lisp/progmodes/flymake-ui.el some 150 lines lighter, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 61ba20b 14/18: Echo flymake error messages when navigating errors interactively, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor b2c4135 08/18: Clarify logic around flymake-diagnostic-types-alist, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 192cb7f 17/18: flymake-ui.el highlights GCC notes detected by flymake-proc.el, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 4292342 06/18: Further simplify progmodes/flymake-ui.el, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 14db516 15/18: flymake-ui.el checks file names before considering diagnostics, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor c5cc7e9 10/18: Make debugging flymake-proc.el easier, João Távora, 2017/09/21
- [Emacs-diffs] scratch/flymake-refactor 12aa247 12/18: Protect against timer triggers when no flymake-mode, João Távora, 2017/09/21