[elpa] master 5b643c7 24/57: Add another send/receive test

[Justin Burkett]

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