Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor :magic test #707

Merged
merged 1 commit into from
Sep 15, 2022
Merged

Refactor :magic test #707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions tests/php-mode-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,24 @@ These are the ###php-mode-test### comments. Valid magics are
listed in `php-mode-test-valid-magics'; no other directives will
be processed."
(cl-letf (((symbol-function 'indent)
(lambda (offset) (equal (current-indentation) offset))))
(lambda (offset)
(let ((current-offset (current-indentation)))
(unless (eq current-offset offset)
(list :line (line-number-at-pos)
:expected offset
:actual current-offset))))))
(let (directives answers)
(save-excursion
(goto-char (point-min))
(while (re-search-forward php-mode-test-magic-regexp nil t)
(setq directives (read (buffer-substring (match-beginning 1)
(match-end 1))))
(setq answers
(append (mapcar (lambda (curr)
(let ((fn (car curr))
(args (mapcar 'eval (cdr-safe curr))))
(if (memq fn php-mode-test-valid-magics)
(apply fn args))))
directives)
answers))))
answers)))
(cl-loop while (re-search-forward php-mode-test-magic-regexp nil t)
for directives = (read (buffer-substring (match-beginning 1) (match-end 1)))
for result = (mapcar (lambda (expr)
(let ((fn (car expr))
(args (mapcar 'eval (cdr-safe expr))))
(if (memq fn php-mode-test-valid-magics)
(apply fn args))))
directives)
append (cl-remove-if #'null result))))))

(defun php-mode-test--buffer-face-list (buffer)
"Return list of (STRING . FACE) from `BUFFER'."
Expand Down Expand Up @@ -154,8 +156,9 @@ file name and check that the faces of the fonts in the buffer match."
,(if indent
'(let ((inhibit-message t)) (indent-region (point-min) (point-max))))
,(if magic
'(should (cl-reduce (lambda (l r) (and l r))
(php-mode-test-process-magics))))
`(should (equal
(cons ,file nil)
(cons ,file (php-mode-test-process-magics)))))
,(if faces
`(should (equal
(cons ,file
Expand Down