From 3efbb0ccd985f9edb3855ea0b862705c28324e32 Mon Sep 17 00:00:00 2001 From: go-jet Date: Tue, 11 Feb 2020 10:25:13 +0100 Subject: [PATCH] Replace gotest.tools with github.com/stretchr/testify. --- .circleci/config.yml | 4 +- README.md | 2 +- internal/3rdparty/snaker/snaker_test.go | 2 +- internal/jet/clause_test.go | 2 +- internal/jet/sql_builder_test.go | 4 +- internal/jet/table_test.go | 2 +- internal/jet/testutils.go | 14 +- internal/jet/utils_test.go | 2 +- internal/testutils/test_utils.go | 44 +++-- internal/utils/utils_test.go | 2 +- mysql/insert_statement_test.go | 2 +- postgres/insert_statement_test.go | 2 +- qrm/internal/null_types_test.go | 48 ++--- qrm/utill_test.go | 28 +-- tests/mysql/alltypes_test.go | 38 ++-- tests/mysql/cast_test.go | 6 +- tests/mysql/delete_test.go | 2 +- tests/mysql/generator_test.go | 22 +-- tests/mysql/insert_test.go | 34 ++-- tests/mysql/lock_test.go | 8 +- tests/mysql/select_test.go | 48 ++--- tests/mysql/update_test.go | 10 +- tests/postgres/alltypes_test.go | 65 ++++--- tests/postgres/chinook_db_test.go | 22 +-- tests/postgres/delete_test.go | 8 +- tests/postgres/generator_test.go | 34 ++-- tests/postgres/insert_test.go | 20 +- tests/postgres/lock_test.go | 10 +- tests/postgres/northwind_test.go | 4 +- tests/postgres/sample_test.go | 26 +-- tests/postgres/scan_test.go | 244 ++++++++++++------------ tests/postgres/select_test.go | 142 +++++++------- tests/postgres/update_test.go | 12 +- tests/postgres/util_test.go | 6 +- 34 files changed, 462 insertions(+), 457 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3ea5d0..4907252 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ jobs: go get github.com/go-sql-driver/mysql go get github.com/pkg/profile - go get gotest.tools/assert + go get github.com/stretchr/testify/assert go get github.com/davecgh/go-spew/spew go get github.com/jstemmer/go-junit-report @@ -142,7 +142,7 @@ jobs: go get github.com/go-sql-driver/mysql go get github.com/pkg/profile - go get gotest.tools/assert + go get github.com/stretchr/testify/assert go get github.com/davecgh/go-spew/spew go get github.com/jstemmer/go-junit-report diff --git a/README.md b/README.md index 76d36be..721219a 100644 --- a/README.md +++ b/README.md @@ -560,7 +560,7 @@ At the moment Jet dependence only of: To run the tests, additional dependencies are required: - `github.com/pkg/profile` -- `gotest.tools/assert` +- `github.com/stretchr/testify` ## Versioning diff --git a/internal/3rdparty/snaker/snaker_test.go b/internal/3rdparty/snaker/snaker_test.go index b3704ea..83ae867 100644 --- a/internal/3rdparty/snaker/snaker_test.go +++ b/internal/3rdparty/snaker/snaker_test.go @@ -1,7 +1,7 @@ package snaker import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) diff --git a/internal/jet/clause_test.go b/internal/jet/clause_test.go index 14ced64..9a86597 100644 --- a/internal/jet/clause_test.go +++ b/internal/jet/clause_test.go @@ -1,7 +1,7 @@ package jet import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) diff --git a/internal/jet/sql_builder_test.go b/internal/jet/sql_builder_test.go index dc4a476..f7b5ade 100644 --- a/internal/jet/sql_builder_test.go +++ b/internal/jet/sql_builder_test.go @@ -2,7 +2,7 @@ package jet import ( "github.com/google/uuid" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -30,7 +30,7 @@ func TestArgToString(t *testing.T) { assert.Equal(t, argToString(uuid.MustParse("b68dbff4-a87d-11e9-a7f2-98ded00c39c6")), "'b68dbff4-a87d-11e9-a7f2-98ded00c39c6'") time, err := time.Parse("Mon Jan 2 15:04:05 -0700 MST 2006", "Mon Jan 2 15:04:05 -0700 MST 2006") - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, argToString(time), "'2006-01-02 15:04:05-07:00'") func() { diff --git a/internal/jet/table_test.go b/internal/jet/table_test.go index 30182bc..d899a8f 100644 --- a/internal/jet/table_test.go +++ b/internal/jet/table_test.go @@ -1,7 +1,7 @@ package jet import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) diff --git a/internal/jet/testutils.go b/internal/jet/testutils.go index 545f12c..1d5009e 100644 --- a/internal/jet/testutils.go +++ b/internal/jet/testutils.go @@ -1,7 +1,7 @@ package jet import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "strconv" "testing" ) @@ -56,8 +56,8 @@ func assertClauseSerialize(t *testing.T, clause Serializer, query string, args . //fmt.Println(out.Buff.String()) - assert.DeepEqual(t, out.Buff.String(), query) - assert.DeepEqual(t, out.Args, args) + assert.Equal(t, out.Buff.String(), query) + assert.Equal(t, out.Args, args) } func assertClauseSerializeErr(t *testing.T, clause Serializer, errString string) { @@ -76,14 +76,14 @@ func assertClauseDebugSerialize(t *testing.T, clause Serializer, query string, a //fmt.Println(out.Buff.String()) - assert.DeepEqual(t, out.Buff.String(), query) - assert.DeepEqual(t, out.Args, args) + assert.Equal(t, out.Buff.String(), query) + assert.Equal(t, out.Args, args) } func assertProjectionSerialize(t *testing.T, projection Projection, query string, args ...interface{}) { out := SQLBuilder{Dialect: defaultDialect} projection.serializeForProjection(SelectStatementType, &out) - assert.DeepEqual(t, out.Buff.String(), query) - assert.DeepEqual(t, out.Args, args) + assert.Equal(t, out.Buff.String(), query) + assert.Equal(t, out.Args, args) } diff --git a/internal/jet/utils_test.go b/internal/jet/utils_test.go index ce1935a..e13d7ff 100644 --- a/internal/jet/utils_test.go +++ b/internal/jet/utils_test.go @@ -1,7 +1,7 @@ package jet import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) diff --git a/internal/testutils/test_utils.go b/internal/testutils/test_utils.go index c3d3ff0..5719e75 100644 --- a/internal/testutils/test_utils.go +++ b/internal/testutils/test_utils.go @@ -7,21 +7,23 @@ import ( "github.com/go-jet/jet/internal/jet" "github.com/go-jet/jet/internal/utils" "github.com/go-jet/jet/qrm" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "io/ioutil" "os" "path/filepath" "runtime" "testing" + + "github.com/google/go-cmp/cmp" ) // AssertExec assert statement execution for successful execution and number of rows affected func AssertExec(t *testing.T, stmt jet.Statement, db qrm.DB, rowsAffected ...int64) { res, err := stmt.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) rows, err := res.RowsAffected() - assert.NilError(t, err) + assert.NoError(t, err) if len(rowsAffected) > 0 { assert.Equal(t, rows, rowsAffected[0]) @@ -49,7 +51,7 @@ func PrintJson(v interface{}) { // AssertJSON check if data json output is the same as expectedJSON func AssertJSON(t *testing.T, data interface{}, expectedJSON string) { jsonData, err := json.MarshalIndent(data, "", "\t") - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, "\n"+string(jsonData)+"\n", expectedJSON) } @@ -69,17 +71,17 @@ func AssertJSONFile(t *testing.T, data interface{}, testRelativePath string) { filePath := getFullPath(testRelativePath) fileJSONData, err := ioutil.ReadFile(filePath) - assert.NilError(t, err) + assert.NoError(t, err) if runtime.GOOS == "windows" { fileJSONData = bytes.Replace(fileJSONData, []byte("\r\n"), []byte("\n"), -1) } jsonData, err := json.MarshalIndent(data, "", "\t") - assert.NilError(t, err) + assert.NoError(t, err) - assert.Assert(t, string(fileJSONData) == string(jsonData)) - //assert.DeepEqual(t, string(fileJSONData), string(jsonData)) + assert.True(t, string(fileJSONData) == string(jsonData)) + //AssertDeepEqual(t, string(fileJSONData), string(jsonData)) } // AssertStatementSql check if statement Sql() is the same as expectedQuery and expectedArgs @@ -90,7 +92,7 @@ func AssertStatementSql(t *testing.T, query jet.Statement, expectedQuery string, if len(expectedArgs) == 0 { return } - assert.DeepEqual(t, args, expectedArgs) + AssertDeepEqual(t, args, expectedArgs) } // AssertStatementSqlErr checks if statement Sql() panics with errorStr @@ -108,7 +110,7 @@ func AssertDebugStatementSql(t *testing.T, query jet.Statement, expectedQuery st _, args := query.Sql() if len(expectedArgs) > 0 { - assert.DeepEqual(t, args, expectedArgs) + AssertDeepEqual(t, args, expectedArgs) } debuqSql := query.DebugSql() @@ -122,10 +124,10 @@ func AssertClauseSerialize(t *testing.T, dialect jet.Dialect, clause jet.Seriali //fmt.Println(out.Buff.String()) - assert.DeepEqual(t, out.Buff.String(), query) + AssertDeepEqual(t, out.Buff.String(), query) if len(args) > 0 { - assert.DeepEqual(t, out.Args, args) + AssertDeepEqual(t, out.Args, args) } } @@ -134,10 +136,10 @@ func AssertDebugClauseSerialize(t *testing.T, dialect jet.Dialect, clause jet.Se out := jet.SQLBuilder{Dialect: dialect, Debug: true} jet.Serialize(clause, jet.SelectStatementType, &out) - assert.DeepEqual(t, out.Buff.String(), query) + AssertDeepEqual(t, out.Buff.String(), query) if len(args) > 0 { - assert.DeepEqual(t, out.Args, args) + AssertDeepEqual(t, out.Args, args) } } @@ -167,8 +169,8 @@ func AssertProjectionSerialize(t *testing.T, dialect jet.Dialect, projection jet out := jet.SQLBuilder{Dialect: dialect} jet.SerializeForProjection(projection, jet.SelectStatementType, &out) - assert.DeepEqual(t, out.Buff.String(), query) - assert.DeepEqual(t, out.Args, args) + AssertDeepEqual(t, out.Buff.String(), query) + AssertDeepEqual(t, out.Args, args) } // AssertQueryPanicErr check if statement Query execution panics with error errString @@ -185,13 +187,13 @@ func AssertQueryPanicErr(t *testing.T, stmt jet.Statement, db qrm.DB, dest inter func AssertFileContent(t *testing.T, filePath string, contentBegin string, expectedContent string) { enumFileData, err := ioutil.ReadFile(filePath) - assert.NilError(t, err) + assert.NoError(t, err) beginIndex := bytes.Index(enumFileData, []byte(contentBegin)) //fmt.Println("-"+string(enumFileData[beginIndex:])+"-") - assert.DeepEqual(t, string(enumFileData[beginIndex:]), expectedContent) + AssertDeepEqual(t, string(enumFileData[beginIndex:]), expectedContent) } // AssertFileNamesEqual check if all filesInfos are contained in fileNames @@ -205,6 +207,10 @@ func AssertFileNamesEqual(t *testing.T, fileInfos []os.FileInfo, fileNames ...st } for _, fileName := range fileNames { - assert.Assert(t, fileNamesMap[fileName], fileName+" does not exist.") + assert.True(t, fileNamesMap[fileName], fileName+" does not exist.") } } + +func AssertDeepEqual(t *testing.T, actual, expected interface{}) { + assert.True(t, cmp.Equal(actual, expected)) +} diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go index 8ee2d49..ac57bbd 100644 --- a/internal/utils/utils_test.go +++ b/internal/utils/utils_test.go @@ -2,7 +2,7 @@ package utils import ( "fmt" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) diff --git a/mysql/insert_statement_test.go b/mysql/insert_statement_test.go index 0732486..6faf313 100644 --- a/mysql/insert_statement_test.go +++ b/mysql/insert_statement_test.go @@ -1,7 +1,7 @@ package mysql import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) diff --git a/postgres/insert_statement_test.go b/postgres/insert_statement_test.go index 96f275b..ccb1404 100644 --- a/postgres/insert_statement_test.go +++ b/postgres/insert_statement_test.go @@ -1,7 +1,7 @@ package postgres import ( - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) diff --git a/qrm/internal/null_types_test.go b/qrm/internal/null_types_test.go index 70eb42f..f03d3ab 100644 --- a/qrm/internal/null_types_test.go +++ b/qrm/internal/null_types_test.go @@ -2,7 +2,7 @@ package internal import ( "fmt" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -10,10 +10,10 @@ import ( func TestNullByteArray(t *testing.T) { var array NullByteArray - assert.NilError(t, array.Scan(nil)) + assert.NoError(t, array.Scan(nil)) assert.Equal(t, array.Valid, false) - assert.NilError(t, array.Scan([]byte("bytea"))) + assert.NoError(t, array.Scan([]byte("bytea"))) assert.Equal(t, array.Valid, true) assert.Equal(t, string(array.ByteArray), string([]byte("bytea"))) @@ -23,21 +23,21 @@ func TestNullByteArray(t *testing.T) { func TestNullTime(t *testing.T) { var array NullTime - assert.NilError(t, array.Scan(nil)) + assert.NoError(t, array.Scan(nil)) assert.Equal(t, array.Valid, false) time := time.Now() - assert.NilError(t, array.Scan(time)) + assert.NoError(t, array.Scan(time)) assert.Equal(t, array.Valid, true) value, _ := array.Value() assert.Equal(t, value, time) - assert.NilError(t, array.Scan([]byte("13:10:11"))) + assert.NoError(t, array.Scan([]byte("13:10:11"))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, fmt.Sprintf("%v", value), "0000-01-01 13:10:11 +0000 UTC") - assert.NilError(t, array.Scan("13:10:11")) + assert.NoError(t, array.Scan("13:10:11")) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, fmt.Sprintf("%v", value), "0000-01-01 13:10:11 +0000 UTC") @@ -48,10 +48,10 @@ func TestNullTime(t *testing.T) { func TestNullInt8(t *testing.T) { var array NullInt8 - assert.NilError(t, array.Scan(nil)) + assert.NoError(t, array.Scan(nil)) assert.Equal(t, array.Valid, false) - assert.NilError(t, array.Scan(int64(11))) + assert.NoError(t, array.Scan(int64(11))) assert.Equal(t, array.Valid, true) value, _ := array.Value() assert.Equal(t, value, int8(11)) @@ -62,25 +62,25 @@ func TestNullInt8(t *testing.T) { func TestNullInt16(t *testing.T) { var array NullInt16 - assert.NilError(t, array.Scan(nil)) + assert.NoError(t, array.Scan(nil)) assert.Equal(t, array.Valid, false) - assert.NilError(t, array.Scan(int64(11))) + assert.NoError(t, array.Scan(int64(11))) assert.Equal(t, array.Valid, true) value, _ := array.Value() assert.Equal(t, value, int16(11)) - assert.NilError(t, array.Scan(int16(20))) + assert.NoError(t, array.Scan(int16(20))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int16(20)) - assert.NilError(t, array.Scan(int8(30))) + assert.NoError(t, array.Scan(int8(30))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int16(30)) - assert.NilError(t, array.Scan(uint8(30))) + assert.NoError(t, array.Scan(uint8(30))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int16(30)) @@ -91,35 +91,35 @@ func TestNullInt16(t *testing.T) { func TestNullInt32(t *testing.T) { var array NullInt32 - assert.NilError(t, array.Scan(nil)) + assert.NoError(t, array.Scan(nil)) assert.Equal(t, array.Valid, false) - assert.NilError(t, array.Scan(int64(11))) + assert.NoError(t, array.Scan(int64(11))) assert.Equal(t, array.Valid, true) value, _ := array.Value() assert.Equal(t, value, int32(11)) - assert.NilError(t, array.Scan(int32(32))) + assert.NoError(t, array.Scan(int32(32))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int32(32)) - assert.NilError(t, array.Scan(int16(20))) + assert.NoError(t, array.Scan(int16(20))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int32(20)) - assert.NilError(t, array.Scan(uint16(16))) + assert.NoError(t, array.Scan(uint16(16))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int32(16)) - assert.NilError(t, array.Scan(int8(30))) + assert.NoError(t, array.Scan(int8(30))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int32(30)) - assert.NilError(t, array.Scan(uint8(30))) + assert.NoError(t, array.Scan(uint8(30))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, int32(30)) @@ -130,15 +130,15 @@ func TestNullInt32(t *testing.T) { func TestNullFloat32(t *testing.T) { var array NullFloat32 - assert.NilError(t, array.Scan(nil)) + assert.NoError(t, array.Scan(nil)) assert.Equal(t, array.Valid, false) - assert.NilError(t, array.Scan(float64(64))) + assert.NoError(t, array.Scan(float64(64))) assert.Equal(t, array.Valid, true) value, _ := array.Value() assert.Equal(t, value, float32(64)) - assert.NilError(t, array.Scan(float32(32))) + assert.NoError(t, array.Scan(float32(32))) assert.Equal(t, array.Valid, true) value, _ = array.Value() assert.Equal(t, value, float32(32)) diff --git a/qrm/utill_test.go b/qrm/utill_test.go index 168c55f..045e2b9 100644 --- a/qrm/utill_test.go +++ b/qrm/utill_test.go @@ -2,28 +2,28 @@ package qrm import ( "github.com/google/uuid" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "reflect" "testing" "time" ) func TestIsSimpleModelType(t *testing.T) { - assert.Assert(t, isSimpleModelType(reflect.TypeOf(int8(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(int16(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(int32(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(int64(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(uint8(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(uint16(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(uint32(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(uint64(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(int8(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(int16(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(int32(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(int64(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(uint8(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(uint16(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(uint32(11)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(uint64(11)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(float32(123.46)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(float64(123.46)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(float32(123.46)))) + assert.True(t, isSimpleModelType(reflect.TypeOf(float64(123.46)))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf([]byte("Text")))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(time.Now()))) - assert.Assert(t, isSimpleModelType(reflect.TypeOf(uuid.New()))) + assert.True(t, isSimpleModelType(reflect.TypeOf([]byte("Text")))) + assert.True(t, isSimpleModelType(reflect.TypeOf(time.Now()))) + assert.True(t, isSimpleModelType(reflect.TypeOf(uuid.New()))) complexModelType := struct { Field1 string diff --git a/tests/mysql/alltypes_test.go b/tests/mysql/alltypes_test.go index 361bb8d..98a1a4a 100644 --- a/tests/mysql/alltypes_test.go +++ b/tests/mysql/alltypes_test.go @@ -14,7 +14,7 @@ import ( . "github.com/go-jet/jet/mysql" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" ) func TestAllTypes(t *testing.T) { @@ -26,7 +26,7 @@ func TestAllTypes(t *testing.T) { LIMIT(2). Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) @@ -45,7 +45,7 @@ func TestAllTypesViewSelect(t *testing.T) { dest := []AllTypesView{} err := view.AllTypesView.SELECT(view.AllTypesView.AllColumns).Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) if sourceIsMariaDB() { // MariaDB saves current timestamp in a case of NULL value insert @@ -74,10 +74,10 @@ func TestUUID(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.Assert(t, dest.StrUUID != nil) - assert.Assert(t, dest.UUID.String() != uuid.UUID{}.String()) - assert.Assert(t, dest.StrUUID.String() != uuid.UUID{}.String()) + assert.NoError(t, err) + assert.True(t, dest.StrUUID != nil) + assert.True(t, dest.UUID.String() != uuid.UUID{}.String()) + assert.True(t, dest.StrUUID.String() != uuid.UUID{}.String()) assert.Equal(t, dest.StrUUID.String(), dest.BinUUID.String()) } @@ -119,7 +119,7 @@ LIMIT ?; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) @@ -210,7 +210,7 @@ FROM test_sample.all_types; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSONFile(t, dest, "./testdata/results/common/bool_operators.json") } @@ -307,7 +307,7 @@ LIMIT ?; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSONFile(t, dest, "./testdata/results/common/float_operators.json") } @@ -444,7 +444,7 @@ LIMIT ?; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) @@ -516,7 +516,7 @@ func TestStringOperators(t *testing.T) { dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } var timeT = time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC) @@ -604,7 +604,7 @@ FROM test_sample.all_types; dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestDateExpressions(t *testing.T) { @@ -679,7 +679,7 @@ FROM test_sample.all_types; dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestDateTimeExpressions(t *testing.T) { @@ -756,7 +756,7 @@ FROM test_sample.all_types; dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestTimestampExpressions(t *testing.T) { @@ -832,13 +832,13 @@ FROM test_sample.all_types; dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestTimeLiterals(t *testing.T) { loc, err := time.LoadLocation("Europe/Berlin") - assert.NilError(t, err) + assert.NoError(t, err) var timeT = time.Date(2009, 11, 17, 20, 34, 58, 351387237, loc) @@ -877,7 +877,7 @@ LIMIT ?; } err = query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) @@ -960,7 +960,7 @@ func TestINTERVAL(t *testing.T) { //fmt.Println(query.DebugSql()) err := query.Query(db, &struct{}{}) - assert.NilError(t, err) + assert.NoError(t, err) } var allTypesJson = ` diff --git a/tests/mysql/cast_test.go b/tests/mysql/cast_test.go index 07570a0..3ab1914 100644 --- a/tests/mysql/cast_test.go +++ b/tests/mysql/cast_test.go @@ -4,7 +4,7 @@ import ( "github.com/go-jet/jet/internal/testutils" . "github.com/go-jet/jet/mysql" . "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -55,9 +55,9 @@ FROM test_sample.all_types; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) - assert.DeepEqual(t, dest, Result{ + testutils.AssertDeepEqual(t, dest, Result{ As1: "test", Date1: *testutils.Date("2011-02-02"), Time: *testutils.TimeWithoutTimeZone("14:06:10"), diff --git a/tests/mysql/delete_test.go b/tests/mysql/delete_test.go index c3409a5..2e06d88 100644 --- a/tests/mysql/delete_test.go +++ b/tests/mysql/delete_test.go @@ -6,7 +6,7 @@ import ( . "github.com/go-jet/jet/mysql" "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) diff --git a/tests/mysql/generator_test.go b/tests/mysql/generator_test.go index 89a07b4..8ae9347 100644 --- a/tests/mysql/generator_test.go +++ b/tests/mysql/generator_test.go @@ -4,7 +4,7 @@ import ( "github.com/go-jet/jet/generator/mysql" "github.com/go-jet/jet/internal/testutils" "github.com/go-jet/jet/tests/dbconfig" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "io/ioutil" "os" "os/exec" @@ -25,23 +25,23 @@ func TestGenerator(t *testing.T) { DBName: "dvds", }) - assert.NilError(t, err) + assert.NoError(t, err) assertGeneratedFiles(t) } err := os.RemoveAll(genTestDirRoot) - assert.NilError(t, err) + assert.NoError(t, err) } func TestCmdGenerator(t *testing.T) { goInstallJet := exec.Command("sh", "-c", "go install github.com/go-jet/jet/cmd/jet") goInstallJet.Stderr = os.Stderr err := goInstallJet.Run() - assert.NilError(t, err) + assert.NoError(t, err) err = os.RemoveAll(genTestDir3) - assert.NilError(t, err) + assert.NoError(t, err) cmd := exec.Command("jet", "-source=MySQL", "-dbname=dvds", "-host=localhost", "-port=3306", "-user=jet", "-password=jet", "-path="+genTestDir3) @@ -50,18 +50,18 @@ func TestCmdGenerator(t *testing.T) { cmd.Stdout = os.Stdout err = cmd.Run() - assert.NilError(t, err) + assert.NoError(t, err) assertGeneratedFiles(t) err = os.RemoveAll(genTestDirRoot) - assert.NilError(t, err) + assert.NoError(t, err) } func assertGeneratedFiles(t *testing.T) { // Table SQL Builder files tableSQLBuilderFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/table") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, tableSQLBuilderFiles, "actor.go", "address.go", "category.go", "city.go", "country.go", "customer.go", "film.go", "film_actor.go", "film_category.go", "film_text.go", "inventory.go", "language.go", @@ -71,7 +71,7 @@ func assertGeneratedFiles(t *testing.T) { // View SQL Builder files viewSQLBuilderFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/view") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, viewSQLBuilderFiles, "actor_info.go", "film_list.go", "nicer_but_slower_film_list.go", "sales_by_film_category.go", "customer_list.go", "sales_by_store.go", "staff_list.go") @@ -80,14 +80,14 @@ func assertGeneratedFiles(t *testing.T) { // Enums SQL Builder files enumFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/enum") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, enumFiles, "film_rating.go", "film_list_rating.go", "nicer_but_slower_film_list_rating.go") testutils.AssertFileContent(t, genTestDir3+"/dvds/enum/film_rating.go", "\npackage enum", mpaaRatingEnumFile) // Model files modelFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/model") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, modelFiles, "actor.go", "address.go", "category.go", "city.go", "country.go", "customer.go", "film.go", "film_actor.go", "film_category.go", "film_text.go", "inventory.go", "language.go", diff --git a/tests/mysql/insert_test.go b/tests/mysql/insert_test.go index 697bccb..4c86012 100644 --- a/tests/mysql/insert_test.go +++ b/tests/mysql/insert_test.go @@ -6,7 +6,7 @@ import ( . "github.com/go-jet/jet/mysql" "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -32,7 +32,7 @@ INSERT INTO test_sample.link (id, url, name, description) VALUES 102, "http://www.yahoo.com", "Yahoo", nil) _, err := insertQuery.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) insertedLinks := []model.Link{} @@ -41,18 +41,18 @@ INSERT INTO test_sample.link (id, url, name, description) VALUES ORDER_BY(Link.ID). Query(db, &insertedLinks) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(insertedLinks), 3) - assert.DeepEqual(t, insertedLinks[0], postgreTutorial) + testutils.AssertDeepEqual(t, insertedLinks[0], postgreTutorial) - assert.DeepEqual(t, insertedLinks[1], model.Link{ + testutils.AssertDeepEqual(t, insertedLinks[1], model.Link{ ID: 101, URL: "http://www.google.com", Name: "Google", }) - assert.DeepEqual(t, insertedLinks[2], model.Link{ + testutils.AssertDeepEqual(t, insertedLinks[2], model.Link{ ID: 102, URL: "http://www.yahoo.com", Name: "Yahoo", @@ -80,7 +80,7 @@ INSERT INTO test_sample.link VALUES 100, "http://www.postgresqltutorial.com", "PostgreSQL Tutorial") _, err := stmt.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) insertedLinks := []model.Link{} @@ -89,9 +89,9 @@ INSERT INTO test_sample.link VALUES ORDER_BY(Link.ID). Query(db, &insertedLinks) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(insertedLinks), 1) - assert.DeepEqual(t, insertedLinks[0], postgreTutorial) + testutils.AssertDeepEqual(t, insertedLinks[0], postgreTutorial) } func TestInsertModelObject(t *testing.T) { @@ -113,7 +113,7 @@ INSERT INTO test_sample.link (url, name) VALUES testutils.AssertDebugStatementSql(t, query, expectedSQL, "http://www.duckduckgo.com", "Duck Duck go") _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func TestInsertModelObjectEmptyColumnList(t *testing.T) { @@ -136,7 +136,7 @@ INSERT INTO test_sample.link VALUES testutils.AssertDebugStatementSql(t, query, expectedSQL, int32(1000), "http://www.duckduckgo.com", "Duck Duck go", nil) _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func TestInsertModelsObject(t *testing.T) { @@ -172,7 +172,7 @@ INSERT INTO test_sample.link (url, name) VALUES "http://www.yahoo.com", "Yahoo") _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func TestInsertUsingMutableColumns(t *testing.T) { @@ -207,14 +207,14 @@ INSERT INTO test_sample.link (url, name, description) VALUES "http://www.yahoo.com", "Yahoo", nil) _, err := stmt.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func TestInsertQuery(t *testing.T) { _, err := Link.DELETE(). WHERE(Link.ID.NOT_EQ(Int(1)).AND(Link.Name.EQ(String("Youtube")))). Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) var expectedSQL = ` INSERT INTO test_sample.link (url, name) ( @@ -236,7 +236,7 @@ INSERT INTO test_sample.link (url, name) ( testutils.AssertDebugStatementSql(t, query, expectedSQL, int64(1)) _, err = query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) youtubeLinks := []model.Link{} err = Link. @@ -244,7 +244,7 @@ INSERT INTO test_sample.link (url, name) ( WHERE(Link.Name.EQ(String("Youtube"))). Query(db, &youtubeLinks) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(youtubeLinks), 2) } @@ -283,5 +283,5 @@ func TestInsertWithExecContext(t *testing.T) { func cleanUpLinkTable(t *testing.T) { _, err := Link.DELETE().WHERE(Link.ID.GT(Int(1))).Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } diff --git a/tests/mysql/lock_test.go b/tests/mysql/lock_test.go index 57ffbe8..e3d5749 100644 --- a/tests/mysql/lock_test.go +++ b/tests/mysql/lock_test.go @@ -4,7 +4,7 @@ import ( "github.com/go-jet/jet/internal/testutils" . "github.com/go-jet/jet/mysql" . "github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) @@ -16,7 +16,7 @@ LOCK TABLES dvds.customer READ; `) _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func TestLockWrite(t *testing.T) { @@ -27,7 +27,7 @@ LOCK TABLES dvds.customer WRITE; `) _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func TestUnlockTables(t *testing.T) { @@ -38,5 +38,5 @@ UNLOCK TABLES; `) _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } diff --git a/tests/mysql/select_test.go b/tests/mysql/select_test.go index ed75bad..c47c6d4 100644 --- a/tests/mysql/select_test.go +++ b/tests/mysql/select_test.go @@ -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) } diff --git a/tests/mysql/update_test.go b/tests/mysql/update_test.go index a6a07f5..c1e3f19 100644 --- a/tests/mysql/update_test.go +++ b/tests/mysql/update_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table" "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -40,9 +40,9 @@ WHERE link.name = 'Bing'; WHERE(Link.Name.EQ(String("Bong"))). Query(db, &links) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(links), 1) - assert.DeepEqual(t, links[0], model.Link{ + testutils.AssertDeepEqual(t, links[0], model.Link{ ID: 204, URL: "http://bong.com", Name: "Bong", @@ -244,7 +244,7 @@ func TestUpdateWithJoin(t *testing.T) { //fmt.Println(query.DebugSql()) _, err := query.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func setupLinkTableForUpdateTest(t *testing.T) { @@ -259,5 +259,5 @@ func setupLinkTableForUpdateTest(t *testing.T) { VALUES(204, "http://www.bing.com", "Bing", DEFAULT). Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } diff --git a/tests/postgres/alltypes_test.go b/tests/postgres/alltypes_test.go index fbcffd8..0b30080 100644 --- a/tests/postgres/alltypes_test.go +++ b/tests/postgres/alltypes_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "github.com/go-jet/jet/internal/testutils" . "github.com/go-jet/jet/postgres" @@ -19,23 +19,22 @@ func TestAllTypesSelect(t *testing.T) { dest := []model.AllTypes{} err := AllTypes.SELECT(AllTypes.AllColumns).Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) - assert.DeepEqual(t, dest[0], allTypesRow0) - assert.DeepEqual(t, dest[1], allTypesRow1) + testutils.AssertDeepEqual(t, dest[0], allTypesRow0) + testutils.AssertDeepEqual(t, dest[1], allTypesRow1) } func TestAllTypesViewSelect(t *testing.T) { - type AllTypesView model.AllTypes dest := []AllTypesView{} err := view.AllTypesView.SELECT(view.AllTypesView.AllColumns).Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) - assert.DeepEqual(t, dest[0], AllTypesView(allTypesRow0)) - assert.DeepEqual(t, dest[1], AllTypesView(allTypesRow1)) + testutils.AssertDeepEqual(t, dest[0], AllTypesView(allTypesRow0)) + testutils.AssertDeepEqual(t, dest[1], AllTypesView(allTypesRow1)) } func TestAllTypesInsertModel(t *testing.T) { @@ -46,11 +45,11 @@ func TestAllTypesInsertModel(t *testing.T) { dest := []model.AllTypes{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0], allTypesRow0) - assert.DeepEqual(t, dest[1], allTypesRow1) + testutils.AssertDeepEqual(t, dest[0], allTypesRow0) + testutils.AssertDeepEqual(t, dest[1], allTypesRow1) } func TestAllTypesInsertQuery(t *testing.T) { @@ -65,10 +64,10 @@ func TestAllTypesInsertQuery(t *testing.T) { dest := []model.AllTypes{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0], allTypesRow0) - assert.DeepEqual(t, dest[1], allTypesRow1) + testutils.AssertDeepEqual(t, dest[0], allTypesRow0) + testutils.AssertDeepEqual(t, dest[1], allTypesRow1) } func TestAllTypesFromSubQuery(t *testing.T) { @@ -213,7 +212,7 @@ LIMIT 2; dest := []model.AllTypes{} err := mainQuery.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) } @@ -252,7 +251,7 @@ LIMIT $5; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) @@ -321,7 +320,7 @@ func TestExpressionCast(t *testing.T) { dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestStringOperators(t *testing.T) { @@ -401,7 +400,7 @@ func TestStringOperators(t *testing.T) { dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestBoolOperators(t *testing.T) { @@ -470,7 +469,7 @@ LIMIT $5; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSONFile(t, dest, "./testdata/results/common/bool_operators.json") } @@ -566,7 +565,7 @@ LIMIT $35; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) @@ -705,7 +704,7 @@ LIMIT $23; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.SaveJsonFile("./testdata/common/int_operators.json", dest) //testutils.PrintJson(dest) @@ -784,7 +783,7 @@ func TestTimeExpression(t *testing.T) { dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestInterval(t *testing.T) { @@ -835,7 +834,7 @@ func TestInterval(t *testing.T) { //fmt.Println(stmt.DebugSql()) err := stmt.Query(db, &struct{}{}) - assert.NilError(t, err) + assert.NoError(t, err) } func TestSubQueryColumnReference(t *testing.T) { @@ -987,17 +986,17 @@ FROM` dest1 := []model.AllTypes{} err := stmt1.Query(db, &dest1) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest1), 2) assert.Equal(t, dest1[0].Boolean, allTypesRow0.Boolean) assert.Equal(t, dest1[0].Integer, allTypesRow0.Integer) assert.Equal(t, dest1[0].Real, allTypesRow0.Real) assert.Equal(t, dest1[0].Text, allTypesRow0.Text) - assert.DeepEqual(t, dest1[0].Time, allTypesRow0.Time) - assert.DeepEqual(t, dest1[0].Timez, allTypesRow0.Timez) - assert.DeepEqual(t, dest1[0].Timestamp, allTypesRow0.Timestamp) - assert.DeepEqual(t, dest1[0].Timestampz, allTypesRow0.Timestampz) - assert.DeepEqual(t, dest1[0].Date, allTypesRow0.Date) + testutils.AssertDeepEqual(t, dest1[0].Time, allTypesRow0.Time) + testutils.AssertDeepEqual(t, dest1[0].Timez, allTypesRow0.Timez) + testutils.AssertDeepEqual(t, dest1[0].Timestamp, allTypesRow0.Timestamp) + testutils.AssertDeepEqual(t, dest1[0].Timestampz, allTypesRow0.Timestampz) + testutils.AssertDeepEqual(t, dest1[0].Date, allTypesRow0.Date) stmt2 := SELECT( subQuery.AllColumns(), @@ -1009,15 +1008,15 @@ FROM` dest2 := []model.AllTypes{} err = stmt2.Query(db, &dest2) - assert.NilError(t, err) - assert.DeepEqual(t, dest1, dest2) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest1, dest2) } } func TestTimeLiterals(t *testing.T) { loc, err := time.LoadLocation("Europe/Berlin") - assert.NilError(t, err) + assert.NoError(t, err) var timeT = time.Date(2009, 11, 17, 20, 34, 58, 651387237, loc) @@ -1052,7 +1051,7 @@ LIMIT $6; err = query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) diff --git a/tests/postgres/chinook_db_test.go b/tests/postgres/chinook_db_test.go index 8969b0b..b0b5efe 100644 --- a/tests/postgres/chinook_db_test.go +++ b/tests/postgres/chinook_db_test.go @@ -7,7 +7,7 @@ import ( . "github.com/go-jet/jet/postgres" "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -30,11 +30,11 @@ ORDER BY "Album"."AlbumId" ASC; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 347) - assert.DeepEqual(t, dest[0], album1) - assert.DeepEqual(t, dest[1], album2) - assert.DeepEqual(t, dest[len(dest)-1], album347) + testutils.AssertDeepEqual(t, dest[0], album1) + testutils.AssertDeepEqual(t, dest[1], album2) + testutils.AssertDeepEqual(t, dest[len(dest)-1], album347) } func TestJoinEverything(t *testing.T) { @@ -103,7 +103,7 @@ func TestJoinEverything(t *testing.T) { err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 275) testutils.AssertJSONFile(t, dest, "./testdata/results/postgres/joined_everything.json") } @@ -143,7 +143,7 @@ ORDER BY "Employee"."EmployeeId"; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 8) testutils.AssertJSON(t, dest[0:2], ` [ @@ -236,11 +236,11 @@ ORDER BY "Album.AlbumId"; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0], album1) - assert.DeepEqual(t, dest[1], album2) + testutils.AssertDeepEqual(t, dest[0], album1) + testutils.AssertDeepEqual(t, dest[1], album2) } func TestQueryWithContext(t *testing.T) { @@ -327,7 +327,7 @@ ORDER BY "first10Artist"."Artist.ArtistId"; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //spew.Dump(dest) } diff --git a/tests/postgres/delete_test.go b/tests/postgres/delete_test.go index 352a788..855f6dc 100644 --- a/tests/postgres/delete_test.go +++ b/tests/postgres/delete_test.go @@ -6,7 +6,7 @@ import ( . "github.com/go-jet/jet/postgres" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -48,11 +48,11 @@ RETURNING link.id AS "link.id", err := deleteStmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0].Name, "Gmail") - assert.DeepEqual(t, dest[1].Name, "Outlook") + testutils.AssertDeepEqual(t, dest[0].Name, "Gmail") + testutils.AssertDeepEqual(t, dest[1].Name, "Outlook") } func initForDeleteTest(t *testing.T) { diff --git a/tests/postgres/generator_test.go b/tests/postgres/generator_test.go index 5100801..b98633a 100644 --- a/tests/postgres/generator_test.go +++ b/tests/postgres/generator_test.go @@ -4,7 +4,7 @@ import ( "github.com/go-jet/jet/generator/postgres" "github.com/go-jet/jet/internal/testutils" "github.com/go-jet/jet/tests/dbconfig" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "io/ioutil" "os" "os/exec" @@ -19,7 +19,7 @@ func TestGeneratedModel(t *testing.T) { assert.Equal(t, reflect.TypeOf(actor.ActorID).String(), "int32") actorIDField, ok := reflect.TypeOf(actor).FieldByName("ActorID") - assert.Assert(t, ok) + assert.True(t, ok) assert.Equal(t, actorIDField.Tag.Get("sql"), "primary_key") assert.Equal(t, reflect.TypeOf(actor.FirstName).String(), "string") assert.Equal(t, reflect.TypeOf(actor.LastName).String(), "string") @@ -29,12 +29,12 @@ func TestGeneratedModel(t *testing.T) { assert.Equal(t, reflect.TypeOf(filmActor.FilmID).String(), "int16") filmIDField, ok := reflect.TypeOf(filmActor).FieldByName("FilmID") - assert.Assert(t, ok) + assert.True(t, ok) assert.Equal(t, filmIDField.Tag.Get("sql"), "primary_key") assert.Equal(t, reflect.TypeOf(filmActor.ActorID).String(), "int16") actorIDField, ok = reflect.TypeOf(filmActor).FieldByName("ActorID") - assert.Assert(t, ok) + assert.True(t, ok) assert.Equal(t, filmIDField.Tag.Get("sql"), "primary_key") staff := model.Staff{} @@ -49,10 +49,10 @@ func TestCmdGenerator(t *testing.T) { goInstallJet := exec.Command("sh", "-c", "go install github.com/go-jet/jet/cmd/jet") goInstallJet.Stderr = os.Stderr err := goInstallJet.Run() - assert.NilError(t, err) + assert.NoError(t, err) err = os.RemoveAll(genTestDir2) - assert.NilError(t, err) + assert.NoError(t, err) cmd := exec.Command("jet", "-source=PostgreSQL", "-dbname=jetdb", "-host=localhost", "-port=5432", "-user=jet", "-password=jet", "-schema=dvds", "-path="+genTestDir2) @@ -60,12 +60,12 @@ func TestCmdGenerator(t *testing.T) { cmd.Stdout = os.Stdout err = cmd.Run() - assert.NilError(t, err) + assert.NoError(t, err) assertGeneratedFiles(t) err = os.RemoveAll(genTestDir2) - assert.NilError(t, err) + assert.NoError(t, err) } func TestGenerator(t *testing.T) { @@ -83,19 +83,19 @@ func TestGenerator(t *testing.T) { SchemaName: "dvds", }) - assert.NilError(t, err) + assert.NoError(t, err) assertGeneratedFiles(t) } err := os.RemoveAll(genTestDir2) - assert.NilError(t, err) + assert.NoError(t, err) } func assertGeneratedFiles(t *testing.T) { // Table SQL Builder files tableSQLBuilderFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/table") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, tableSQLBuilderFiles, "actor.go", "address.go", "category.go", "city.go", "country.go", "customer.go", "film.go", "film_actor.go", "film_category.go", "inventory.go", "language.go", @@ -105,7 +105,7 @@ func assertGeneratedFiles(t *testing.T) { // View SQL Builder files viewSQLBuilderFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/view") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, viewSQLBuilderFiles, "actor_info.go", "film_list.go", "nicer_but_slower_film_list.go", "sales_by_film_category.go", "customer_list.go", "sales_by_store.go", "staff_list.go") @@ -114,14 +114,14 @@ func assertGeneratedFiles(t *testing.T) { // Enums SQL Builder files enumFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/enum") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, enumFiles, "mpaa_rating.go") testutils.AssertFileContent(t, "./.gentestdata2/jetdb/dvds/enum/mpaa_rating.go", "\npackage enum", mpaaRatingEnumFile) // Model files modelFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/model") - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, modelFiles, "actor.go", "address.go", "category.go", "city.go", "country.go", "customer.go", "film.go", "film_actor.go", "film_category.go", "inventory.go", "language.go", @@ -281,13 +281,13 @@ func TestGeneratedAllTypesSQLBuilderFiles(t *testing.T) { tableDir := testRoot + ".gentestdata/jetdb/test_sample/table/" enumFiles, err := ioutil.ReadDir(enumDir) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, enumFiles, "mood.go") testutils.AssertFileContent(t, enumDir+"mood.go", "\npackage enum", moodEnumContent) modelFiles, err := ioutil.ReadDir(modelDir) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, modelFiles, "all_types.go", "all_types_view.go", "employee.go", "link.go", "mood.go", "person.go", "person_phone.go", "weird_names_table.go") @@ -295,7 +295,7 @@ func TestGeneratedAllTypesSQLBuilderFiles(t *testing.T) { testutils.AssertFileContent(t, modelDir+"all_types.go", "\npackage model", allTypesModelContent) tableFiles, err := ioutil.ReadDir(tableDir) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertFileNamesEqual(t, tableFiles, "all_types.go", "employee.go", "link.go", "person.go", "person_phone.go", "weird_names_table.go") diff --git a/tests/postgres/insert_test.go b/tests/postgres/insert_test.go index 161ffed..38c135e 100644 --- a/tests/postgres/insert_test.go +++ b/tests/postgres/insert_test.go @@ -6,7 +6,7 @@ import ( . "github.com/go-jet/jet/postgres" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -39,23 +39,23 @@ RETURNING link.id AS "link.id", err := insertQuery.Query(db, &insertedLinks) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(insertedLinks), 3) - assert.DeepEqual(t, insertedLinks[0], model.Link{ + testutils.AssertDeepEqual(t, insertedLinks[0], model.Link{ ID: 100, URL: "http://www.postgresqltutorial.com", Name: "PostgreSQL Tutorial", }) - assert.DeepEqual(t, insertedLinks[1], model.Link{ + testutils.AssertDeepEqual(t, insertedLinks[1], model.Link{ ID: 101, URL: "http://www.google.com", Name: "Google", }) - assert.DeepEqual(t, insertedLinks[2], model.Link{ + testutils.AssertDeepEqual(t, insertedLinks[2], model.Link{ ID: 102, URL: "http://www.yahoo.com", Name: "Yahoo", @@ -68,9 +68,9 @@ RETURNING link.id AS "link.id", ORDER_BY(Link.ID). Query(db, &allLinks) - assert.NilError(t, err) + assert.NoError(t, err) - assert.DeepEqual(t, insertedLinks, allLinks) + testutils.AssertDeepEqual(t, insertedLinks, allLinks) } func TestInsertEmptyColumnList(t *testing.T) { @@ -206,7 +206,7 @@ func TestInsertQuery(t *testing.T) { _, err := Link.DELETE(). WHERE(Link.ID.NOT_EQ(Int(0)).AND(Link.Name.EQ(String("Youtube")))). Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) var expectedSQL = ` INSERT INTO test_sample.link (url, name) ( @@ -236,7 +236,7 @@ RETURNING link.id AS "link.id", err = query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) youtubeLinks := []model.Link{} err = Link. @@ -244,7 +244,7 @@ RETURNING link.id AS "link.id", WHERE(Link.Name.EQ(String("Youtube"))). Query(db, &youtubeLinks) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(youtubeLinks), 2) } diff --git a/tests/postgres/lock_test.go b/tests/postgres/lock_test.go index e5ace94..acfb852 100644 --- a/tests/postgres/lock_test.go +++ b/tests/postgres/lock_test.go @@ -3,7 +3,7 @@ package postgres import ( "context" "github.com/go-jet/jet/internal/testutils" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" @@ -35,11 +35,11 @@ LOCK TABLE dvds.address IN` _, err := query.Exec(tx) - assert.NilError(t, err) + assert.NoError(t, err) err = tx.Rollback() - assert.NilError(t, err) + assert.NoError(t, err) } for _, lockMode := range testData { @@ -51,11 +51,11 @@ LOCK TABLE dvds.address IN` _, err := query.Exec(tx) - assert.NilError(t, err) + assert.NoError(t, err) err = tx.Rollback() - assert.NilError(t, err) + assert.NoError(t, err) } } diff --git a/tests/postgres/northwind_test.go b/tests/postgres/northwind_test.go index 8a02665..a50122b 100644 --- a/tests/postgres/northwind_test.go +++ b/tests/postgres/northwind_test.go @@ -4,7 +4,7 @@ import ( "github.com/go-jet/jet/internal/testutils" "github.com/go-jet/jet/tests/.gentestdata/jetdb/northwind/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/northwind/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) @@ -59,7 +59,7 @@ func TestNorthwindJoinEverything(t *testing.T) { } err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //jsonSave("./testdata/northwind-all.json", dest) testutils.AssertJSONFile(t, dest, "./testdata/results/postgres/northwind-all.json") diff --git a/tests/postgres/sample_test.go b/tests/postgres/sample_test.go index 41c62f8..5989d17 100644 --- a/tests/postgres/sample_test.go +++ b/tests/postgres/sample_test.go @@ -6,7 +6,7 @@ import ( "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" "github.com/google/uuid" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) @@ -25,9 +25,9 @@ WHERE all_types.uuid = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'; result := model.AllTypes{} err := query.Query(db, &result) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, result.UUID, uuid.MustParse("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11")) - assert.DeepEqual(t, result.UUIDPtr, UUIDPtr("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11")) + testutils.AssertDeepEqual(t, result.UUIDPtr, UUIDPtr("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11")) } func TestUUIDComplex(t *testing.T) { @@ -46,7 +46,7 @@ func TestUUIDComplex(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) testutils.AssertJSON(t, dest, ` [ @@ -96,7 +96,7 @@ func TestUUIDComplex(t *testing.T) { } } err := singleQuery.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSON(t, dest, ` { @@ -132,7 +132,7 @@ func TestUUIDComplex(t *testing.T) { } err := leftQuery.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSON(t, dest, ` [ { @@ -194,7 +194,7 @@ FROM test_sample.person; err := query.Query(db, &result) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSON(t, result, ` [ { @@ -258,9 +258,9 @@ ORDER BY employee.employee_id; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 8) - assert.DeepEqual(t, dest[0].Employee, model.Employee{ + testutils.AssertDeepEqual(t, dest[0].Employee, model.Employee{ EmployeeID: 1, FirstName: "Windy", LastName: "Hays", @@ -268,9 +268,9 @@ ORDER BY employee.employee_id; ManagerID: nil, }) - assert.Assert(t, dest[0].Manager == nil) + assert.True(t, dest[0].Manager == nil) - assert.DeepEqual(t, dest[7].Employee, model.Employee{ + testutils.AssertDeepEqual(t, dest[7].Employee, model.Employee{ EmployeeID: 8, FirstName: "Salley", LastName: "Lester", @@ -306,10 +306,10 @@ FROM test_sample."WEIRD NAMES TABLE"; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 1) - assert.DeepEqual(t, dest[0], model.WeirdNamesTable{ + testutils.AssertDeepEqual(t, dest[0], model.WeirdNamesTable{ WeirdColumnName1: "Doe", WeirdColumnName2: "Doe", WeirdColumnName3: "Doe", diff --git a/tests/postgres/scan_test.go b/tests/postgres/scan_test.go index 11dac96..40e18f8 100644 --- a/tests/postgres/scan_test.go +++ b/tests/postgres/scan_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table" "github.com/google/uuid" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) @@ -53,38 +53,38 @@ func TestScanToValidDestination(t *testing.T) { dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("global query function scan", func(t *testing.T) { queryStr, args := query.Sql() dest := []struct{}{} err := qrm.Query(nil, db, queryStr, args, &dest) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("pointer to slice", func(t *testing.T) { err := query.Query(db, &[]struct{}{}) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("pointer to slice of pointer to structs", func(t *testing.T) { err := query.Query(db, &[]*struct{}{}) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("pointer to slice of strings", func(t *testing.T) { err := query.Query(db, &[]int32{}) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("pointer to slice of strings", func(t *testing.T) { err := query.Query(db, &[]*int32{}) - assert.NilError(t, err) + assert.NoError(t, err) }) } @@ -99,16 +99,16 @@ func TestScanToStruct(t *testing.T) { dest := model.Inventory{} err := query.LIMIT(1).Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, inventory1, dest) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, inventory1, dest) }) t.Run("multiple structs, just first one used", func(t *testing.T) { dest := model.Inventory{} err := query.LIMIT(10).Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, inventory1, dest) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, inventory1, dest) }) t.Run("one struct", func(t *testing.T) { @@ -117,8 +117,8 @@ func TestScanToStruct(t *testing.T) { }{} err := query.LIMIT(1).Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, inventory1, dest.Inventory) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, inventory1, dest.Inventory) }) t.Run("one struct", func(t *testing.T) { @@ -127,8 +127,8 @@ func TestScanToStruct(t *testing.T) { }{} err := query.LIMIT(1).Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, inventory1, *dest.Inventory) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, inventory1, *dest.Inventory) }) t.Run("invalid dest", func(t *testing.T) { @@ -158,7 +158,7 @@ func TestScanToStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, *dest.InventoryID, int32(1)) assert.Equal(t, dest.FilmID, int16(1)) @@ -175,7 +175,7 @@ func TestScanToStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("type mismatch scanner type", func(t *testing.T) { @@ -217,10 +217,10 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Film, film1) - assert.DeepEqual(t, dest.Store, store1) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Film, film1) + testutils.AssertDeepEqual(t, dest.Store, store1) }) t.Run("embedded pointer structs", func(t *testing.T) { @@ -232,10 +232,10 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, *dest.Inventory, inventory1) - assert.DeepEqual(t, *dest.Film, film1) - assert.DeepEqual(t, *dest.Store, store1) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, *dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, *dest.Film, film1) + testutils.AssertDeepEqual(t, *dest.Store, store1) }) t.Run("embedded unused structs", func(t *testing.T) { @@ -246,9 +246,9 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Actor, model.Actor{}) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Actor, model.Actor{}) }) t.Run("embedded unused pointer structs", func(t *testing.T) { @@ -259,9 +259,9 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Actor, (*model.Actor)(nil)) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Actor, (*model.Actor)(nil)) }) t.Run("embedded unused pointer structs", func(t *testing.T) { @@ -272,9 +272,9 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Actor, (*model.Actor)(nil)) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Actor, (*model.Actor)(nil)) }) t.Run("embedded pointer to selected column", func(t *testing.T) { @@ -291,9 +291,9 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.Assert(t, dest.Actor != nil) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + assert.True(t, dest.Actor != nil) }) t.Run("struct embedded unused pointer", func(t *testing.T) { @@ -306,9 +306,9 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Actor, (*struct{ model.Actor })(nil)) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Actor, (*struct{ model.Actor })(nil)) }) t.Run("multiple embedded unused pointer", func(t *testing.T) { @@ -322,9 +322,9 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Actor, (*struct { + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Actor, (*struct { model.Actor model.Language })(nil)) @@ -341,11 +341,11 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.Assert(t, dest.Actor != nil) - assert.DeepEqual(t, dest.Actor.Actor, model.Actor{}) - assert.DeepEqual(t, dest.Actor.Film, film1) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + assert.True(t, dest.Actor != nil) + testutils.AssertDeepEqual(t, dest.Actor.Actor, model.Actor{}) + testutils.AssertDeepEqual(t, dest.Actor.Film, film1) }) t.Run("field not nil, deeply nested selected model", func(t *testing.T) { @@ -361,11 +361,11 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.Assert(t, dest.Actor != nil) - assert.Assert(t, dest.Actor.Film != nil) - assert.DeepEqual(t, dest.Actor.Film.Film, &film1) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + assert.True(t, dest.Actor != nil) + assert.True(t, dest.Actor.Film != nil) + testutils.AssertDeepEqual(t, dest.Actor.Film.Film, &film1) }) t.Run("embedded structs", func(t *testing.T) { @@ -398,15 +398,15 @@ func TestScanToNestedStruct(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Inventory, inventory1) - assert.DeepEqual(t, dest.Film.Film, film1) - assert.DeepEqual(t, dest.Store, store1) - assert.DeepEqual(t, dest.Film.Language, language1) - assert.DeepEqual(t, dest.Film.Lang.Language, language1) - assert.DeepEqual(t, dest.Film.Lang2.Language, language1) - assert.DeepEqual(t, dest.Film.Language2, &language1) - assert.DeepEqual(t, model.Language(*dest.Film.Language3), language1) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Inventory, inventory1) + testutils.AssertDeepEqual(t, dest.Film.Film, film1) + testutils.AssertDeepEqual(t, dest.Store, store1) + testutils.AssertDeepEqual(t, dest.Film.Language, language1) + testutils.AssertDeepEqual(t, dest.Film.Lang.Language, language1) + testutils.AssertDeepEqual(t, dest.Film.Lang2.Language, language1) + testutils.AssertDeepEqual(t, dest.Film.Language2, &language1) + testutils.AssertDeepEqual(t, model.Language(*dest.Film.Language3), language1) }) } @@ -423,18 +423,18 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) - assert.DeepEqual(t, dest[0], inventory1) - assert.DeepEqual(t, dest[1], inventory2) + testutils.AssertDeepEqual(t, dest[0], inventory1) + testutils.AssertDeepEqual(t, dest[1], inventory2) }) t.Run("slice of ints", func(t *testing.T) { var dest []int32 err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest, []int32{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest, []int32{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}) }) @@ -442,7 +442,7 @@ func TestScanToSlice(t *testing.T) { var dest []int err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) }) t.Run("slice type mismatch", func(t *testing.T) { @@ -473,9 +473,9 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest.Film, film1) - assert.DeepEqual(t, dest.IDs, []int32{1, 2, 3, 4, 5, 6, 7, 8}) + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest.Film, film1) + testutils.AssertDeepEqual(t, dest.IDs, []int32{1, 2, 3, 4, 5, 6, 7, 8}) }) t.Run("slice of structs with slice of ints", func(t *testing.T) { @@ -486,12 +486,12 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0].Film, film1) - assert.DeepEqual(t, dest[0].IDs, []int32{1, 2, 3, 4, 5, 6, 7, 8}) - assert.DeepEqual(t, dest[1].Film, film2) - assert.DeepEqual(t, dest[1].IDs, []int32{9, 10}) + testutils.AssertDeepEqual(t, dest[0].Film, film1) + testutils.AssertDeepEqual(t, dest[0].IDs, []int32{1, 2, 3, 4, 5, 6, 7, 8}) + testutils.AssertDeepEqual(t, dest[1].Film, film2) + testutils.AssertDeepEqual(t, dest[1].IDs, []int32{9, 10}) }) t.Run("slice of structs with slice of pointer to ints", func(t *testing.T) { @@ -502,13 +502,13 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0].Film, film1) - assert.DeepEqual(t, dest[0].IDs, []*int32{Int32Ptr(1), Int32Ptr(2), Int32Ptr(3), Int32Ptr(4), + testutils.AssertDeepEqual(t, dest[0].Film, film1) + testutils.AssertDeepEqual(t, dest[0].IDs, []*int32{Int32Ptr(1), Int32Ptr(2), Int32Ptr(3), Int32Ptr(4), Int32Ptr(5), Int32Ptr(6), Int32Ptr(7), Int32Ptr(8)}) - assert.DeepEqual(t, dest[1].Film, film2) - assert.DeepEqual(t, dest[1].IDs, []*int32{Int32Ptr(9), Int32Ptr(10)}) + testutils.AssertDeepEqual(t, dest[1].Film, film2) + testutils.AssertDeepEqual(t, dest[1].IDs, []*int32{Int32Ptr(9), Int32Ptr(10)}) }) t.Run("complex struct 1", func(t *testing.T) { @@ -520,13 +520,13 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) - assert.DeepEqual(t, dest[0].Inventory, inventory1) - assert.DeepEqual(t, dest[0].Film, film1) - assert.DeepEqual(t, dest[0].Store, store1) + testutils.AssertDeepEqual(t, dest[0].Inventory, inventory1) + testutils.AssertDeepEqual(t, dest[0].Film, film1) + testutils.AssertDeepEqual(t, dest[0].Store, store1) - assert.DeepEqual(t, dest[1].Inventory, inventory2) + testutils.AssertDeepEqual(t, dest[1].Inventory, inventory2) }) t.Run("complex struct 2", func(t *testing.T) { @@ -538,13 +538,13 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) - assert.DeepEqual(t, dest[0].Inventory, &inventory1) - assert.DeepEqual(t, dest[0].Film, film1) - assert.DeepEqual(t, dest[0].Store, &store1) + testutils.AssertDeepEqual(t, dest[0].Inventory, &inventory1) + testutils.AssertDeepEqual(t, dest[0].Film, film1) + testutils.AssertDeepEqual(t, dest[0].Store, &store1) - assert.DeepEqual(t, dest[1].Inventory, &inventory2) + testutils.AssertDeepEqual(t, dest[1].Inventory, &inventory2) }) t.Run("complex struct 3", func(t *testing.T) { @@ -558,13 +558,13 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) - assert.DeepEqual(t, dest[0].Inventory, inventory1) - assert.DeepEqual(t, dest[0].Film, &film1) - assert.DeepEqual(t, dest[0].Store.Store, &store1) + testutils.AssertDeepEqual(t, dest[0].Inventory, inventory1) + testutils.AssertDeepEqual(t, dest[0].Film, &film1) + testutils.AssertDeepEqual(t, dest[0].Store.Store, &store1) - assert.DeepEqual(t, dest[1].Inventory, inventory2) + testutils.AssertDeepEqual(t, dest[1].Inventory, inventory2) }) t.Run("complex struct 4", func(t *testing.T) { @@ -579,12 +579,12 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0].Film, film1) - assert.DeepEqual(t, len(dest[0].Inventories), 8) - assert.DeepEqual(t, dest[0].Inventories[0].Inventory, inventory1) - assert.DeepEqual(t, dest[0].Inventories[0].Store, store1) + testutils.AssertDeepEqual(t, dest[0].Film, film1) + testutils.AssertDeepEqual(t, len(dest[0].Inventories), 8) + testutils.AssertDeepEqual(t, dest[0].Inventories[0].Inventory, inventory1) + testutils.AssertDeepEqual(t, dest[0].Inventories[0].Store, store1) }) t.Run("complex struct 5", func(t *testing.T) { @@ -601,14 +601,14 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) - assert.DeepEqual(t, dest[0].Film, film1) + testutils.AssertDeepEqual(t, dest[0].Film, film1) assert.Equal(t, len(dest[0].Inventories), 8) - assert.DeepEqual(t, dest[0].Inventories[0].Inventory, inventory1) - assert.Assert(t, dest[0].Inventories[0].Rentals == nil) - assert.Assert(t, dest[0].Inventories[0].Rentals2 == nil) + testutils.AssertDeepEqual(t, dest[0].Inventories[0].Inventory, inventory1) + assert.True(t, dest[0].Inventories[0].Rentals == nil) + assert.True(t, dest[0].Inventories[0].Rentals2 == nil) }) }) @@ -638,16 +638,16 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 108) - assert.DeepEqual(t, dest[100].Country, countryUk) + testutils.AssertDeepEqual(t, dest[100].Country, countryUk) assert.Equal(t, len(dest[100].Cities), 8) - assert.DeepEqual(t, dest[100].Cities[2].City, cityLondon) + testutils.AssertDeepEqual(t, dest[100].Cities[2].City, cityLondon) assert.Equal(t, len(dest[100].Cities[2].Adresses), 2) - assert.DeepEqual(t, dest[100].Cities[2].Adresses[0].Address, address256) - assert.DeepEqual(t, dest[100].Cities[2].Adresses[0].Customer, customer256) - assert.DeepEqual(t, dest[100].Cities[2].Adresses[1].Address, addres517) - assert.DeepEqual(t, dest[100].Cities[2].Adresses[1].Customer, customer512) + testutils.AssertDeepEqual(t, dest[100].Cities[2].Adresses[0].Address, address256) + testutils.AssertDeepEqual(t, dest[100].Cities[2].Adresses[0].Customer, customer256) + testutils.AssertDeepEqual(t, dest[100].Cities[2].Adresses[1].Address, addres517) + testutils.AssertDeepEqual(t, dest[100].Cities[2].Adresses[1].Customer, customer512) }) t.Run("dest1", func(t *testing.T) { @@ -667,16 +667,16 @@ func TestScanToSlice(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 108) - assert.DeepEqual(t, dest[100].Country, &countryUk) + testutils.AssertDeepEqual(t, dest[100].Country, &countryUk) assert.Equal(t, len(dest[100].Cities), 8) - assert.DeepEqual(t, dest[100].Cities[2].City, &cityLondon) + testutils.AssertDeepEqual(t, dest[100].Cities[2].City, &cityLondon) assert.Equal(t, len(*dest[100].Cities[2].Adresses), 2) - assert.DeepEqual(t, (*dest[100].Cities[2].Adresses)[0].Address, &address256) - assert.DeepEqual(t, (*dest[100].Cities[2].Adresses)[0].Customer, &customer256) - assert.DeepEqual(t, (*dest[100].Cities[2].Adresses)[1].Address, &addres517) - assert.DeepEqual(t, (*dest[100].Cities[2].Adresses)[1].Customer, &customer512) + testutils.AssertDeepEqual(t, (*dest[100].Cities[2].Adresses)[0].Address, &address256) + testutils.AssertDeepEqual(t, (*dest[100].Cities[2].Adresses)[0].Customer, &customer256) + testutils.AssertDeepEqual(t, (*dest[100].Cities[2].Adresses)[1].Address, &addres517) + testutils.AssertDeepEqual(t, (*dest[100].Cities[2].Adresses)[1].Customer, &customer512) }) }) @@ -716,8 +716,8 @@ func TestStructScanAllNull(t *testing.T) { err := query.Query(db, &dest) - assert.NilError(t, err) - assert.DeepEqual(t, dest, struct { + assert.NoError(t, err) + testutils.AssertDeepEqual(t, dest, struct { Null1 *int Null2 *int }{}) diff --git a/tests/postgres/select_test.go b/tests/postgres/select_test.go index 35ba373..d354360 100644 --- a/tests/postgres/select_test.go +++ b/tests/postgres/select_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/view" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -33,7 +33,7 @@ WHERE actor.actor_id = 2; actor := model.Actor{} err := query.Query(db, &actor) - assert.NilError(t, err) + assert.NoError(t, err) expectedActor := model.Actor{ ActorID: 2, @@ -42,7 +42,7 @@ WHERE actor.actor_id = 2; LastUpdate: *testutils.TimestampWithoutTimeZone("2013-05-26 14:47:57.62", 2), } - assert.DeepEqual(t, actor, expectedActor) + testutils.AssertDeepEqual(t, actor, expectedActor) } func TestClassicSelect(t *testing.T) { @@ -84,7 +84,7 @@ LIMIT 30; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 30) } @@ -110,13 +110,13 @@ ORDER BY customer.customer_id ASC; testutils.AssertDebugStatementSql(t, query, expectedSQL) err := query.Query(db, &customers) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(customers), 599) - assert.DeepEqual(t, customer0, customers[0]) - assert.DeepEqual(t, customer1, customers[1]) - assert.DeepEqual(t, lastCustomer, customers[598]) + testutils.AssertDeepEqual(t, customer0, customers[0]) + testutils.AssertDeepEqual(t, customer1, customers[1]) + testutils.AssertDeepEqual(t, lastCustomer, customers[598]) } func TestSelectAndUnionInProjection(t *testing.T) { @@ -164,7 +164,7 @@ LIMIT 12; dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestJoinQueryStruct(t *testing.T) { @@ -253,7 +253,7 @@ LIMIT 1000; err := query.Query(db, &languageActorFilm) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(languageActorFilm), 1) assert.Equal(t, len(languageActorFilm[0].Films), 10) assert.Equal(t, len(languageActorFilm[0].Films[0].Actors), 10) @@ -302,7 +302,7 @@ LIMIT 15; err := query.Query(db, &filmsPerLanguage) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(filmsPerLanguage), 1) assert.Equal(t, len(filmsPerLanguage[0].Film), limit) @@ -313,7 +313,7 @@ LIMIT 15; filmsPerLanguageWithPtrs := []*FilmsPerLanguage{} err = query.Query(db, &filmsPerLanguageWithPtrs) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(filmsPerLanguage), 1) assert.Equal(t, len(filmsPerLanguage[0].Film), limit) } @@ -359,7 +359,7 @@ ORDER BY city.city_id, address.address_id, customer.customer_id; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) assert.Equal(t, dest[0].City.City, "London") @@ -423,7 +423,7 @@ ORDER BY city.city_id, address.address_id, customer.customer_id; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) assert.Equal(t, dest[0].Name, "London") @@ -481,7 +481,7 @@ ORDER BY city.city_id, address.address_id, customer.customer_id; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) assert.Equal(t, dest[0].CityName, "London") @@ -538,7 +538,7 @@ ORDER BY city.city_id, address.address_id, customer.customer_id; err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 2) testutils.AssertJSON(t, dest, ` [ @@ -597,7 +597,7 @@ func TestJoinQuerySliceWithPtrs(t *testing.T) { filmsPerLanguageWithPtrs := []*FilmsPerLanguage{} err := query.Query(db, &filmsPerLanguageWithPtrs) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(filmsPerLanguageWithPtrs), 1) assert.Equal(t, len(*filmsPerLanguageWithPtrs[0].Film), int(limit)) } @@ -609,7 +609,7 @@ func TestSelect_WithoutUniqueColumnSelected(t *testing.T) { err := query.Query(db, &customers) - assert.NilError(t, err) + assert.NoError(t, err) //spew.Dump(customers) @@ -623,7 +623,7 @@ func TestSelectOrderByAscDesc(t *testing.T) { ORDER_BY(Customer.FirstName.ASC()). Query(db, &customersAsc) - assert.NilError(t, err) + assert.NoError(t, err) firstCustomerAsc := customersAsc[0] lastCustomerAsc := customersAsc[len(customersAsc)-1] @@ -633,20 +633,20 @@ func TestSelectOrderByAscDesc(t *testing.T) { ORDER_BY(Customer.FirstName.DESC()). Query(db, &customersDesc) - assert.NilError(t, err) + assert.NoError(t, err) firstCustomerDesc := customersDesc[0] lastCustomerDesc := customersDesc[len(customersAsc)-1] - assert.DeepEqual(t, firstCustomerAsc, lastCustomerDesc) - assert.DeepEqual(t, lastCustomerAsc, firstCustomerDesc) + testutils.AssertDeepEqual(t, firstCustomerAsc, lastCustomerDesc) + testutils.AssertDeepEqual(t, lastCustomerAsc, firstCustomerDesc) customersAscDesc := []model.Customer{} err = Customer.SELECT(Customer.CustomerID, Customer.FirstName, Customer.LastName). ORDER_BY(Customer.FirstName.ASC(), Customer.LastName.DESC()). Query(db, &customersAscDesc) - assert.NilError(t, err) + assert.NoError(t, err) customerAscDesc326 := model.Customer{ CustomerID: 67, @@ -660,8 +660,8 @@ func TestSelectOrderByAscDesc(t *testing.T) { LastName: "Knott", } - assert.DeepEqual(t, customerAscDesc326, customersAscDesc[326]) - assert.DeepEqual(t, customerAscDesc327, customersAscDesc[327]) + testutils.AssertDeepEqual(t, customerAscDesc326, customersAscDesc[326]) + testutils.AssertDeepEqual(t, customerAscDesc327, customersAscDesc[327]) } func TestSelectFullJoin(t *testing.T) { @@ -702,16 +702,16 @@ ORDER BY customer.customer_id ASC; err := query.Query(db, &allCustomersAndAddress) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(allCustomersAndAddress), 603) - assert.DeepEqual(t, allCustomersAndAddress[0].Customer, &customer0) - assert.Assert(t, allCustomersAndAddress[0].Address != nil) + testutils.AssertDeepEqual(t, allCustomersAndAddress[0].Customer, &customer0) + assert.True(t, allCustomersAndAddress[0].Address != nil) lastCustomerAddress := allCustomersAndAddress[len(allCustomersAndAddress)-1] - assert.Assert(t, lastCustomerAddress.Customer == nil) - assert.Assert(t, lastCustomerAddress.Address != nil) + assert.True(t, lastCustomerAddress.Customer == nil) + assert.True(t, lastCustomerAddress.Address != nil) } @@ -757,7 +757,7 @@ LIMIT 1000; assert.Equal(t, len(customerAddresCrosJoined), 1000) - assert.NilError(t, err) + assert.NoError(t, err) } func TestSelectSelfJoin(t *testing.T) { @@ -813,7 +813,7 @@ ORDER BY f1.film_id ASC; err := query.Query(db, &theSameLengthFilms) - assert.NilError(t, err) + assert.NoError(t, err) //spew.Dump(theSameLengthFilms) @@ -854,12 +854,12 @@ LIMIT 1000; err := query.Query(db, &films) - assert.NilError(t, err) + assert.NoError(t, err) //spew.Dump(films) assert.Equal(t, len(films), 1000) - assert.DeepEqual(t, films[0], thesameLengthFilms{"Alien Center", "Iron Moon", 46}) + testutils.AssertDeepEqual(t, films[0], thesameLengthFilms{"Alien Center", "Iron Moon", 46}) } func TestSubQuery(t *testing.T) { @@ -911,7 +911,7 @@ FROM dvds.actor err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestSelectFunctions(t *testing.T) { @@ -931,7 +931,7 @@ FROM dvds.film; err := query.Query(db, &ret) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, ret.MaxFilmRate, 4.99) } @@ -973,13 +973,13 @@ ORDER BY film.film_id ASC; maxRentalRateFilms := []model.Film{} err := query.Query(db, &maxRentalRateFilms) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(maxRentalRateFilms), 336) gRating := model.MpaaRating_G - assert.DeepEqual(t, maxRentalRateFilms[0], model.Film{ + testutils.AssertDeepEqual(t, maxRentalRateFilms[0], model.Film{ FilmID: 2, Title: "Ace Goldfinger", Description: StringPtr("A Astounding Epistle of a Database Administrator And a Explorer who must Find a Car in Ancient China"), @@ -1060,7 +1060,7 @@ ORDER BY customer.customer_id, SUM(payment.amount) ASC; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //testutils.PrintJson(dest) @@ -1121,10 +1121,10 @@ ORDER BY customer_payment_sum."amount_sum" ASC; customersWithAmounts := []CustomerWithAmounts{} err := query.Query(db, &customersWithAmounts) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(customersWithAmounts), 599) - assert.DeepEqual(t, customersWithAmounts[0].Customer, &model.Customer{ + testutils.AssertDeepEqual(t, customersWithAmounts[0].Customer, &model.Customer{ CustomerID: 318, StoreID: 1, FirstName: "Brian", @@ -1145,7 +1145,7 @@ func TestSelectStaff(t *testing.T) { err := Staff.SELECT(Staff.AllColumns).Query(db, &staffs) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSON(t, staffs, ` [ @@ -1203,12 +1203,12 @@ ORDER BY payment.payment_date ASC; err := query.Query(db, &payments) - assert.NilError(t, err) + assert.NoError(t, err) //spew.Dump(payments) assert.Equal(t, len(payments), 9) - assert.DeepEqual(t, payments[0], model.Payment{ + testutils.AssertDeepEqual(t, payments[0], model.Payment{ PaymentID: 17793, CustomerID: 416, StaffID: 2, @@ -1257,17 +1257,17 @@ OFFSET 20; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) - assert.DeepEqual(t, dest[0], model.Payment{ + testutils.AssertDeepEqual(t, dest[0], model.Payment{ PaymentID: 17523, Amount: 4.99, }) - assert.DeepEqual(t, dest[1], model.Payment{ + testutils.AssertDeepEqual(t, dest[1], model.Payment{ PaymentID: 17524, Amount: 0.99, }) - assert.DeepEqual(t, dest[9], model.Payment{ + testutils.AssertDeepEqual(t, dest[9], model.Payment{ PaymentID: 17532, Amount: 8.99, }) @@ -1283,7 +1283,7 @@ func TestAllSetOperators(t *testing.T) { dest := []model.Payment{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 20) }) @@ -1293,7 +1293,7 @@ func TestAllSetOperators(t *testing.T) { dest := []model.Payment{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 20) }) @@ -1303,7 +1303,7 @@ func TestAllSetOperators(t *testing.T) { dest := []model.Payment{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 0) }) @@ -1313,7 +1313,7 @@ func TestAllSetOperators(t *testing.T) { dest := []model.Payment{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 0) }) @@ -1323,7 +1323,7 @@ func TestAllSetOperators(t *testing.T) { dest := []model.Payment{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) }) @@ -1333,7 +1333,7 @@ func TestAllSetOperators(t *testing.T) { dest := []model.Payment{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 10) }) } @@ -1363,7 +1363,7 @@ LIMIT 20; err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(dest), 20) assert.Equal(t, dest[0].StaffIDNum, "TWO") assert.Equal(t, dest[1].StaffIDNum, "ONE") @@ -1396,12 +1396,12 @@ FOR` tx, _ := db.Begin() res, err := query.Exec(tx) - assert.NilError(t, err) + assert.NoError(t, err) rowsAffected, _ := res.RowsAffected() assert.Equal(t, rowsAffected, int64(3)) err = tx.Rollback() - assert.NilError(t, err) + assert.NoError(t, err) } for lockType, lockTypeStr := range getRowLockTestData() { @@ -1412,12 +1412,12 @@ FOR` tx, _ := db.Begin() res, err := query.Exec(tx) - assert.NilError(t, err) + assert.NoError(t, err) rowsAffected, _ := res.RowsAffected() assert.Equal(t, rowsAffected, int64(3)) err = tx.Rollback() - assert.NilError(t, err) + assert.NoError(t, err) } for lockType, lockTypeStr := range getRowLockTestData() { @@ -1428,12 +1428,12 @@ FOR` tx, _ := db.Begin() res, err := query.Exec(tx) - assert.NilError(t, err) + assert.NoError(t, err) rowsAffected, _ := res.RowsAffected() assert.Equal(t, rowsAffected, int64(3)) err = tx.Rollback() - assert.NilError(t, err) + assert.NoError(t, err) } } @@ -1509,7 +1509,7 @@ ORDER BY actor.actor_id ASC, film.film_id ASC; } err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //jsonSave("./testdata/quick-start-dest.json", dest) testutils.AssertJSONFile(t, dest, "./testdata/results/postgres/quick-start-dest.json") @@ -1522,7 +1522,7 @@ ORDER BY actor.actor_id ASC, film.film_id ASC; } err = stmt.Query(db, &dest2) - assert.NilError(t, err) + assert.NoError(t, err) //jsonSave("./testdata/quick-start-dest2.json", dest2) testutils.AssertJSONFile(t, dest2, "./testdata/results/postgres/quick-start-dest2.json") @@ -1574,7 +1574,7 @@ func TestQuickStartWithSubQueries(t *testing.T) { } err := stmt.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) //jsonSave("./testdata/quick-start-dest.json", dest) testutils.AssertJSONFile(t, dest, "./testdata/results/postgres/quick-start-dest.json") @@ -1587,7 +1587,7 @@ func TestQuickStartWithSubQueries(t *testing.T) { } err = stmt.Query(db, &dest2) - assert.NilError(t, err) + assert.NoError(t, err) //jsonSave("./testdata/quick-start-dest2.json", dest2) testutils.AssertJSONFile(t, dest2, "./testdata/results/postgres/quick-start-dest2.json") @@ -1620,7 +1620,7 @@ SELECT true, dest := []struct{}{} err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) } func TestWindowFunction(t *testing.T) { @@ -1692,7 +1692,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) { @@ -1729,7 +1729,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) { @@ -1751,7 +1751,7 @@ func TestSimpleView(t *testing.T) { var dest []ActorInfo err := query.Query(db, &dest) - assert.NilError(t, err) + assert.NoError(t, err) testutils.AssertJSON(t, dest[1:2], ` [ @@ -1785,7 +1785,7 @@ func TestJoinViewWithTable(t *testing.T) { fmt.Println(query.DebugSql()) 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) @@ -1820,7 +1820,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) } diff --git a/tests/postgres/update_test.go b/tests/postgres/update_test.go index e3366de..57f579e 100644 --- a/tests/postgres/update_test.go +++ b/tests/postgres/update_test.go @@ -6,7 +6,7 @@ import ( . "github.com/go-jet/jet/postgres" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" "time" ) @@ -35,9 +35,9 @@ WHERE link.name = 'Bing'; WHERE(Link.Name.EQ(String("Bong"))). Query(db, &links) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(links), 1) - assert.DeepEqual(t, links[0], model.Link{ + testutils.AssertDeepEqual(t, links[0], model.Link{ ID: 204, URL: "http://bong.com", Name: "Bong", @@ -99,7 +99,7 @@ RETURNING link.id AS "link.id", err := stmt.Query(db, &links) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, len(links), 2) assert.Equal(t, links[0].Name, "DuckDuckGo") assert.Equal(t, links[1].Name, "DuckDuckGo") @@ -293,10 +293,10 @@ func setupLinkTableForUpdateTest(t *testing.T) { VALUES(204, "http://www.bing.com", "Bing", DEFAULT). Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } func cleanUpLinkTable(t *testing.T) { _, err := Link.DELETE().WHERE(Link.ID.GT(Int(0))).Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) } diff --git a/tests/postgres/util_test.go b/tests/postgres/util_test.go index 3f00e7b..e7a7816 100644 --- a/tests/postgres/util_test.go +++ b/tests/postgres/util_test.go @@ -5,16 +5,16 @@ import ( "github.com/go-jet/jet/internal/testutils" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model" "github.com/google/uuid" - "gotest.tools/assert" + "github.com/stretchr/testify/assert" "testing" ) func AssertExec(t *testing.T, stmt jet.Statement, rowsAffected int64) { res, err := stmt.Exec(db) - assert.NilError(t, err) + assert.NoError(t, err) rows, err := res.RowsAffected() - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, rows, rowsAffected) }