-
Notifications
You must be signed in to change notification settings - Fork 6
/
emacs-conflict-test.el
45 lines (35 loc) · 1.61 KB
/
emacs-conflict-test.el
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
;;; emacs-conflict-test.el --- Tests for emacs-conflict
;; Copyright (C) 2019 Pierre Penninckx
;; Author: Pierre Penninckx <[email protected]>
;; This file 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.
;; This file 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 this file. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
(ert-deftest emacs-conflict-find-conflict ()
"Tests finding conflict file."
(should (equal
(mapcar 'file-relative-name (emacs-conflict--get-sync-conflicts "."))
'("tests/conflicts/one.sync-conflict-AABBCC.el"
"tests/conflicts/three.el.pacnew"
"tests/conflicts/two (conflicted copy 2021-05-28 225359).el"))))
(ert-deftest emacs-conflict-get-normal-file ()
"Tests finding back the normal file from the conflict file."
(should
(equal
(mapcar 'emacs-conflict--get-normal-filename
'("tests/conflicts/one.sync-conflict-AABBCC.el"
"tests/conflicts/two (conflicted copy 2021-05-28 225359).el"
"tests/conflicts/three.el.pacnew"))
'("tests/conflicts/one.el"
"tests/conflicts/two.el"
"tests/conflicts/three.el"))))
(provide 'emacs-conflict-test)
;;; emacs-conflict-test.el ends here