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

Jump to bottom

Change tests so that we test our own implementations only. #209

Merged
merged 3 commits into from
May 6, 2024
Merged

Change tests so that we test our own implementations only. #209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a5bb0d
Change tests so that we test our own implementations only.
tpapp Apr 9, 2024
fecfe20
Update julia-mode-tests.el
tpapp May 3, 2024
eadbdbe
Revert "Update julia-mode-tests.el"
tpapp May 6, 2024
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
17 changes: 9 additions & 8 deletions julia-mode-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"Assert that TEXT at position POS gets font-locked with FACE in `julia-mode'."
`(should (eq ,face (julia--get-font-lock ,text ,pos))))

(defun julia--should-move-point-helper (text fun from to &optional end arg)
(defun julia--should-move-point-helper (text fun from to &optional end &rest args)
"Takes the same arguments as `julia--should-move-point', returns a cons of the expected and the actual point."
(with-temp-buffer
(julia-mode)
Expand All @@ -74,25 +74,26 @@
(if (stringp from)
(re-search-forward from)
(goto-char from))
(funcall fun arg)
(apply fun args)
(let ((actual-to (point))
(expected-to
(if (stringp to)
(progn (goto-char (point-min))
(re-search-forward to)
(if end (goto-char (match-end 0))
(if end
tpapp marked this conversation as resolved.
Show resolved Hide resolved
(goto-char (match-end 0))
(goto-char (match-beginning 0))
(point-at-bol)))
to)))
(cons expected-to actual-to))))

(defmacro julia--should-move-point (text fun from to &optional end arg)
(defmacro julia--should-move-point (text fun from to &optional end &rest args)
"With TEXT in `julia-mode', after calling FUN, the point should move FROM\
to TO. If FROM is a string, move the point to matching string before calling
function FUN. If TO is a string, match resulting point to point a beginning of
matching line or end of match if END is non-nil. Optional ARG is passed to FUN."
(declare (indent defun))
`(let ((positions (julia--should-move-point-helper ,text ,fun ,from ,to ,end ,arg)))
`(let ((positions (julia--should-move-point-helper ,text ,fun ,from ,to ,end ,@args)))
(should (eq (car positions) (cdr positions)))))

;;; indent tests
Expand Down Expand Up @@ -892,10 +893,10 @@ return n * fact(n-1)
end
end
return fact(x)
end" 'end-of-defun "n == 0" "end[ \n]+end\n" 'end))
end" 'julia-end-of-defun "function fact(n)" "end[ \n]+end" 'end))

(ert-deftest julia--test-end-of-defun-nested-2 ()
"Point should move to end of outer function when called from inner with prefix."
"Point should move to end of outer function when called from outer."
(julia--should-move-point
"function f(x)
function fact(n)
Expand All @@ -906,7 +907,7 @@ return n * fact(n-1)
end
end
return fact(x)
end" 'end-of-defun "n == 0" "return fact(x)[ \n]+end" 'end 2))
end" 'julia-end-of-defun "function f(x)" "return fact(x)[ \n]+end" 'end))

;;;
;;; latex completion tests
Expand Down
Loading