1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
package write_test
import (
"bytes"
"context"
"io"
"strings"
"testing"
"github.com/pkg/diff/ctxt"
"github.com/pkg/diff/myers"
"github.com/pkg/diff/write"
)
var goldenTests = []struct {
name string
a, b string
opts []write.Option
want string // usually from running diff --unified and cleaning up the output
}{
{
name: "AddedLinesEnd",
a: "A\nB\nC\nD\nE\nF\n",
b: "A\nB\nC\nD\nE\nF\n1\n2\n3\n",
// TODO: stock macOS diff omits the trailing common blank line in this diff,
// which also changes the @@ line ranges to be 4,3 and 4,6.
want: `
--- a
+++ b
@@ -4,4 +4,7 @@
D
E
F
+1
+2
+3
`[1:],
},
{
name: "AddedLinesStart",
a: "A\nB\nC\nD\nE\nF\n",
b: "1\n2\n3\nA\nB\nC\nD\nE\nF\n",
want: `
--- a
+++ b
@@ -1,3 +1,6 @@
+1
+2
+3
A
B
C
`[1:],
},
{
name: "WithTerminalColor",
a: "1\n2\n2",
b: "1\n3\n3",
opts: []write.Option{write.TerminalColor()},
want: `
`[1:] + "\u001b[1m" + `--- a
+++ b
` + "\u001b[0m" + "\u001b[36m" + `@@ -1,3 +1,3 @@
` + "\u001b[0m" + ` 1
` + "\u001b[31m" + `-2
-2
` + "\u001b[32m" + `+3
+3
` + "\u001b[0m",
},
}
func TestGolden(t *testing.T) {
for _, test := range goldenTests {
t.Run(test.name, func(t *testing.T) {
as := strings.Split(test.a, "\n")
bs := strings.Split(test.b, "\n")
ab := &diffStrings{a: as, b: bs}
// TODO: supply an edit.Script to the tests instead doing a Myers diff here.
// Doing it as I have done, the lazy way, mixes concerns: diff algorithm vs unification algorithm
// vs unified diff formatting.
e := myers.Diff(context.Background(), ab)
e = ctxt.Size(e, 3)
buf := new(bytes.Buffer)
err := write.Unified(e, buf, ab, test.opts...)
if err != nil {
t.Fatal(err)
}
got := buf.String()
if test.want != got {
t.Logf("%q\n", test.want)
t.Logf("%q\n", got)
t.Errorf("bad diff: a=%q b=%q\n\ngot:\n%s\nwant:\n%s",
test.a, test.b,
got, test.want,
)
}
})
}
}
type diffStrings struct {
a, b []string
}
func (ab *diffStrings) LenA() int { return len(ab.a) }
func (ab *diffStrings) LenB() int { return len(ab.b) }
func (ab *diffStrings) Equal(ai, bi int) bool { return ab.a[ai] == ab.b[bi] }
func (ab *diffStrings) WriteATo(w io.Writer, i int) (int, error) { return io.WriteString(w, ab.a[i]) }
func (ab *diffStrings) WriteBTo(w io.Writer, i int) (int, error) { return io.WriteString(w, ab.b[i]) }
|
