>From 91dfdcfe5c944d840e05325b38bcf2a3c7f6101c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 22 Dec 2022 19:10:24 +0100 Subject: [PATCH] Add some diff-fixup-modifs tests * test/lisp/vc/diff-mode-tests.el (diff-mode-test-fixups-added-lines): Test that diff-mode fixes patches with added lines correctly. * test/lisp/vc/diff-mode-tests.el (diff-mode-test-fixups-empty-hunks): Ditto for patches with empty hunks. --- test/lisp/vc/diff-mode-tests.el | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index 19e3dbb42a..b67ccd4fe0 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -478,5 +478,84 @@ test-hunk-file-names (should (equal (diff-hunk-file-names) '("/tmp/ange-ftp1351895K.el" "/tmp/ange-ftp13518wvE.el"))))) +(ert-deftest diff-mode-test-fixups-added-lines () + "Check that `diff-fixup-modifs' works well with hunks with added lines." + (let ((patch "--- file ++++ file +@@ -0,0 +1,15 @@ ++1 ++2 ++3 ++4 +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -0,0 +1,4 @@ ++1 ++2 ++3 ++4 +")))) + (let ((patch "--- file ++++ file +@@ -389,5 +398,6 @@ + while (1) + ; ++ # not needed + # at all + # stop +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -389,4 +398,5 @@ + while (1) + ; ++ # not needed + # at all + # stop +"))))) + +(ert-deftest diff-mode-test-fixups-empty-hunks () + "Check that `diff-fixup-modifs' works well with empty hunks." + (let ((patch "--- file ++++ file +@@ -1 +1 @@ +-1 +@@ -10 +10 @@ +-1 ++1 +--- otherfile ++++ otherfile +@@ -1 +1 @@ ++2 +@@ -10 +10 @@ +-1 ++1 +")) + (with-temp-buffer + (insert patch) + (diff-fixup-modifs (point-min) (point-max)) + (should (equal (buffer-string) "--- file ++++ file +@@ -1,1 +1,0 @@ +-1 +@@ -10,1 +10,1 @@ +-1 ++1 +--- otherfile ++++ otherfile +@@ -1,0 +1,1 @@ ++2 +@@ -10,1 +10,1 @@ +-1 ++1 +"))))) + (provide 'diff-mode-tests) ;;; diff-mode-tests.el ends here -- 2.34.1