mirror of
https://github.com/bluekeyes/go-gitdiff
synced 2026-06-08 13:18:30 +00:00
Add positive tests for TextFragment#ApplyStrict
These cover all of the cases (I think) where application should succeed.
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
new line a
|
||||
new line b
|
||||
@@ -0,0 +1,9 @@
|
||||
diff --git a/gitdiff/testdata/apply/fragment_add_end.src b/gitdiff/testdata/apply/fragment_add_end.src
|
||||
--- a/gitdiff/testdata/apply/fragment_add_end.src
|
||||
+++ b/gitdiff/testdata/apply/fragment_add_end.src
|
||||
@@ -1,3 +1,5 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
+new line a
|
||||
+new line b
|
||||
@@ -0,0 +1,3 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
@@ -0,0 +1,5 @@
|
||||
line 1
|
||||
line 2
|
||||
new line a
|
||||
new line b
|
||||
line 3
|
||||
@@ -0,0 +1,9 @@
|
||||
diff --git a/gitdiff/testdata/apply/fragment_add_middle.src b/gitdiff/testdata/apply/fragment_add_middle.src
|
||||
--- a/gitdiff/testdata/apply/fragment_add_middle.src
|
||||
+++ b/gitdiff/testdata/apply/fragment_add_middle.src
|
||||
@@ -1,3 +1,5 @@
|
||||
line 1
|
||||
line 2
|
||||
+new line a
|
||||
+new line b
|
||||
line 3
|
||||
@@ -0,0 +1,3 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
@@ -0,0 +1,4 @@
|
||||
new line a
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
@@ -0,0 +1,8 @@
|
||||
diff --git a/gitdiff/testdata/apply/fragment_add_start.src b/gitdiff/testdata/apply/fragment_add_start.src
|
||||
--- a/gitdiff/testdata/apply/fragment_add_start.src
|
||||
+++ b/gitdiff/testdata/apply/fragment_add_start.src
|
||||
@@ -1,3 +1,4 @@
|
||||
+new line a
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
@@ -0,0 +1,3 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
@@ -0,0 +1,10 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
line 5
|
||||
line 6
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
new line a
|
||||
@@ -0,0 +1,9 @@
|
||||
diff --git a/gitdiff/testdata/apply/text_fragment_change_end.src b/gitdiff/testdata/apply/text_fragment_change_end.src
|
||||
--- a/gitdiff/testdata/apply/text_fragment_change_end.src
|
||||
+++ b/gitdiff/testdata/apply/text_fragment_change_end.src
|
||||
@@ -7,4 +7,4 @@ line 6
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
-line 10
|
||||
+new line a
|
||||
@@ -0,0 +1,10 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
line 5
|
||||
line 6
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
line 10
|
||||
@@ -0,0 +1,9 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
line 5
|
||||
new line a
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/gitdiff/testdata/apply/text_fragment_change_middle.src b/gitdiff/testdata/apply/text_fragment_change_middle.src
|
||||
--- a/gitdiff/testdata/apply/text_fragment_change_middle.src
|
||||
+++ b/gitdiff/testdata/apply/text_fragment_change_middle.src
|
||||
@@ -3,7 +3,7 @@ line 2
|
||||
line 3
|
||||
line 4
|
||||
line 5
|
||||
-line 6
|
||||
+new line a
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
@@ -0,0 +1,10 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
line 5
|
||||
line 6
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
line 10
|
||||
@@ -0,0 +1,4 @@
|
||||
new line a
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
@@ -0,0 +1,9 @@
|
||||
diff --git a/gitdiff/testdata/apply/text_fragment_change_start.src b/gitdiff/testdata/apply/text_fragment_change_start.src
|
||||
--- a/gitdiff/testdata/apply/text_fragment_change_start.src
|
||||
+++ b/gitdiff/testdata/apply/text_fragment_change_start.src
|
||||
@@ -1,4 +1,4 @@
|
||||
-line 1
|
||||
+new line a
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
@@ -0,0 +1,10 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
line 4
|
||||
line 5
|
||||
line 6
|
||||
line 7
|
||||
line 8
|
||||
line 9
|
||||
line 10
|
||||
@@ -0,0 +1,8 @@
|
||||
diff --git a/gitdiff/testdata/apply/fragment_delete_all.src b/gitdiff/testdata/apply/fragment_delete_all.src
|
||||
--- a/gitdiff/testdata/apply/fragment_delete_all.src
|
||||
+++ b/gitdiff/testdata/apply/fragment_delete_all.src
|
||||
@@ -1,4 +0,0 @@
|
||||
-line a
|
||||
-line b
|
||||
-line c
|
||||
-line d
|
||||
@@ -0,0 +1,4 @@
|
||||
line a
|
||||
line b
|
||||
line c
|
||||
line d
|
||||
@@ -0,0 +1,3 @@
|
||||
line 1
|
||||
line 2
|
||||
line 3
|
||||
@@ -0,0 +1,7 @@
|
||||
diff --git a/gitdiff/testdata/apply/fragment_new.src b/gitdiff/testdata/apply/fragment_new.src
|
||||
--- a/gitdiff/testdata/apply/fragment_new.src
|
||||
+++ b/gitdiff/testdata/apply/fragment_new.src
|
||||
@@ -0,0 +1,3 @@
|
||||
+line 1
|
||||
+line 2
|
||||
+line 3
|
||||
Reference in New Issue
Block a user