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
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
package git2go
import (
"testing"
"time"
"github.com/stretchr/testify/require"
)
func TestGit2Go_MergeCommandSerialization(t *testing.T) {
testcases := []struct {
desc string
cmd MergeCommand
err string
}{
{
desc: "missing repository",
cmd: MergeCommand{},
err: "missing repository",
},
{
desc: "missing author name",
cmd: MergeCommand{
Repository: "foo",
},
err: "missing author name",
},
{
desc: "missing author mail",
cmd: MergeCommand{
Repository: "foo",
AuthorName: "Au Thor",
},
err: "missing author mail",
},
{
desc: "missing author message",
cmd: MergeCommand{
Repository: "foo",
AuthorName: "Au Thor",
AuthorMail: "au@thor.com",
},
err: "missing message",
},
{
desc: "missing author ours",
cmd: MergeCommand{
Repository: "foo",
AuthorName: "Au Thor",
AuthorMail: "au@thor.com",
Message: "Message",
},
err: "missing ours",
},
{
desc: "missing theirs",
cmd: MergeCommand{
Repository: "foo",
AuthorName: "Au Thor",
AuthorMail: "au@thor.com",
Message: "Message",
Ours: "refs/heads/master",
},
err: "missing theirs",
},
{
desc: "valid command",
cmd: MergeCommand{
Repository: "foo",
AuthorName: "Au Thor",
AuthorMail: "au@thor.com",
Message: "Message",
Ours: "refs/heads/master",
Theirs: "refs/heads/foo",
},
},
{
desc: "valid command with date",
cmd: MergeCommand{
Repository: "foo",
AuthorName: "Au Thor",
AuthorMail: "au@thor.com",
AuthorDate: time.Now().UTC(),
Message: "Message",
Ours: "refs/heads/master",
Theirs: "refs/heads/foo",
},
},
}
for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
serialized, err := serialize(tc.cmd)
require.NoError(t, err)
deserialized, err := MergeCommandFromSerialized(serialized)
if tc.err != "" {
require.Error(t, err)
require.Contains(t, err.Error(), tc.err)
} else {
require.NoError(t, err)
require.Equal(t, deserialized, tc.cmd)
}
})
}
}
func TestGit2Go_MergeResultSerialization(t *testing.T) {
serializeResult := func(t *testing.T, result MergeResult) string {
serialized, err := result.Serialize()
require.NoError(t, err)
return serialized
}
testcases := []struct {
desc string
serialized string
expected MergeResult
err string
}{
{
desc: "empty merge result",
serialized: serializeResult(t, MergeResult{}),
expected: MergeResult{},
},
{
desc: "merge result with commit",
serialized: serializeResult(t, MergeResult{
CommitID: "1234",
}),
expected: MergeResult{
CommitID: "1234",
},
},
{
desc: "invalid serialized representation",
serialized: "xvlc",
err: "invalid character",
},
}
for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
var deserialized MergeResult
err := deserialize(tc.serialized, &deserialized)
if tc.err != "" {
require.Error(t, err)
require.Contains(t, err.Error(), tc.err)
} else {
require.NoError(t, err)
require.Equal(t, deserialized, tc.expected)
}
})
}
}
|
