mirror of
https://github.com/joaotavora/yasnippet.git
synced 2025-10-13 13:13:03 +00:00
Arrange for same tests to run over dynamic fixtures
* snippet-tests.el (snippet--insert-test-snippet): Removed. (basic-expansion, basic-clear-field, basic-delete-char-in-field) (contrived, contrived-2, nested-expansion, nested-skip-fields) (mirror-of-nested-field, more-nesting, printf-expansion) (printf-mirrors, printf-mirrors-and-navigation) (printf-jump-to-second-field-right-away, sprintf-variation) (constants-and-default-values): Converted to `snippet--define-expansion-test' (snippet--get-fixture): New function. (snippet--define-expansion-test): New helper macro. * snippet.el: Improve documentation slightly. (define-static-snippet): Take `properties' instead of `args'. Re-add debug spec. * snippet.el (define-static-snippet): forms -> snippet-forms
This commit is contained in:
João Távora
parent
00967aa8c0
commit
7750c03f4b
285
snippet-tests.el
285
snippet-tests.el
@ -108,167 +108,150 @@
|
|||||||
(&field last)
|
(&field last)
|
||||||
(&field 1)))))
|
(&field 1)))))
|
||||||
|
|
||||||
(defun snippet--insert-test-snippet (name &optional dynamic-p)
|
(defun snippet--get-fixture (name &optional dynamic-p)
|
||||||
(let* ((assoc (assoc name snippet--test-snippets-alist))
|
(let* ((assoc (assoc name snippet--test-snippets-alist)))
|
||||||
(forms (if dynamic-p
|
(if dynamic-p
|
||||||
(caddr assoc)
|
(caddr assoc)
|
||||||
(cadr assoc))))
|
(cadr assoc))))
|
||||||
(unless forms
|
|
||||||
(error "No %s definition for %s" (if dynamic-p "dynamic" "static") name))
|
|
||||||
(cond (dynamic-p
|
|
||||||
(eval `(with-dynamic-snippet ,@forms)))
|
|
||||||
(t
|
|
||||||
(eval `(with-static-snippet ,@forms))))))
|
|
||||||
|
|
||||||
(ert-deftest basic-expansion ()
|
(defmacro snippet--define-expansion-test (name fixture-name _args &rest body)
|
||||||
(with-temp-buffer
|
(declare (indent 3))
|
||||||
(snippet--insert-test-snippet 'basic)
|
`(progn
|
||||||
(should (equal (buffer-string) "foo bar foo"))
|
(ert-deftest ,(intern (concat (symbol-name name) "-static")) ()
|
||||||
(should (equal (buffer-substring (overlay-start snippet--field-overlay)
|
(let ((fixture (snippet--get-fixture ',fixture-name nil)))
|
||||||
(overlay-end snippet--field-overlay))
|
(if (not fixture)
|
||||||
"foo" ))))
|
(ert-skip "No fixture for static test")
|
||||||
|
(with-temp-buffer
|
||||||
|
(eval `(with-static-snippet ,@fixture))
|
||||||
|
,@body))))
|
||||||
|
(ert-deftest ,(intern (concat (symbol-name name) "-dynamic")) ()
|
||||||
|
(let ((fixture (snippet--get-fixture ',fixture-name 'dynamic)))
|
||||||
|
(if (not fixture)
|
||||||
|
(ert-skip "No fixture for dynamic test")
|
||||||
|
(with-temp-buffer
|
||||||
|
(eval `(with-dynamic-snippet ,@fixture))
|
||||||
|
,@body))))))
|
||||||
|
|
||||||
(ert-deftest basic-clear-field ()
|
|
||||||
(with-temp-buffer
|
|
||||||
(snippet--insert-test-snippet 'basic)
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
|
||||||
(should (equal (buffer-string) "baz bar baz"))))
|
|
||||||
|
|
||||||
(ert-deftest basic-delete-char-in-field ()
|
(snippet--define-expansion-test basic-expansion basic ()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) "foo bar foo"))
|
||||||
(snippet--insert-test-snippet 'basic)
|
(should (equal (buffer-substring (overlay-start snippet--field-overlay)
|
||||||
(ert-simulate-command '(delete-forward-char 1))
|
(overlay-end snippet--field-overlay))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "b"))))
|
"foo" )))
|
||||||
(should (equal (buffer-string) "boo bar boo"))))
|
|
||||||
|
|
||||||
(ert-deftest contrived ()
|
(snippet--define-expansion-test basic-clear-field basic ()
|
||||||
(with-temp-buffer
|
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
||||||
(snippet--insert-test-snippet 'contrived)
|
(should (equal (buffer-string) "baz bar baz")))
|
||||||
(should (equal (buffer-string) ""))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
|
||||||
(ert-simulate-command '(snippet-next-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "bar"))))
|
|
||||||
(ert-simulate-command '(snippet-next-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
|
||||||
(should (equal (buffer-string) "foobarbaz"))))
|
|
||||||
|
|
||||||
(ert-deftest contrived-2 ()
|
(snippet--define-expansion-test basic-delete-char-in-field basic ()
|
||||||
(with-temp-buffer
|
(ert-simulate-command '(delete-forward-char 1))
|
||||||
(snippet--insert-test-snippet 'contrived)
|
(ert-simulate-command '((lambda () (interactive) (insert "b"))))
|
||||||
(should (equal (buffer-string) ""))
|
(should (equal (buffer-string) "boo bar boo")))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
|
||||||
(ert-simulate-command '(snippet-next-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
|
||||||
(ert-simulate-command '(snippet-prev-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "bar"))))
|
|
||||||
(ert-simulate-command '(snippet-prev-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
|
||||||
(should (equal (buffer-string) "foobarbaz"))))
|
|
||||||
|
|
||||||
(ert-deftest nested-expansion ()
|
(snippet--define-expansion-test contrived contrived ()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) ""))
|
||||||
(snippet--insert-test-snippet 'nested)
|
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
||||||
(should (equal (buffer-string) "a nested field and its mirror: nested field"))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '((lambda () (interactive) (insert "bar"))))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "nicely"))))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "nested field"))))
|
(should (equal (buffer-string) "foobarbaz")))
|
||||||
(should (equal (buffer-substring (overlay-start snippet--field-overlay)
|
|
||||||
(overlay-end snippet--field-overlay))
|
|
||||||
"nested field" ))
|
|
||||||
(should (equal (buffer-string) "a nicely nested field and its mirror: nicely nested field"))))
|
|
||||||
|
|
||||||
(ert-deftest nested-skip-fields ()
|
(snippet--define-expansion-test contrived-2 contrived ()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) ""))
|
||||||
(snippet--insert-test-snippet 'nested)
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(should (equal (buffer-string) "a foo and its mirror: foo"))
|
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
||||||
;; this should exit the snippet now, since the two remaining
|
(ert-simulate-command '(snippet-prev-field))
|
||||||
;; fields should be skipped
|
(ert-simulate-command '((lambda () (interactive) (insert "bar"))))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '(snippet-prev-field))
|
||||||
(should (null (overlay-buffer snippet--field-overlay)))))
|
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
||||||
|
(should (equal (buffer-string) "foobarbaz")))
|
||||||
|
|
||||||
(ert-deftest mirror-of-nested-field ()
|
(snippet--define-expansion-test nested-expansion nested ()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) "a nested field and its mirror: nested field"))
|
||||||
(snippet--insert-test-snippet 'mirror-of-nested-field)
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(should (equal (buffer-string) "a nested field, nested mirroring: field"))
|
(ert-simulate-command '((lambda () (interactive) (insert "nicely"))))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '((lambda () (interactive) (insert "nested field"))))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
(should (equal (buffer-substring (overlay-start snippet--field-overlay)
|
||||||
(should (equal (buffer-string) "a nested foo, nested mirroring: foo"))))
|
(overlay-end snippet--field-overlay))
|
||||||
|
"nested field" ))
|
||||||
|
(should (equal (buffer-string) "a nicely nested field and its mirror: nicely nested field")))
|
||||||
|
|
||||||
(ert-deftest more-nesting ()
|
(snippet--define-expansion-test nested-skip-fields nested ()
|
||||||
(with-temp-buffer
|
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
||||||
(snippet--insert-test-snippet 'more-nesting)
|
(should (equal (buffer-string) "a foo and its mirror: foo"))
|
||||||
(should (equal (buffer-string) "a 'rainniar' and a field: 'rainniar'"))
|
;; this should exit the snippet now, since the two remaining
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "bar"))))
|
;; fields should be skipped
|
||||||
(should (equal (buffer-string) "a bar and a field: bar"))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(should (null (overlay-buffer snippet--field-overlay))))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
|
||||||
(should (equal (buffer-string) "a barbaz bar"))
|
|
||||||
(ert-simulate-command '(snippet-prev-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
|
||||||
(should (equal (buffer-string) "a foobarbaz foobar"))))
|
|
||||||
|
|
||||||
(ert-deftest printf-expansion ()
|
(snippet--define-expansion-test mirror-of-nested-field mirror-of-nested-field()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) "a nested field, nested mirroring: field"))
|
||||||
(snippet--insert-test-snippet 'printf)
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(should (equal (buffer-string) "printf (\"%s\",)"))))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
|
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
||||||
|
(should (equal (buffer-string) "a nested foo, nested mirroring: foo")))
|
||||||
|
|
||||||
(ert-deftest printf-mirrors ()
|
(snippet--define-expansion-test more-nesting more-nesting()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) "a 'rainniar' and a field: 'rainniar'"))
|
||||||
(snippet--insert-test-snippet 'printf)
|
(ert-simulate-command '((lambda () (interactive) (insert "bar"))))
|
||||||
(ert-simulate-command '(delete-forward-char 1))
|
(should (equal (buffer-string) "a bar and a field: bar"))
|
||||||
(should (equal (buffer-string) "printf (\"s\")"))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "%"))))
|
(ert-simulate-command '((lambda () (interactive) (insert "baz"))))
|
||||||
(should (equal (buffer-string) "printf (\"%s\",)"))))
|
(should (equal (buffer-string) "a barbaz bar"))
|
||||||
|
(ert-simulate-command '(snippet-prev-field))
|
||||||
|
(ert-simulate-command '((lambda () (interactive) (insert "foo"))))
|
||||||
|
(should (equal (buffer-string) "a foobarbaz foobar")))
|
||||||
|
|
||||||
(ert-deftest printf-mirrors-and-navigation ()
|
(snippet--define-expansion-test printf-expansion printf ()
|
||||||
(with-temp-buffer
|
(should (equal (buffer-string) "printf (\"%s\",)")))
|
||||||
(snippet--insert-test-snippet 'printf)
|
|
||||||
(ert-simulate-command '(delete-forward-char 1))
|
|
||||||
(should (equal (buffer-string) "printf (\"s\")"))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "%"))))
|
|
||||||
(should (equal (buffer-string) "printf (\"%s\",)"))
|
|
||||||
(ert-simulate-command '(snippet-next-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "somevar"))))
|
|
||||||
(should (equal (buffer-string) "printf (\"%s\",somevar)"))))
|
|
||||||
|
|
||||||
(ert-deftest printf-jump-to-second-field-right-away ()
|
(snippet--define-expansion-test printf-mirrors printf ()
|
||||||
(with-temp-buffer
|
(ert-simulate-command '(delete-forward-char 1))
|
||||||
(snippet--insert-test-snippet 'printf)
|
(should (equal (buffer-string) "printf (\"s\")"))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '((lambda () (interactive) (insert "%"))))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "somevar"))))
|
(should (equal (buffer-string) "printf (\"%s\",)")))
|
||||||
(should (equal (buffer-string) "printf (\"%s\",somevar)"))))
|
|
||||||
|
|
||||||
(ert-deftest sprintf-variation ()
|
(snippet--define-expansion-test printf-mirrors-and-navigation printf ()
|
||||||
(with-temp-buffer
|
(ert-simulate-command '(delete-forward-char 1))
|
||||||
(snippet--insert-test-snippet 'sprintf-maybe 'dynamic)
|
(should (equal (buffer-string) "printf (\"s\")"))
|
||||||
(should (equal (buffer-string) "printf (\"%s\",)"))
|
(ert-simulate-command '((lambda () (interactive) (insert "%"))))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "somestring"))))
|
(should (equal (buffer-string) "printf (\"%s\",)"))
|
||||||
(should (equal (buffer-string) "sprintf (somestring,\"%s\",)"))
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(ert-simulate-command '((lambda () (interactive) (insert "somevar"))))
|
||||||
(ert-simulate-command '(snippet-next-field))
|
(should (equal (buffer-string) "printf (\"%s\",somevar)")))
|
||||||
(should (looking-back "sprintf (somestring,\"%s\","))
|
|
||||||
(ert-simulate-command '(snippet-prev-field))
|
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "bla"))))
|
|
||||||
(should (equal (buffer-string) "sprintf (somestring,\"bla\")"))
|
|
||||||
(should (looking-back "sprintf (somestring,\"bla"))
|
|
||||||
(ert-simulate-command '(snippet-next-field))
|
|
||||||
(should (looking-back "sprintf (somestring,\"bla\")"))))
|
|
||||||
|
|
||||||
(ert-deftest constants-and-default-values ()
|
(snippet--define-expansion-test printf-jump-to-second-field-right-away printf ()
|
||||||
(with-temp-buffer
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(snippet--insert-test-snippet 'emacs-version)
|
(ert-simulate-command '((lambda () (interactive) (insert "somevar"))))
|
||||||
(should (equal (buffer-string)
|
(should (equal (buffer-string) "printf (\"%s\",somevar)")))
|
||||||
(concat emacs-version " "
|
|
||||||
(upcase (emacs-version)) " "
|
(snippet--define-expansion-test sprintf-variation sprintf-maybe()
|
||||||
emacs-version)))
|
(should (equal (buffer-string) "printf (\"%s\",)"))
|
||||||
(ert-simulate-command '((lambda () (interactive) (insert "somestring"))))
|
(ert-simulate-command '((lambda () (interactive) (insert "somestring"))))
|
||||||
(should (equal (buffer-string)
|
(should (equal (buffer-string) "sprintf (somestring,\"%s\",)"))
|
||||||
(concat "somestring" " "
|
(ert-simulate-command '(snippet-next-field))
|
||||||
(upcase (emacs-version)) " "
|
(ert-simulate-command '(snippet-next-field))
|
||||||
"somestring")))))
|
(should (looking-back "sprintf (somestring,\"%s\","))
|
||||||
|
(ert-simulate-command '(snippet-prev-field))
|
||||||
|
(ert-simulate-command '((lambda () (interactive) (insert "bla"))))
|
||||||
|
(should (equal (buffer-string) "sprintf (somestring,\"bla\")"))
|
||||||
|
(should (looking-back "sprintf (somestring,\"bla"))
|
||||||
|
(ert-simulate-command '(snippet-next-field))
|
||||||
|
(should (looking-back "sprintf (somestring,\"bla\")")))
|
||||||
|
|
||||||
|
(snippet--define-expansion-test constants-and-default-values emacs-version()
|
||||||
|
(should (equal (buffer-string)
|
||||||
|
(concat emacs-version " "
|
||||||
|
(upcase (emacs-version)) " "
|
||||||
|
emacs-version)))
|
||||||
|
(ert-simulate-command '((lambda () (interactive) (insert "somestring"))))
|
||||||
|
(should (equal (buffer-string)
|
||||||
|
(concat "somestring" " "
|
||||||
|
(upcase (emacs-version)) " "
|
||||||
|
"somestring"))))
|
||||||
|
|
||||||
(ert-deftest wrap-selected-region ()
|
(ert-deftest wrap-selected-region ()
|
||||||
;; this test needs some work. testing with `region-active-p' is hard
|
;; this test needs some work. testing with `region-active-p' is hard
|
||||||
@ -351,5 +334,15 @@
|
|||||||
(should-error (snippet--canonicalize-form '(&field 1 (foo) (bar))))
|
(should-error (snippet--canonicalize-form '(&field 1 (foo) (bar))))
|
||||||
(should-error (snippet--canonicalize-form '(&eval (foo) (bar)))))
|
(should-error (snippet--canonicalize-form '(&eval (foo) (bar)))))
|
||||||
|
|
||||||
|
|
||||||
|
;; pretty forms
|
||||||
|
(cl-loop for sym in (list 'snippet--define-expansion-test)
|
||||||
|
for regexp = (format "(\\(%S\\)\\s +\\(\\(\\w\\|\\s_\\)+\\)"
|
||||||
|
sym)
|
||||||
|
do (font-lock-add-keywords
|
||||||
|
'emacs-lisp-mode
|
||||||
|
`((,regexp (1 font-lock-keyword-face)
|
||||||
|
(2 font-lock-variable-name-face)))))
|
||||||
|
|
||||||
(provide 'snippet-tests)
|
(provide 'snippet-tests)
|
||||||
|
|
||||||
|
|||||||
@ -237,7 +237,8 @@ As `define-static-snippet' but doesn't define a function."
|
|||||||
("&field" sexp &or ("&nested" &rest snippet-form) def-form)
|
("&field" sexp &or ("&nested" &rest snippet-form) def-form)
|
||||||
def-form))
|
def-form))
|
||||||
|
|
||||||
(defmacro define-static-snippet (name _properties &optional docstring &rest forms)
|
(defmacro define-static-snippet (name _properties &optional docstring
|
||||||
|
&rest snippet-forms)
|
||||||
"Make a snippet-inserting function from FORMS.
|
"Make a snippet-inserting function from FORMS.
|
||||||
|
|
||||||
Each form in SNIPPET-FORMS, inserted at point in order, can be:
|
Each form in SNIPPET-FORMS, inserted at point in order, can be:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user