Skip to content

Commit 1aba27f

Browse files
lance6716lance6716
committed
only one file left
Signed-off-by: lance6716 <[email protected]>
1 parent 8cebfbe commit 1aba27f

File tree

2 files changed

+55
-66
lines changed

2 files changed

+55
-66
lines changed

‎mysql/mariadb_gtid_test.go

+51-62
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
package mysql
22

33
import (
4-
"github.com/pingcap/check"
5-
)
6-
7-
type mariaDBTestSuite struct {
8-
}
9-
10-
var _ = check.Suite(&mariaDBTestSuite{})
11-
12-
func (t *mariaDBTestSuite) SetupSuite(c *check.C) {
4+
"testing"
135

14-
}
15-
16-
func (t *mariaDBTestSuite) TearDownSuite(c *check.C) {
17-
18-
}
6+
"github.com/stretchr/testify/require"
7+
)
198

20-
func (t *mariaDBTestSuite) TestParseMariaDBGTID(c *check.C) {
9+
func TestParseMariaDBGTID(t *testing.T) {
2110
cases := []struct {
2211
gtidStr string
2312
hashError bool
@@ -32,15 +21,15 @@ func (t *mariaDBTestSuite) TestParseMariaDBGTID(c *check.C) {
3221
for _, cs := range cases {
3322
gtid, err := ParseMariadbGTID(cs.gtidStr)
3423
if cs.hashError {
35-
c.Assert(err, check.NotNil)
24+
require.Error(t, err)
3625
} else {
37-
c.Assert(err, check.IsNil)
38-
c.Assert(gtid.String(), check.Equals, cs.gtidStr)
26+
require.NoError(t, err)
27+
require.Equal(t, cs.gtidStr, gtid.String())
3928
}
4029
}
4130
}
4231

43-
func (t *mariaDBTestSuite) TestMariaDBGTIDConatin(c *check.C) {
32+
func TestMariaDBGTIDConatin(t *testing.T) {
4433
cases := []struct {
4534
originGTIDStr, otherGTIDStr string
4635
contain bool
@@ -54,23 +43,23 @@ func (t *mariaDBTestSuite) TestMariaDBGTIDConatin(c *check.C) {
5443

5544
for _, cs := range cases {
5645
originGTID, err := ParseMariadbGTID(cs.originGTIDStr)
57-
c.Assert(err, check.IsNil)
46+
require.NoError(t, err)
5847
otherGTID, err := ParseMariadbGTID(cs.otherGTIDStr)
59-
c.Assert(err, check.IsNil)
48+
require.NoError(t, err)
6049

61-
c.Assert(originGTID.Contain(otherGTID), check.Equals, cs.contain)
50+
require.Equal(t, cs.contain, originGTID.Contain(otherGTID))
6251
}
6352
}
6453

65-
func (t *mariaDBTestSuite) TestMariaDBGTIDClone(c *check.C) {
54+
func TestMariaDBGTIDClone(t *testing.T) {
6655
gtid, err := ParseMariadbGTID("1-1-1")
67-
c.Assert(err, check.IsNil)
56+
require.NoError(t, err)
6857

6958
clone := gtid.Clone()
70-
c.Assert(gtid, check.DeepEquals, clone)
59+
require.Equal(t, gtid, clone)
7160
}
7261

73-
func (t *mariaDBTestSuite) TestMariaDBForward(c *check.C) {
62+
func TestMariaDBForward(t *testing.T) {
7463
cases := []struct {
7564
currentGTIDStr, newerGTIDStr string
7665
hashError bool
@@ -84,22 +73,22 @@ func (t *mariaDBTestSuite) TestMariaDBForward(c *check.C) {
8473

8574
for _, cs := range cases {
8675
currentGTID, err := ParseMariadbGTID(cs.currentGTIDStr)
87-
c.Assert(err, check.IsNil)
76+
require.NoError(t, err)
8877
newerGTID, err := ParseMariadbGTID(cs.newerGTIDStr)
89-
c.Assert(err, check.IsNil)
78+
require.NoError(t, err)
9079

9180
err = currentGTID.forward(newerGTID)
9281
if cs.hashError {
93-
c.Assert(err, check.NotNil)
94-
c.Assert(currentGTID.String(), check.Equals, cs.currentGTIDStr)
82+
require.Error(t, err)
83+
require.Equal(t, cs.currentGTIDStr, currentGTID.String())
9584
} else {
96-
c.Assert(err, check.IsNil)
97-
c.Assert(currentGTID.String(), check.Equals, cs.newerGTIDStr)
85+
require.NoError(t, err)
86+
require.Equal(t, cs.newerGTIDStr, currentGTID.String())
9887
}
9988
}
10089
}
10190

102-
func (t *mariaDBTestSuite) TestParseMariaDBGTIDSet(c *check.C) {
91+
func TestParseMariaDBGTIDSet(t *testing.T) {
10392
cases := []struct {
10493
gtidStr string
10594
subGTIDs map[uint32]string //domain ID => gtid string
@@ -115,17 +104,17 @@ func (t *mariaDBTestSuite) TestParseMariaDBGTIDSet(c *check.C) {
115104
for _, cs := range cases {
116105
gtidSet, err := ParseMariadbGTIDSet(cs.gtidStr)
117106
if cs.hasError {
118-
c.Assert(err, check.NotNil)
107+
require.Error(t, err)
119108
} else {
120-
c.Assert(err, check.IsNil)
109+
require.NoError(t, err)
121110
mariadbGTIDSet, ok := gtidSet.(*MariadbGTIDSet)
122-
c.Assert(ok, check.IsTrue)
111+
require.True(t, ok)
123112

124113
// check sub gtid
125-
c.Assert(mariadbGTIDSet.Sets, check.HasLen, len(cs.subGTIDs))
114+
require.Len(t, mariadbGTIDSet.Sets, len(cs.subGTIDs))
126115
for domainID, gtid := range mariadbGTIDSet.Sets {
127-
c.Assert(mariadbGTIDSet.Sets, check.HasKey, domainID)
128-
c.Assert(gtid.String(), check.Equals, cs.subGTIDs[domainID])
116+
require.Contains(t, mariadbGTIDSet.Sets, domainID)
117+
require.Equal(t, cs.subGTIDs[domainID], gtid.String())
129118
}
130119

131120
// check String() function
@@ -137,12 +126,12 @@ func (t *mariaDBTestSuite) TestParseMariaDBGTIDSet(c *check.C) {
137126
break
138127
}
139128
}
140-
c.Assert(inExpectedResult, check.IsTrue)
129+
require.True(t, inExpectedResult)
141130
}
142131
}
143132
}
144133

145-
func (t *mariaDBTestSuite) TestMariaDBGTIDSetUpdate(c *check.C) {
134+
func TestMariaDBGTIDSetUpdate(t *testing.T) {
146135
cases := []struct {
147136
isNilGTID bool
148137
gtidStr string
@@ -157,26 +146,26 @@ func (t *mariaDBTestSuite) TestMariaDBGTIDSetUpdate(c *check.C) {
157146

158147
for _, cs := range cases {
159148
gtidSet, err := ParseMariadbGTIDSet("1-1-1,2-2-2")
160-
c.Assert(err, check.IsNil)
149+
require.NoError(t, err)
161150
mariadbGTIDSet, ok := gtidSet.(*MariadbGTIDSet)
162-
c.Assert(ok, check.IsTrue)
151+
require.True(t, ok)
163152

164153
if cs.isNilGTID {
165-
c.Assert(mariadbGTIDSet.AddSet(nil), check.IsNil)
154+
require.NoError(t, mariadbGTIDSet.AddSet(nil))
166155
} else {
167156
err := gtidSet.Update(cs.gtidStr)
168-
c.Assert(err, check.IsNil)
157+
require.NoError(t, err)
169158
}
170159
// check sub gtid
171-
c.Assert(mariadbGTIDSet.Sets, check.HasLen, len(cs.subGTIDs))
160+
require.Len(t, mariadbGTIDSet.Sets, len(cs.subGTIDs))
172161
for domainID, gtid := range mariadbGTIDSet.Sets {
173-
c.Assert(mariadbGTIDSet.Sets, check.HasKey, domainID)
174-
c.Assert(gtid.String(), check.Equals, cs.subGTIDs[domainID])
162+
require.Contains(t, mariadbGTIDSet.Sets, domainID)
163+
require.Equal(t, cs.subGTIDs[domainID], gtid.String())
175164
}
176165
}
177166
}
178167

179-
func (t *mariaDBTestSuite) TestMariaDBGTIDSetEqual(c *check.C) {
168+
func TestMariaDBGTIDSetEqual(t *testing.T) {
180169
cases := []struct {
181170
originGTIDStr, otherGTIDStr string
182171
equals bool
@@ -190,16 +179,16 @@ func (t *mariaDBTestSuite) TestMariaDBGTIDSetEqual(c *check.C) {
190179

191180
for _, cs := range cases {
192181
originGTID, err := ParseMariadbGTIDSet(cs.originGTIDStr)
193-
c.Assert(err, check.IsNil)
182+
require.NoError(t, err)
194183

195184
otherGTID, err := ParseMariadbGTIDSet(cs.otherGTIDStr)
196-
c.Assert(err, check.IsNil)
185+
require.NoError(t, err)
197186

198-
c.Assert(originGTID.Equal(otherGTID), check.Equals, cs.equals)
187+
require.Equal(t, cs.equals, originGTID.Equal(otherGTID))
199188
}
200189
}
201190

202-
func (t *mariaDBTestSuite) TestMariaDBGTIDSetContain(c *check.C) {
191+
func TestMariaDBGTIDSetContain(t *testing.T) {
203192
cases := []struct {
204193
originGTIDStr, otherGTIDStr string
205194
contain bool
@@ -214,33 +203,33 @@ func (t *mariaDBTestSuite) TestMariaDBGTIDSetContain(c *check.C) {
214203

215204
for _, cs := range cases {
216205
originGTIDSet, err := ParseMariadbGTIDSet(cs.originGTIDStr)
217-
c.Assert(err, check.IsNil)
206+
require.NoError(t, err)
218207

219208
otherGTIDSet, err := ParseMariadbGTIDSet(cs.otherGTIDStr)
220-
c.Assert(err, check.IsNil)
209+
require.NoError(t, err)
221210

222-
c.Assert(originGTIDSet.Contain(otherGTIDSet), check.Equals, cs.contain)
211+
require.Equal(t, cs.contain, originGTIDSet.Contain(otherGTIDSet))
223212
}
224213
}
225214

226-
func (t *mariaDBTestSuite) TestMariaDBGTIDSetClone(c *check.C) {
215+
func TestMariaDBGTIDSetClone(t *testing.T) {
227216
cases := []string{"", "1-1-1", "1-1-1,2-2-2"}
228217

229218
for _, str := range cases {
230219
gtidSet, err := ParseMariadbGTIDSet(str)
231-
c.Assert(err, check.IsNil)
220+
require.NoError(t, err)
232221

233-
c.Assert(gtidSet.Clone(), check.DeepEquals, gtidSet)
222+
require.Equal(t, gtidSet, gtidSet.Clone())
234223
}
235224
}
236225

237-
func (t *mariaDBTestSuite) TestMariaDBGTIDSetSortedString(c *check.C) {
226+
func TestMariaDBGTIDSetSortedString(t *testing.T) {
238227
cases := [][]string{{"", ""}, {"1-1-1", "1-1-1"},
239228
{"2-2-2,1-1-1,3-2-1", "1-1-1,2-2-2,3-2-1"}}
240229

241230
for _, strs := range cases {
242231
gtidSet, err := ParseMariadbGTIDSet(strs[0])
243-
c.Assert(err, check.IsNil)
244-
c.Assert(gtidSet.String(), check.Equals, strs[1])
232+
require.NoError(t, err)
233+
require.Equal(t, strs[1], gtidSet.String())
245234
}
246235
}

‎mysql/mysql_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func TestMysqlUpdate(t *testing.T) {
125125
err = g1.Update("3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58")
126126
require.NoError(t, err)
127127

128-
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58", g1.String())
128+
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58", strings.ToUpper(g1.String()))
129129

130130
g1, err = ParseMysqlGTIDSet(`
131131
519CE70F-A893-11E9-A95A-B32DC65A7026:1-1154661,
@@ -161,13 +161,13 @@ func TestMysqlAddGTID(t *testing.T) {
161161
require.NoError(t, err)
162162

163163
g1.AddGTID(u, 58)
164-
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58", g1.String())
164+
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58", strings.ToUpper(g1.String()))
165165

166166
g1.AddGTID(u, 60)
167-
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58:60", g1.String())
167+
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58:60", strings.ToUpper(g1.String()))
168168

169169
g1.AddGTID(u, 59)
170-
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-60", g1.String())
170+
require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-60", strings.ToUpper(g1.String()))
171171

172172
u2, err := uuid.Parse("519CE70F-A893-11E9-A95A-B32DC65A7026")
173173
require.NoError(t, err)

0 commit comments

Comments
 (0)