From 6a055aa600880e6fa43d3022e951a9b6aea29995 Mon Sep 17 00:00:00 2001 From: Billy Keyes Date: Sun, 12 Jan 2020 20:56:19 -0800 Subject: [PATCH] Add exact line test for TextFragment#ApplyStrict This ensures the line number is used and application isn't based only on matching context lines. --- gitdiff/apply_test.go | 1 + .../apply/text_fragment_change_exact.dst | 19 ++++++++++++ .../apply/text_fragment_change_exact.patch | 12 ++++++++ .../apply/text_fragment_change_exact.src | 30 +++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 gitdiff/testdata/apply/text_fragment_change_exact.dst create mode 100644 gitdiff/testdata/apply/text_fragment_change_exact.patch create mode 100644 gitdiff/testdata/apply/text_fragment_change_exact.src diff --git a/gitdiff/apply_test.go b/gitdiff/apply_test.go index a3d866a..8b63d4d 100644 --- a/gitdiff/apply_test.go +++ b/gitdiff/apply_test.go @@ -23,6 +23,7 @@ func TestTextFragmentApplyStrict(t *testing.T) { "changeStart": {File: "change_start"}, "changeMiddle": {File: "change_middle"}, "changeEnd": {File: "change_end"}, + "changeExact": {File: "change_exact"}, "changeSingleNoEOL": {File: "change_single_noeol"}, } diff --git a/gitdiff/testdata/apply/text_fragment_change_exact.dst b/gitdiff/testdata/apply/text_fragment_change_exact.dst new file mode 100644 index 0000000..4655a0a --- /dev/null +++ b/gitdiff/testdata/apply/text_fragment_change_exact.dst @@ -0,0 +1,19 @@ +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +new line a +line +line +line diff --git a/gitdiff/testdata/apply/text_fragment_change_exact.patch b/gitdiff/testdata/apply/text_fragment_change_exact.patch new file mode 100644 index 0000000..395de4d --- /dev/null +++ b/gitdiff/testdata/apply/text_fragment_change_exact.patch @@ -0,0 +1,12 @@ +diff --git a/gitdiff/testdata/apply/text_fragment_change_exact.src b/gitdiff/testdata/apply/text_fragment_change_exact.src +--- a/gitdiff/testdata/apply/text_fragment_change_exact.src ++++ b/gitdiff/testdata/apply/text_fragment_change_exact.src +@@ -13,7 +13,7 @@ line + line + line + line +-line ++new line a + line + line + line diff --git a/gitdiff/testdata/apply/text_fragment_change_exact.src b/gitdiff/testdata/apply/text_fragment_change_exact.src new file mode 100644 index 0000000..316a8f0 --- /dev/null +++ b/gitdiff/testdata/apply/text_fragment_change_exact.src @@ -0,0 +1,30 @@ +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line +line