Skip to content

Commit d3b28b3

Browse files
BrandonRoehlBrandonRoehl
committed
still picking at the tests
1 parent 30a12c3 commit d3b28b3

File tree

2 files changed

+51
-27
lines changed

2 files changed

+51
-27
lines changed

‎dump_test.go

+44-21
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@ func getMockData() (data *Data, mock sqlmock.Sqlmock, err error) {
2626
return
2727
}
2828

29+
func c(name string, v interface{}) *sqlmock.Column {
30+
var t string
31+
switch reflect.ValueOf(v).Kind() {
32+
case reflect.String:
33+
t = "VARCHAR"
34+
case reflect.Int:
35+
t = "INT"
36+
case reflect.Bool:
37+
t = "BOOL"
38+
}
39+
return sqlmock.NewColumn(name).OfType(t, v).Nullable(true)
40+
}
41+
2942
func TestGetTablesOk(t *testing.T) {
3043
data, mock, err := getMockData()
3144
assert.NoError(t, err, "an error was not expected when opening a stub database connection")
@@ -134,16 +147,26 @@ func TestCreateTableSQLOk(t *testing.T) {
134147
}
135148
}
136149

150+
func mockTableSelect(mock sqlmock.Sqlmock, name string) {
151+
cols := sqlmock.NewRows([]string{"Field", "Extra"}).
152+
AddRow("id", "").
153+
AddRow("email", "").
154+
AddRow("name", "")
155+
156+
rows := sqlmock.NewRowsWithColumnDefinition(c("id", 0), c("email", ""), c("name", "")).
157+
AddRow(1, "[email protected]", "Test Name 1").
158+
AddRow(2, "[email protected]", "Test Name 2")
159+
160+
mock.ExpectQuery("^SHOW COLUMNS FROM `" + name + "`$").WillReturnRows(cols)
161+
mock.ExpectQuery("^SELECT (.+) FROM `" + name + "`$").WillReturnRows(rows)
162+
}
163+
137164
func TestCreateTableRowValues(t *testing.T) {
138165
data, mock, err := getMockData()
139166
assert.NoError(t, err, "an error was not expected when opening a stub database connection")
140167
defer data.Close()
141168

142-
rows := sqlmock.NewRows([]string{"id", "email", "name"}).
143-
AddRow(1, "[email protected]", "Test Name 1").
144-
AddRow(2, "[email protected]", "Test Name 2")
145-
146-
mock.ExpectQuery("^SELECT (.+) FROM `test`$").WillReturnRows(rows)
169+
mockTableSelect(mock, "test")
147170

148171
table := data.createTable("test")
149172

@@ -155,26 +178,22 @@ func TestCreateTableRowValues(t *testing.T) {
155178
// we make sure that all expectations were met
156179
assert.NoError(t, mock.ExpectationsWereMet(), "there were unfulfilled expections")
157180

158-
assert.EqualValues(t, "('1','[email protected]','Test Name 1')", result)
181+
assert.EqualValues(t, "(1,'[email protected]','Test Name 1')", result)
159182
}
160183

161184
func TestCreateTableValuesSteam(t *testing.T) {
162185
data, mock, err := getMockData()
163186
assert.NoError(t, err, "an error was not expected when opening a stub database connection")
164187
defer data.Close()
165188

166-
rows := sqlmock.NewRows([]string{"id", "email", "name"}).
167-
AddRow(1, "[email protected]", "Test Name 1").
168-
AddRow(2, "[email protected]", "Test Name 2")
169-
170-
mock.ExpectQuery("^SELECT (.+) FROM `test`$").WillReturnRows(rows)
189+
mockTableSelect(mock, "test")
171190

172191
data.MaxAllowedPacket = 4096
173192

174193
table := data.createTable("test")
175194

176195
s := table.Stream()
177-
assert.EqualValues(t, "INSERT INTO `test` VALUES ('1','[email protected]','Test Name 1'),('2','[email protected]','Test Name 2');", <-s)
196+
assert.EqualValues(t, "INSERT INTO `test` (`id`, `email`, `name`) VALUES (1,'[email protected]','Test Name 1'),(2,'[email protected]','Test Name 2');", <-s)
178197

179198
// we make sure that all expectations were met
180199
assert.NoError(t, mock.ExpectationsWereMet(), "there were unfulfilled expections")
@@ -185,19 +204,15 @@ func TestCreateTableValuesSteamSmallPackets(t *testing.T) {
185204
assert.NoError(t, err, "an error was not expected when opening a stub database connection")
186205
defer data.Close()
187206

188-
rows := sqlmock.NewRows([]string{"id", "email", "name"}).
189-
AddRow(1, "[email protected]", "Test Name 1").
190-
AddRow(2, "[email protected]", "Test Name 2")
191-
192-
mock.ExpectQuery("^SELECT (.+) FROM `test`$").WillReturnRows(rows)
207+
mockTableSelect(mock, "test")
193208

194209
data.MaxAllowedPacket = 64
195210

196211
table := data.createTable("test")
197212

198213
s := table.Stream()
199-
assert.EqualValues(t, "INSERT INTO `test` VALUES ('1','[email protected]','Test Name 1');", <-s)
200-
assert.EqualValues(t, "INSERT INTO `test` VALUES ('2','[email protected]','Test Name 2');", <-s)
214+
assert.EqualValues(t, "INSERT INTO `test` (`id`, `email`, `name`) VALUES (1,'[email protected]','Test Name 1');", <-s)
215+
assert.EqualValues(t, "INSERT INTO `test` (`id`, `email`, `name`) VALUES (2,'[email protected]','Test Name 2');", <-s)
201216

202217
// we make sure that all expectations were met
203218
assert.NoError(t, mock.ExpectationsWereMet(), "there were unfulfilled expections")
@@ -208,11 +223,17 @@ func TestCreateTableAllValuesWithNil(t *testing.T) {
208223
assert.NoError(t, err, "an error was not expected when opening a stub database connection")
209224
defer data.Close()
210225

211-
rows := sqlmock.NewRows([]string{"id", "email", "name"}).
226+
cols := sqlmock.NewRows([]string{"Field", "Extra"}).
227+
AddRow("id", "").
228+
AddRow("email", "").
229+
AddRow("name", "")
230+
231+
rows := sqlmock.NewRowsWithColumnDefinition(c("id", 0), c("email", ""), c("name", "")).
212232
AddRow(1, nil, "Test Name 1").
213233
AddRow(2, "[email protected]", "Test Name 2").
214234
AddRow(3, "", "Test Name 3")
215235

236+
mock.ExpectQuery("^SHOW COLUMNS FROM `test`$").WillReturnRows(cols)
216237
mock.ExpectQuery("^SELECT (.+) FROM `test`$").WillReturnRows(rows)
217238

218239
table := data.createTable("test")
@@ -227,11 +248,13 @@ func TestCreateTableAllValuesWithNil(t *testing.T) {
227248
// we make sure that all expectations were met
228249
assert.NoError(t, mock.ExpectationsWereMet(), "there were unfulfilled expections")
229250

230-
expectedResults := []string{"('1',NULL,'Test Name 1')", "('2','[email protected]','Test Name 2')", "('3','','Test Name 3')"}
251+
expectedResults := []string{"(1,NULL,'Test Name 1')", "(2,'[email protected]','Test Name 2')", "(3,'','Test Name 3')"}
231252

232253
assert.EqualValues(t, expectedResults, results)
233254
}
234255

256+
// TODO the last two
257+
235258
func TestCreateTableOk(t *testing.T) {
236259
data, mock, err := getMockData()
237260
assert.NoError(t, err, "an error was not expected when opening a stub database connection")

‎mysqldump_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mysqldump
1+
package mysqldump_test
22

33
import (
44
"bytes"
@@ -8,10 +8,11 @@ import (
88
"testing"
99

1010
sqlmock "github.com/DATA-DOG/go-sqlmock"
11+
"github.com/jamf/go-mysqldump"
1112
"github.com/stretchr/testify/assert"
1213
)
1314

14-
const expected = `-- Go SQL Dump ` + Version + `
15+
const expected = `-- Go SQL Dump ` + mysqldump.Version + `
1516
--
1617
-- ------------------------------------------------------
1718
-- Server version test_version
@@ -86,7 +87,7 @@ func c(name string, v interface{}) *sqlmock.Column {
8687
return sqlmock.NewColumn(name).OfType(t, v).Nullable(true)
8788
}
8889

89-
func RunDump(t testing.TB, data *Data) {
90+
func RunDump(t testing.TB, data *mysqldump.Data) {
9091
db, mock, err := sqlmock.New()
9192
assert.NoError(t, err, "an error was not expected when opening a stub database connection")
9293
defer db.Close()
@@ -122,7 +123,7 @@ func RunDump(t testing.TB, data *Data) {
122123
func TestDumpOk(t *testing.T) {
123124
var buf bytes.Buffer
124125

125-
RunDump(t, &Data{
126+
RunDump(t, &mysqldump.Data{
126127
Out: &buf,
127128
LockTables: true,
128129
})
@@ -135,7 +136,7 @@ func TestDumpOk(t *testing.T) {
135136
func TestNoLockOk(t *testing.T) {
136137
var buf bytes.Buffer
137138

138-
data := &Data{
139+
data := &mysqldump.Data{
139140
Out: &buf,
140141
LockTables: false,
141142
}
@@ -176,7 +177,7 @@ func TestNoLockOk(t *testing.T) {
176177
}
177178

178179
func BenchmarkDump(b *testing.B) {
179-
data := &Data{
180+
data := &mysqldump.Data{
180181
Out: ioutil.Discard,
181182
LockTables: true,
182183
}

0 commit comments

Comments
 (0)