Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Replace gotest.tools with github.com/stretchr/testify.

Browse source
This commit is contained in:
go-jet 2020-02-11 10:25:13 +01:00
parent 3013dc3647
commit 3efbb0ccd9
34 changed files with 462 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/mysql/select_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/model"
. "github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table"
"github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/view"
"gotest.tools/assert"
"github.com/stretchr/testify/assert"
"testing"
)
@ -30,9 +30,9 @@ WHERE actor.actor_id = ?;
actor := model.Actor{}
err := query.Query(db, &actor)
assert.NilError(t, err)
assert.NoError(t, err)
assert.DeepEqual(t, actor, actor2)
testutils.AssertDeepEqual(t, actor, actor2)
}
var actor2 = model.Actor{
@ -59,10 +59,10 @@ ORDER BY actor.actor_id;
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, len(dest), 200)
assert.DeepEqual(t, dest[1], actor2)
testutils.AssertDeepEqual(t, dest[1], actor2)
//testutils.PrintJson(dest)
//testutils.SaveJsonFile(dest, "mysql/testdata/all_actors.json")
@ -136,7 +136,7 @@ ORDER BY payment.customer_id, SUM(payment.amount) ASC;
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
//testutils.PrintJson(dest)
@ -176,7 +176,7 @@ func TestSubQuery(t *testing.T) {
}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
//testutils.SaveJsonFile(dest, "mysql/testdata/r_rating_films.json")
testutils.AssertJSONFile(t, dest, "./testdata/results/mysql/r_rating_films.json")
@ -229,7 +229,7 @@ LIMIT ?;
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestSelectUNION(t *testing.T) {
@ -265,7 +265,7 @@ LIMIT ?;
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestSelectUNION_ALL(t *testing.T) {
@ -308,7 +308,7 @@ OFFSET ?;
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestJoinQueryStruct(t *testing.T) {
@ -406,7 +406,7 @@ LIMIT ?;
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
//assert.Equal(t, len(dest), 1)
//assert.Equal(t, len(dest[0].Films), 10)
//assert.Equal(t, len(dest[0].Films[0].Actors), 10)
@ -450,10 +450,10 @@ FOR`
tx, _ := db.Begin()
_, err := query.Exec(tx)
assert.NilError(t, err)
assert.NoError(t, err)
err = tx.Rollback()
assert.NilError(t, err)
assert.NoError(t, err)
}
for lockType, lockTypeStr := range getRowLockTestData() {
@ -464,10 +464,10 @@ FOR`
tx, _ := db.Begin()
_, err := query.Exec(tx)
assert.NilError(t, err)
assert.NoError(t, err)
err = tx.Rollback()
assert.NilError(t, err)
assert.NoError(t, err)
}
if sourceIsMariaDB() {
@ -482,10 +482,10 @@ FOR`
tx, _ := db.Begin()
_, err := query.Exec(tx)
assert.NilError(t, err)
assert.NoError(t, err)
err = tx.Rollback()
assert.NilError(t, err)
assert.NoError(t, err)
}
}
@ -514,7 +514,7 @@ SELECT true,
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestLockInShareMode(t *testing.T) {
@ -535,7 +535,7 @@ LOCK IN SHARE MODE;
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestWindowFunction(t *testing.T) {
@ -612,7 +612,7 @@ GROUP BY payment.amount, payment.customer_id, payment.payment_date;
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestWindowClause(t *testing.T) {
@ -649,7 +649,7 @@ ORDER BY payment.customer_id;
dest := []struct{}{}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
}
func TestSimpleView(t *testing.T) {
@ -670,7 +670,7 @@ func TestSimpleView(t *testing.T) {
var dest []ActorInfo
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, len(dest), 10)
testutils.AssertJSON(t, dest[1:2], `
@ -702,7 +702,7 @@ func TestJoinViewWithTable(t *testing.T) {
}
err := query.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, len(dest), 2)
assert.Equal(t, len(dest[0].Rentals), 32)
@ -737,7 +737,7 @@ LIMIT 3;
`)
var dest []model.Customer
err := stmt.Query(db, &dest)
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, len(dest), 3)
}