From 0bba7656740ba987fff7ed392bf3d69f051cd904 Mon Sep 17 00:00:00 2001 From: Billy Keyes Date: Tue, 4 Mar 2025 20:12:39 -0800 Subject: [PATCH] Add a test for removing the last newline in a file This worked, but completes the test coverage in combination with the test that adds a final newline and one that leaves the missing newline in place. --- gitdiff/apply_test.go | 1 + .../testdata/apply/text_fragment_change_end_eol.out | 3 +++ .../testdata/apply/text_fragment_change_end_eol.patch | 10 ++++++++++ .../testdata/apply/text_fragment_change_end_eol.src | 3 +++ 4 files changed, 17 insertions(+) create mode 100644 gitdiff/testdata/apply/text_fragment_change_end_eol.out create mode 100644 gitdiff/testdata/apply/text_fragment_change_end_eol.patch create mode 100644 gitdiff/testdata/apply/text_fragment_change_end_eol.src diff --git a/gitdiff/apply_test.go b/gitdiff/apply_test.go index dd076bb..f19153b 100644 --- a/gitdiff/apply_test.go +++ b/gitdiff/apply_test.go @@ -22,6 +22,7 @@ func TestApplyTextFragment(t *testing.T) { "changeStart": {Files: getApplyFiles("text_fragment_change_start")}, "changeMiddle": {Files: getApplyFiles("text_fragment_change_middle")}, "changeEnd": {Files: getApplyFiles("text_fragment_change_end")}, + "changeEndEOL": {Files: getApplyFiles("text_fragment_change_end_eol")}, "changeExact": {Files: getApplyFiles("text_fragment_change_exact")}, "changeSingleNoEOL": {Files: getApplyFiles("text_fragment_change_single_noeol")}, diff --git a/gitdiff/testdata/apply/text_fragment_change_end_eol.out b/gitdiff/testdata/apply/text_fragment_change_end_eol.out new file mode 100644 index 0000000..8cf2f17 --- /dev/null +++ b/gitdiff/testdata/apply/text_fragment_change_end_eol.out @@ -0,0 +1,3 @@ +line 1 +line 2 +line 3 \ No newline at end of file diff --git a/gitdiff/testdata/apply/text_fragment_change_end_eol.patch b/gitdiff/testdata/apply/text_fragment_change_end_eol.patch new file mode 100644 index 0000000..f1c9477 --- /dev/null +++ b/gitdiff/testdata/apply/text_fragment_change_end_eol.patch @@ -0,0 +1,10 @@ +diff --git a/gitdiff/testdata/apply/text_fragment_remove_last_eol.src b/gitdiff/testdata/apply/text_fragment_remove_last_eol.src +index a92d664..8cf2f17 100644 +--- a/gitdiff/testdata/apply/text_fragment_remove_last_eol.src ++++ b/gitdiff/testdata/apply/text_fragment_remove_last_eol.src +@@ -1,3 +1,3 @@ + line 1 + line 2 +-line 3 ++line 3 +\ No newline at end of file diff --git a/gitdiff/testdata/apply/text_fragment_change_end_eol.src b/gitdiff/testdata/apply/text_fragment_change_end_eol.src new file mode 100644 index 0000000..a92d664 --- /dev/null +++ b/gitdiff/testdata/apply/text_fragment_change_end_eol.src @@ -0,0 +1,3 @@ +line 1 +line 2 +line 3