mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Add tests for vc-version-diff

Browse source 
* test/lisp/vc/vc-tests.el (vc-test--version-diff):
New function.
(vc-test-%s06-version-diff): New family of tests.
This commit is contained in:
Matthias Meulien 2021-09-05 02:32:49 +03:00 • committed by Dmitry Gutov
parent 88795df552
commit ea53f0df65
1 changed files with 83 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

85
test/lisp/vc/vc-tests.el
View file

@ -52,7 +52,7 @@
;; - responsible-p (file)
;; - receive-file (file rev)
;; - unregister (file) DONE
;; * checkin (files comment)
;; * checkin (files comment) DONE
;; * find-revision (file rev buffer)
;; * checkout (file &optional rev)
;; * revert (file &optional contents-done)
@ -75,7 +75,7 @@
;; - show-log-entry (revision)
;; - comment-history (file)
;; - update-changelog (files)
;; * diff (files &optional async rev1 rev2 buffer)
;; * diff (files &optional async rev1 rev2 buffer) DONE
;; - revision-completion-table (files)
;; - annotate-command (file buf &optional rev)
;; - annotate-time ()
@ -110,6 +110,7 @@
(require 'ert)
(require 'vc)
(require 'log-edit)
(declare-function w32-application-type "w32proc.c")
@ -598,6 +599,74 @@ This checks also `vc-backend' and `vc-responsible-backend'."
(if tempdir (delete-directory tempdir t))
(run-hooks 'vc-test--cleanup-hook)))))
(declare-function log-edit-done "vc/log-edit")
(defun vc-test--version-diff (backend)
"Check the diff version of a repository."
(let ((vc-handled-backends `(,backend))
(default-directory
(file-name-as-directory
(expand-file-name
(make-temp-name "vc-test") temporary-file-directory)))
(process-environment process-environment)
tempdir
vc-test--cleanup-hook)
(when (eq backend 'Bzr)
(setq tempdir (make-temp-file "vc-test--version-diff" t)
process-environment (cons (format "BZR_HOME=%s" tempdir)
process-environment)))
(unwind-protect
(progn
;; Cleanup.
(add-hook
'vc-test--cleanup-hook
`(lambda () (delete-directory ,default-directory 'recursive)))
;; Create empty repository. Check repository checkout model.
(make-directory default-directory)
(vc-test--create-repo-function backend)
(let* ((tmp-name (expand-file-name "foo" default-directory))
(files (list (file-name-nondirectory tmp-name))))
;; Write and register a new file.
(write-region "originaltext" nil tmp-name nil 'nomessage)
(vc-register (list backend files))
(let ((buff (find-file tmp-name)))
(with-current-buffer buff
(progn
;; Optionally checkout file.
(when (or (eq backend 'RCS) (eq backend 'CVS))
(vc-checkout tmp-name))
;; Checkin file.
(vc-checkin files backend)
(insert "Testing vc-version-diff")
(log-edit-done))))
;; Modify file content.
(when (or (eq backend 'RCS) (eq backend 'CVS))
(vc-checkout tmp-name))
(write-region "updatedtext" nil tmp-name nil 'nomessage)
;; Check version diff.
(vc-version-diff files nil nil)
(should (bufferp (get-buffer "*vc-diff*")))
(with-current-buffer "*vc-diff*"
(progn
(let ((rawtext (buffer-substring-no-properties (point-min)
(point-max))))
(should (string-search "-originaltext" rawtext))
(should (string-search "+updatedtext" rawtext)))))))
;; Save exit.
(ignore-errors
(if tempdir (delete-directory tempdir t))
(run-hooks 'vc-test--cleanup-hook)))))
;; Create the test cases.
(defun vc-test--rcs-enabled ()
@ -715,6 +784,18 @@ This checks also `vc-backend' and `vc-responsible-backend'."
;; "Really want to delete ...?"
(skip-unless (not (eq 'CVS ',backend)))
(vc-test--rename-file ',backend))
(ert-deftest
,(intern (format "vc-test-%s06-version-diff" backend-string)) ()
,(format "Check `vc-version-diff' for the %s backend."
backend-string)
(skip-unless
(ert-test-passed-p
(ert-test-most-recent-result
(ert-get-test
',(intern
(format "vc-test-%s01-register" backend-string))))))
(vc-test--version-diff ',backend))
))))
(provide 'vc-tests)