admin/bluekeyes-go-gitdiff
1
0
Fork 0
mirror of https://github.com/bluekeyes/go-gitdiff synced 2026-06-08 13:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error tests for TextFragment#ApplyStrict

Browse Source 
These cover the errors that can happen with a single fragment and no
additional manipulation by the caller of ApplyStrict.
This commit is contained in:
Billy Keyes
2020-01-12 22:03:21 -08:00
parent 6a055aa600
commit 1b341e0693
7 changed files with 132 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gitdiff/testdata/apply/text_fragment_error.src
Vendored
+13
View File
@@ -0,0 +1,13 @@
line 1
line 2
line 3
line 4
line 5
line 6
line 7
line 8
line 9
line 10
line 11
line 12
line 13
gitdiff/testdata/apply/text_fragment_error_context_conflict.patch
Vendored
+12
View File
@@ -0,0 +1,12 @@
diff --git a/gitdiff/testdata/apply/text_fragment_error.src b/gitdiff/testdata/apply/text_fragment_error.src
--- a/gitdiff/testdata/apply/text_fragment_error.src
+++ b/gitdiff/testdata/apply/text_fragment_error.src
@@ -4,7 +4,7 @@ line 3
line 4
line 5
line conflict
-line 7
+new line a
line 8
line 9
line 10
gitdiff/testdata/apply/text_fragment_error_delete_conflict.patch
Vendored
+12
View File
@@ -0,0 +1,12 @@
diff --git a/gitdiff/testdata/apply/text_fragment_error.src b/gitdiff/testdata/apply/text_fragment_error.src
--- a/gitdiff/testdata/apply/text_fragment_error.src
+++ b/gitdiff/testdata/apply/text_fragment_error.src
@@ -4,7 +4,7 @@ line 3
line 4
line 5
line 6
-line conflict
+new line a
line 8
line 9
line 10
gitdiff/testdata/apply/text_fragment_error_new_file.patch
Vendored
+7
View File
@@ -0,0 +1,7 @@
diff --git a/gitdiff/testdata/apply/text_fragment_error.src b/gitdiff/testdata/apply/text_fragment_error.src
--- a/gitdiff/testdata/apply/text_fragment_error.src
+++ b/gitdiff/testdata/apply/text_fragment_error.src
@@ -0,0 +1,3 @@
+line 1
+line 2
+line 3
gitdiff/testdata/apply/text_fragment_error_short_src.patch
Vendored
+12
View File
@@ -0,0 +1,12 @@
diff --git a/gitdiff/testdata/apply/text_fragment_error.src b/gitdiff/testdata/apply/text_fragment_error.src
--- a/gitdiff/testdata/apply/text_fragment_error.src
+++ b/gitdiff/testdata/apply/text_fragment_error.src
@@ -9,7 +9,7 @@ line 8
line 9
line 10
line 11
-line 12
+new line a
line 13
line 14
line 15
gitdiff/testdata/apply/text_fragment_error_short_src_before.patch
Vendored
+12
View File
@@ -0,0 +1,12 @@
diff --git a/gitdiff/testdata/apply/text_fragment_error.src b/gitdiff/testdata/apply/text_fragment_error.src
--- a/gitdiff/testdata/apply/text_fragment_error.src
+++ b/gitdiff/testdata/apply/text_fragment_error.src
@@ -15,7 +15,7 @@ line 14
line 15
line 16
line 17
-line 18
+new line a
line 19
line 20
line 21