99 "strings"
1010 "testing"
1111
12- test "github.com/openark/golib/tests "
12+ "github.com/stretchr/testify/require "
1313
1414 "github.com/github/gh-ost/go/base"
1515 "github.com/github/gh-ost/go/binlog"
@@ -21,33 +21,33 @@ func TestApplierGenerateSqlModeQuery(t *testing.T) {
2121 applier := NewApplier (migrationContext )
2222
2323 {
24- test .S (t ).ExpectEquals (
25- applier .generateSqlModeQuery (),
24+ require .Equal (t ,
2625 `sql_mode = CONCAT(@@session.sql_mode, ',NO_AUTO_VALUE_ON_ZERO,STRICT_ALL_TABLES')` ,
26+ applier .generateSqlModeQuery (),
2727 )
2828 }
2929 {
3030 migrationContext .SkipStrictMode = true
3131 migrationContext .AllowZeroInDate = false
32- test .S (t ).ExpectEquals (
33- applier .generateSqlModeQuery (),
32+ require .Equal (t ,
3433 `sql_mode = CONCAT(@@session.sql_mode, ',NO_AUTO_VALUE_ON_ZERO')` ,
34+ applier .generateSqlModeQuery (),
3535 )
3636 }
3737 {
3838 migrationContext .SkipStrictMode = false
3939 migrationContext .AllowZeroInDate = true
40- test .S (t ).ExpectEquals (
41- applier .generateSqlModeQuery (),
40+ require .Equal (t ,
4241 `sql_mode = REPLACE(REPLACE(CONCAT(@@session.sql_mode, ',NO_AUTO_VALUE_ON_ZERO,STRICT_ALL_TABLES'), 'NO_ZERO_IN_DATE', ''), 'NO_ZERO_DATE', '')` ,
42+ applier .generateSqlModeQuery (),
4343 )
4444 }
4545 {
4646 migrationContext .SkipStrictMode = true
4747 migrationContext .AllowZeroInDate = true
48- test .S (t ).ExpectEquals (
49- applier .generateSqlModeQuery (),
48+ require .Equal (t ,
5049 `sql_mode = REPLACE(REPLACE(CONCAT(@@session.sql_mode, ',NO_AUTO_VALUE_ON_ZERO'), 'NO_ZERO_IN_DATE', ''), 'NO_ZERO_DATE', '')` ,
50+ applier .generateSqlModeQuery (),
5151 )
5252 }
5353}
@@ -72,8 +72,8 @@ func TestApplierUpdateModifiesUniqueKeyColumns(t *testing.T) {
7272 NewColumnValues : columnValues ,
7373 WhereColumnValues : columnValues ,
7474 })
75- test . S ( t ). ExpectEquals ( modifiedColumn , "" )
76- test . S ( t ). ExpectFalse ( isModified )
75+ require . Equal ( t , "" , modifiedColumn )
76+ require . False ( t , isModified )
7777 })
7878
7979 t .Run ("modified" , func (t * testing.T ) {
@@ -83,8 +83,8 @@ func TestApplierUpdateModifiesUniqueKeyColumns(t *testing.T) {
8383 NewColumnValues : sql .ToColumnValues ([]interface {}{123456 , 24 }),
8484 WhereColumnValues : columnValues ,
8585 })
86- test . S ( t ). ExpectEquals ( modifiedColumn , "item_id" )
87- test . S ( t ). ExpectTrue ( isModified )
86+ require . Equal ( t , "item_id" , modifiedColumn )
87+ require . True ( t , isModified )
8888 })
8989}
9090
@@ -112,17 +112,17 @@ func TestApplierBuildDMLEventQuery(t *testing.T) {
112112 }
113113
114114 res := applier .buildDMLEventQuery (binlogEvent )
115- test . S ( t ). ExpectEquals ( len ( res ) , 1 )
116- test . S ( t ). ExpectNil ( res [0 ].err )
117- test . S ( t ). ExpectEquals ( strings . TrimSpace ( res [ 0 ]. query ) , `delete /* gh-ost ` + "`test`.`_test_gho`" + ` */
115+ require . Len ( t , res , 1 )
116+ require . NoError ( t , res [0 ].err )
117+ require . Equal ( t , `delete /* gh-ost ` + "`test`.`_test_gho`" + ` */
118118 from
119119 ` + "`test`.`_test_gho`" + `
120120 where
121121 ((` + "`id`" + ` = ?) and (` + "`item_id`" + ` = ?))` ,
122- )
123- test . S ( t ). ExpectEquals ( len ( res [0 ].args ) , 2 )
124- test . S ( t ). ExpectEquals ( res [0 ].args [0 ], 123456 )
125- test . S ( t ). ExpectEquals ( res [0 ].args [1 ], 42 )
122+ strings . TrimSpace ( res [ 0 ]. query ) )
123+ require . Len ( t , res [0 ].args , 2 )
124+ require . Equal ( t , 123456 , res [0 ].args [0 ])
125+ require . Equal ( t , 42 , res [0 ].args [1 ])
126126 })
127127
128128 t .Run ("insert" , func (t * testing.T ) {
@@ -132,18 +132,19 @@ func TestApplierBuildDMLEventQuery(t *testing.T) {
132132 NewColumnValues : columnValues ,
133133 }
134134 res := applier .buildDMLEventQuery (binlogEvent )
135- test . S ( t ). ExpectEquals ( len ( res ) , 1 )
136- test . S ( t ). ExpectNil ( res [0 ].err )
137- test . S ( t ). ExpectEquals ( strings . TrimSpace ( res [ 0 ]. query ) ,
135+ require . Len ( t , res , 1 )
136+ require . NoError ( t , res [0 ].err )
137+ require . Equal ( t ,
138138 `replace /* gh-ost ` + "`test`.`_test_gho`" + ` */
139139 into
140140 ` + "`test`.`_test_gho`" + `
141141 ` + "(`id`, `item_id`)" + `
142142 values
143- (?, ?)` )
144- test .S (t ).ExpectEquals (len (res [0 ].args ), 2 )
145- test .S (t ).ExpectEquals (res [0 ].args [0 ], 123456 )
146- test .S (t ).ExpectEquals (res [0 ].args [1 ], 42 )
143+ (?, ?)` ,
144+ strings .TrimSpace (res [0 ].query ))
145+ require .Len (t , res [0 ].args , 2 )
146+ require .Equal (t , 123456 , res [0 ].args [0 ])
147+ require .Equal (t , 42 , res [0 ].args [1 ])
147148 })
148149
149150 t .Run ("update" , func (t * testing.T ) {
@@ -154,20 +155,21 @@ func TestApplierBuildDMLEventQuery(t *testing.T) {
154155 WhereColumnValues : columnValues ,
155156 }
156157 res := applier .buildDMLEventQuery (binlogEvent )
157- test . S ( t ). ExpectEquals ( len ( res ) , 1 )
158- test . S ( t ). ExpectNil ( res [0 ].err )
159- test . S ( t ). ExpectEquals ( strings . TrimSpace ( res [ 0 ]. query ) ,
158+ require . Len ( t , res , 1 )
159+ require . NoError ( t , res [0 ].err )
160+ require . Equal ( t ,
160161 `update /* gh-ost ` + "`test`.`_test_gho`" + ` */
161162 ` + "`test`.`_test_gho`" + `
162163 set
163164 ` + "`id`" + `=?, ` + "`item_id`" + `=?
164165 where
165- ((` + "`id`" + ` = ?) and (` + "`item_id`" + ` = ?))` )
166- test .S (t ).ExpectEquals (len (res [0 ].args ), 4 )
167- test .S (t ).ExpectEquals (res [0 ].args [0 ], 123456 )
168- test .S (t ).ExpectEquals (res [0 ].args [1 ], 42 )
169- test .S (t ).ExpectEquals (res [0 ].args [2 ], 123456 )
170- test .S (t ).ExpectEquals (res [0 ].args [3 ], 42 )
166+ ((` + "`id`" + ` = ?) and (` + "`item_id`" + ` = ?))` ,
167+ strings .TrimSpace (res [0 ].query ))
168+ require .Len (t , res [0 ].args , 4 )
169+ require .Equal (t , 123456 , res [0 ].args [0 ])
170+ require .Equal (t , 42 , res [0 ].args [1 ])
171+ require .Equal (t , 123456 , res [0 ].args [2 ])
172+ require .Equal (t , 42 , res [0 ].args [3 ])
171173 })
172174}
173175
@@ -180,6 +182,6 @@ func TestApplierInstantDDL(t *testing.T) {
180182
181183 t .Run ("instantDDLstmt" , func (t * testing.T ) {
182184 stmt := applier .generateInstantDDLQuery ()
183- test . S ( t ). ExpectEquals ( stmt , "ALTER /* gh-ost */ TABLE `test`.`mytable` ADD INDEX (foo), ALGORITHM=INSTANT" )
185+ require . Equal ( t , "ALTER /* gh-ost */ TABLE `test`.`mytable` ADD INDEX (foo), ALGORITHM=INSTANT" , stmt )
184186 })
185187}
0 commit comments