[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5b643c7 24/57: Add another send/receive test
From: |
Justin Burkett |
Subject: |
[elpa] master 5b643c7 24/57: Add another send/receive test |
Date: |
Tue, 3 Nov 2020 14:32:21 -0500 (EST) |
branch: master
commit 5b643c7839a2130591228862eb130f72e06f2c87
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Add another send/receive test
---
vdiff-test.el | 23 +++++++++++++++++++++++
vdiff.el | 13 +++++++++----
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/vdiff-test.el b/vdiff-test.el
index f885e17..9bb4a41 100644
--- a/vdiff-test.el
+++ b/vdiff-test.el
@@ -81,6 +81,18 @@
(ert-deftest vdiff-test-transmiting ()
"Test transmitting changes."
+ ;; Test sending first change
+ (vdiff-test-with-buffers
+ "1|2|3|4|5|6|7|8|9|10|"
+ "1|2|4|4|5|6|8|8|9|10|"
+ (with-current-buffer buffer-a
+ (goto-char (point-min))
+ (call-interactively 'vdiff-next-hunk)
+ (call-interactively 'vdiff-send-changes))
+ (with-current-buffer buffer-b
+ (should (string= (vdiff-test-buffer-string)
+ "1|2|3|4|5|6|8|8|9|10|"))))
+ ;; Test sending everything
(vdiff-test-with-buffers
"1|2|3|4|5|6|7|8|9|10|"
"1|2|4|4|5|6|8|8|9|10|"
@@ -92,6 +104,17 @@
(ert-deftest vdiff-test-receiving ()
"Test receiving changes."
+ ;; Test receiving first change
+ (vdiff-test-with-buffers
+ "1|2|3|4|5|6|7|8|9|10|"
+ "1|2|4|4|5|6|8|8|9|10|"
+ (with-current-buffer buffer-b
+ (goto-char (point-min))
+ (call-interactively 'vdiff-next-hunk)
+ (call-interactively 'vdiff-receive-changes)
+ (should (string= (vdiff-test-buffer-string)
+ "1|2|3|4|5|6|8|8|9|10|"))))
+ ;; Test receiving everything
(vdiff-test-with-buffers
"1|2|3|4|5|6|7|8|9|10|"
"1|2|4|4|5|6|8|8|9|10|"
diff --git a/vdiff.el b/vdiff.el
index df044e4..e636a91 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1760,33 +1760,38 @@ with non-nil USE-FOLDS."
(next-overlay-change pnt)))))))
pnt))
+(defun vdiff--recenter ()
+ "Wrapped version of `recenter'."
+ (unless vdiff--testing-mode
+ (recenter)))
+
(defun vdiff-next-hunk (arg)
"Jump to next change in this buffer."
(interactive "p")
(let ((count (or arg 1)))
(goto-char (vdiff--nth-hunk count))
- (recenter)))
+ (vdiff--recenter)))
(defun vdiff-previous-hunk (arg)
"Jump to previous change in this buffer."
(interactive "p")
(let ((count (or (- arg) -1)))
(goto-char (vdiff--nth-hunk count))
- (recenter)))
+ (vdiff--recenter)))
(defun vdiff-next-fold (arg)
"Jump to next fold in this buffer."
(interactive "p")
(let ((count (or arg 1)))
(goto-char (vdiff--nth-hunk count t))
- (recenter)))
+ (vdiff--recenter)))
(defun vdiff-previous-fold (arg)
"Jump to previous fold in this buffer."
(interactive "p")
(let ((count (or (- arg) -1)))
(goto-char (vdiff--nth-hunk count t))
- (recenter)))
+ (vdiff--recenter)))
;; * Session
- [elpa] master 773e3eb 28/57: Fix compiler warnings, (continued)
- [elpa] master 773e3eb 28/57: Fix compiler warnings, Justin Burkett, 2020/11/03
- [elpa] master 3bfb5de 32/57: Truncate long lines by default, Justin Burkett, 2020/11/03
- [elpa] master c806fe2 36/57: Allow selective sending in change hunks, Justin Burkett, 2020/11/03
- [elpa] master 007e44b 56/57: Version 0.2.4, Justin Burkett, 2020/11/03
- [elpa] master 69eacfe 18/57: Fix and simplify final newline detection, Justin Burkett, 2020/11/03
- [elpa] master 68d6ea3 23/57: Make name of vdiff-test consistent with prefixes, Justin Burkett, 2020/11/03
- [elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send, Justin Burkett, 2020/11/03
- [elpa] master 6c3731a 40/57: Fixup vdiff--transmit-change for 3way diffs, Justin Burkett, 2020/11/03
- [elpa] master ef899b8 46/57: Reset truncate-lines on cleanup, Justin Burkett, 2020/11/03
- [elpa] master c5e0cb0 47/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 5b643c7 24/57: Add another send/receive test,
Justin Burkett <=
- [elpa] master 4cc1ee5 35/57: Allow sending selective regions from additions, Justin Burkett, 2020/11/03
- [elpa] master 02309fc 38/57: Retain buffer identities in line maps, Justin Burkett, 2020/11/03
- [elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-changes, Justin Burkett, 2020/11/03
- [elpa] master 0efde18 49/57: Improve behavior with respect to region selection, Justin Burkett, 2020/11/03
- [elpa] master 185e803 57/57: Merge commit '007e44be19d068fd6b49874b6e9b8df8b1f552bd', Justin Burkett, 2020/11/03
- [elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error, Justin Burkett, 2020/11/03
- [elpa] master a1a82de 50/57: Merge pull request #25 from justbur/send-region, Justin Burkett, 2020/11/03
- [elpa] master 08437d5 48/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 09e15fc 51/57: Announce selective sending of changes using the region in README, Justin Burkett, 2020/11/03
- [elpa] master 45923bb 41/57: Fix compiler warnings, Justin Burkett, 2020/11/03