diff options
Diffstat (limited to 'pkg/commands/patch_modifier_test.go')
| -rw-r--r-- | pkg/commands/patch_modifier_test.go | 511 |
1 files changed, 511 insertions, 0 deletions
diff --git a/pkg/commands/patch_modifier_test.go b/pkg/commands/patch_modifier_test.go new file mode 100644 index 000000000..87f1000a9 --- /dev/null +++ b/pkg/commands/patch_modifier_test.go @@ -0,0 +1,511 @@ +package commands + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +const simpleDiff = `diff --git a/filename b/filename +index dcd3485..1ba5540 100644 +--- a/filename ++++ b/filename +@@ -1,5 +1,5 @@ + apple +-orange ++grape + ... + ... + ... +` + +const addNewlineToEndOfFile = `diff --git a/filename b/filename +index 80a73f1..e48a11c 100644 +--- a/filename ++++ b/filename +@@ -60,4 +60,4 @@ grape + ... + ... + ... +-last line +\ No newline at end of file ++last line +` + +const removeNewlinefromEndOfFile = `diff --git a/filename b/filename +index e48a11c..80a73f1 100644 +--- a/filename ++++ b/filename +@@ -60,4 +60,4 @@ grape + ... + ... + ... +-last line ++last line +\ No newline at end of file +` + +const twoHunks = `diff --git a/filename b/filename +index e48a11c..b2ab81b 100644 +--- a/filename ++++ b/filename +@@ -1,5 +1,5 @@ + apple +-grape ++orange + ... + ... + ... +@@ -8,6 +8,8 @@ grape + ... + ... + ... ++pear ++lemon + ... + ... + ... +` + +const newFile = `diff --git a/newfile b/newfile +new file mode 100644 +index 0000000..4e680cc +--- /dev/null ++++ b/newfile +@@ -0,0 +1,3 @@ ++apple ++orange ++grape +` + +const addNewlineToPreviouslyEmptyFile = `diff --git a/newfile b/newfile +index e69de29..c6568ea 100644 +--- a/newfile ++++ b/newfile +@@ -0,0 +1 @@ ++new line +\ No newline at end of file +` + +// TestModifyPatchForRange is a function. +func TestModifyPatchForRange(t *testing.T) { + type scenario struct { + testName string + filename string + diffText string + firstLineIndex int + lastLineIndex int + reverse bool + expected string + } + + scenarios := []scenario{ + { + testName: "nothing selected", + filename: "filename", + firstLineIndex: -1, + lastLineIndex: -1, + reverse: false, + diffText: simpleDiff, + expected: "", + }, + { + testName: "only context selected", + filename: "filename", + firstLineIndex: 5, + lastLineIndex: 5, + reverse: false, + diffText: simpleDiff, + expected: "", + }, + { + testName: "whole range selected", + filename: "filename", + firstLineIndex: 0, + lastLineIndex: 11, + reverse: false, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,5 @@ + apple +-orange ++grape + ... + ... + ... +`, + }, + { + testName: "only removal selected", + filename: "filename", + firstLineIndex: 6, + lastLineIndex: 6, + reverse: false, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,4 @@ + apple +-orange + ... + ... + ... +`, + }, + { + testName: "only addition selected", + filename: "filename", + firstLineIndex: 7, + lastLineIndex: 7, + reverse: false, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,6 @@ + apple + orange ++grape + ... + ... + ... +`, + }, + { + testName: "range that extends beyond diff bounds", + filename: "filename", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: false, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,5 @@ + apple +-orange ++grape + ... + ... + ... +`, + }, + { + testName: "whole range reversed", + filename: "filename", + firstLineIndex: 0, + lastLineIndex: 11, + reverse: true, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,5 @@ + apple ++orange +-grape + ... + ... + ... +`, + }, + { + testName: "removal reversed", + filename: "filename", + firstLineIndex: 6, + lastLineIndex: 6, + reverse: true, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,6 @@ + apple ++orange + grape + ... + ... + ... +`, + }, + { + testName: "removal reversed", + filename: "filename", + firstLineIndex: 7, + lastLineIndex: 7, + reverse: true, + diffText: simpleDiff, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,4 @@ + apple +-grape + ... + ... + ... +`, + }, + { + testName: "add newline to end of file", + filename: "filename", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: false, + diffText: addNewlineToEndOfFile, + expected: `--- a/filename ++++ b/filename +@@ -60,4 +60,4 @@ grape + ... + ... + ... +-last line +\ No newline at end of file ++last line +`, + }, + { + testName: "add newline to end of file, addition only", + filename: "filename", + firstLineIndex: 8, + lastLineIndex: 8, + reverse: true, + diffText: addNewlineToEndOfFile, + expected: `--- a/filename ++++ b/filename +@@ -60,4 +60,5 @@ grape + ... + ... + ... ++last line +\ No newline at end of file + last line +`, + }, + { + testName: "add newline to end of file, removal only", + filename: "filename", + firstLineIndex: 10, + lastLineIndex: 10, + reverse: true, + diffText: addNewlineToEndOfFile, + expected: `--- a/filename ++++ b/filename +@@ -60,4 +60,3 @@ grape + ... + ... + ... +-last line +`, + }, + { + testName: "remove newline from end of file", + filename: "filename", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: false, + diffText: removeNewlinefromEndOfFile, + expected: `--- a/filename ++++ b/filename +@@ -60,4 +60,4 @@ grape + ... + ... + ... +-last line ++last line +\ No newline at end of file +`, + }, + { + testName: "remove newline from end of file, removal only", + filename: "filename", + firstLineIndex: 8, + lastLineIndex: 8, + reverse: false, + diffText: removeNewlinefromEndOfFile, + expected: `--- a/filename ++++ b/filename +@@ -60,4 +60,3 @@ grape + ... + ... + ... +-last line +`, + }, + { + testName: "remove newline from end of file, addition only", + filename: "filename", + firstLineIndex: 9, + lastLineIndex: 9, + reverse: false, + diffText: removeNewlinefromEndOfFile, + expected: `--- a/filename ++++ b/filename +@@ -60,4 +60,5 @@ grape + ... + ... + ... + last line ++last line +\ No newline at end of file +`, + }, + { + testName: "staging two whole hunks", + filename: "filename", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: false, + diffText: twoHunks, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,5 @@ + apple +-grape ++orange + ... + ... + ... +@@ -8,6 +8,8 @@ grape + ... + ... + ... ++pear ++lemon + ... + ... + ... +`, + }, + { + testName: "staging part of both hunks", + filename: "filename", + firstLineIndex: 7, + lastLineIndex: 15, + reverse: false, + diffText: twoHunks, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,6 @@ + apple + grape ++orange + ... + ... + ... +@@ -8,6 +9,7 @@ grape + ... + ... + ... ++pear + ... + ... + ... +`, + }, + { + testName: "staging part of both hunks, reversed", + filename: "filename", + firstLineIndex: 7, + lastLineIndex: 15, + reverse: true, + diffText: twoHunks, + expected: `--- a/filename ++++ b/filename +@@ -1,5 +1,4 @@ + apple +-orange + ... + ... + ... +@@ -8,8 +7,7 @@ grape + ... + ... + ... +-pear + lemon + ... + ... + ... +`, + }, + { + testName: "adding a new file", + filename: "newfile", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: false, + diffText: newFile, + expected: `--- a/newfile ++++ b/newfile +@@ -0,0 +1,3 @@ ++apple ++orange ++grape +`, + }, + { + testName: "adding part of a new file", + filename: "newfile", + firstLineIndex: 6, + lastLineIndex: 7, + reverse: false, + diffText: newFile, + expected: `--- a/newfile ++++ b/newfile +@@ -0,0 +1,2 @@ ++apple ++orange +`, + }, + { + testName: "adding a new file, reversed", + filename: "newfile", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: true, + diffText: newFile, + expected: `--- a/newfile ++++ b/newfile +@@ -1,3 +0,0 @@ +-apple +-orange +-grape +`, + }, + { + testName: "adding a new line to a previously empty file", + filename: "newfile", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: false, + diffText: addNewlineToPreviouslyEmptyFile, + expected: `--- a/newfile ++++ b/newfile +@@ -0,0 +1,1 @@ ++new line +\ No newline at end of file +`, + }, + { + testName: "adding a new line to a previously empty file, reversed", + filename: "newfile", + firstLineIndex: -100, + lastLineIndex: 100, + reverse: true, + diffText: addNewlineToPreviouslyEmptyFile, + expected: `--- a/newfile ++++ b/newfile +@@ -1,1 +0,0 @@ +-new line +\ No newline at end of file +`, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + result := ModifiedPatchForRange(nil, s.filename, s.diffText, s.firstLineIndex, s.lastLineIndex, s.reverse, true) + if !assert.Equal(t, s.expected, result) { + fmt.Println(result) + } + }) + } +} |