1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
;;; diff-hl-test.el --- tests for diff-hl -*- lexical-binding: t -*-
;; Copyright (C) 2020-2024 Free Software Foundation, Inc.
;; Author: Nathan Moreau <nathan.moreau@m4x.org>
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
(require 'diff-hl)
(require 'subr-x) ;; string-trim
(require 'ert)
(require 'vc-git)
(defvar diff-hl-test-source-file
(expand-file-name (concat (file-name-directory (locate-library "diff-hl"))
"test/empty")))
(defvar diff-hl-test-initial-content nil)
(defmacro diff-hl-test-in-source (&rest body)
`(save-window-excursion
(find-file diff-hl-test-source-file)
,@body))
(put 'diff-hl-test-in-source 'lisp-indent-function 0)
(defun diff-hl-test-init ()
(diff-hl-test-in-source
(setq diff-hl-test-initial-content (buffer-string)))
t)
(defun diff-hl-test-teardown ()
(diff-hl-test-in-source
(erase-buffer)
(insert diff-hl-test-initial-content)
(save-buffer)
(pcase (vc-backend buffer-file-name)
(`Git
(vc-git-command nil 0 buffer-file-name "reset"))
(`Hg
(vc-hg-command nil 0 buffer-file-name "revert")))))
(defun diff-hl-test-compute-diff-lines ()
(diff-hl-test-in-source
(save-buffer)
(let ((vc-diff-switches "-w"))
(diff-hl-diff-goto-hunk))
(switch-to-buffer "*vc-diff*")
(let ((lines nil)
(previous-line (point-min)))
(goto-char (point-min))
(while (< (point) (point-max))
(forward-line 1)
(push (string-trim (buffer-substring-no-properties previous-line (point))) lines)
(setq previous-line (point)))
(delq nil (nreverse lines)))))
(defmacro diff-hl-deftest (name &rest body)
`(ert-deftest ,name ()
(diff-hl-test-init)
(unwind-protect
(progn ,@body)
(diff-hl-test-teardown))))
(put 'diff-hl-deftest 'lisp-indent-function 'defun)
(diff-hl-deftest diff-hl-insert ()
(diff-hl-test-in-source
(goto-char (point-max))
(insert "added\n")
(should (equal "+added"
(car (last (diff-hl-test-compute-diff-lines)))))))
(diff-hl-deftest diff-hl-remove ()
(diff-hl-test-in-source
(delete-region (point-min) (point-max))
(should (equal "-last line"
(car (last (diff-hl-test-compute-diff-lines)))))))
(diff-hl-deftest diff-hl-indirect-buffer-insert ()
(diff-hl-test-in-source
(narrow-to-region (point-min) (point-max))
(goto-char (point-max))
(insert "added\n")
(should (equal "+added"
(car (last (diff-hl-test-compute-diff-lines)))))))
(diff-hl-deftest diff-hl-indirect-buffer-remove ()
(diff-hl-test-in-source
(narrow-to-region (point-min) (point-max))
(goto-char (point-min))
(delete-region (point) (point-max))
(should (equal "-last line"
(car (last (diff-hl-test-compute-diff-lines)))))))
(diff-hl-deftest diff-hl-indirect-buffer-move ()
(diff-hl-test-in-source
(narrow-to-region (point-min) (point-max))
(goto-char (point-min))
(kill-whole-line 3)
(goto-char (point-max))
(insert "added\n")
(save-buffer)
(diff-hl-mode 1)
(diff-hl-previous-hunk)
(should (looking-at "added"))
(diff-hl-previous-hunk)
(should (looking-at "function2"))
(should-error (diff-hl-previous-hunk) :type 'user-error)
(diff-hl-next-hunk)
(should (looking-at "added"))
(should-error (diff-hl-next-hunk) :type 'user-error)))
(diff-hl-deftest diff-hl-indirect-buffer-move-async ()
(diff-hl-test-in-source
(let ((diff-hl-update-async t))
(narrow-to-region (point-min) (point-max))
(goto-char (point-min))
(kill-whole-line 3)
(goto-char (point-max))
(insert "added\n")
(save-buffer)
(diff-hl-mode 1)
;; wait for all thread to complete.
(dolist (thread (all-threads))
(unless (eq thread main-thread)
(thread-join thread)))
(diff-hl-previous-hunk)
(should (looking-at "added"))
(diff-hl-previous-hunk)
(should (looking-at "function2"))
(should-error (diff-hl-previous-hunk) :type 'user-error)
(diff-hl-next-hunk)
(should (looking-at "added"))
(should-error (diff-hl-next-hunk) :type 'user-error))))
(diff-hl-deftest diff-hl-can-ignore-staged-changes ()
(diff-hl-test-in-source
(goto-char (point-min))
(insert "new line 1\n")
(save-buffer)
(vc-git-command nil 0 buffer-file-name "add")
(goto-char (point-max))
(insert "new line 2\n")
(save-buffer)
(let ((diff-hl-show-staged-changes t))
(should
(equal (diff-hl-changes)
'((1 1 insert)
(12 1 insert)))))
(let ((diff-hl-show-staged-changes nil))
(should
(equal (diff-hl-changes)
'((12 1 insert)))))))
(diff-hl-deftest diff-hl-flydiff-can-ignore-staged-changes ()
(diff-hl-test-in-source
(goto-char (point-min))
(insert "new line 1\n")
(save-buffer)
(vc-git-command nil 0 buffer-file-name "add")
(goto-char (point-max))
(insert "new line 2\n")
(let ((diff-hl-show-staged-changes t))
(should
(equal (diff-hl-changes-from-buffer
(diff-hl-diff-buffer-with-reference buffer-file-name))
'((1 1 insert)
(12 1 insert)))))
(let ((diff-hl-show-staged-changes nil))
(should
(equal (diff-hl-changes-from-buffer
(diff-hl-diff-buffer-with-reference buffer-file-name))
'((12 1 insert)))))))
(diff-hl-deftest diff-hl-can-split-away-no-trailing-newline ()
(diff-hl-test-in-source
(goto-char (point-max))
(delete-char -1)
(search-backward "}")
(insert " ")
(save-buffer)
(let ((file buffer-file-name)
(dest-buffer (get-buffer-create " *diff-hl-test*")))
(diff-hl-diff-buffer-with-reference file dest-buffer nil 3)
(with-current-buffer dest-buffer
(with-no-warnings
(let (diff-auto-refine-mode)
(diff-hl-diff-skip-to 10)))
(let ((inhibit-read-only t))
(diff-hl-split-away-changes 3))
(should (equal (buffer-substring (point) (point-max))
"@@ -9,2 +9,2 @@
\x20
-last line
+last line
\\ No newline at end of file
"))))))
(defun diff-hl-run-tests ()
(ert-run-tests-batch))
(provide 'diff-hl-test)
;;; diff-hl-test.el ends here
|
