From a1b97b1e9a5dc81979a37b03cd2b999c22f52e19 Mon Sep 17 00:00:00 2001 From: Jadson Medeiros Date: Tue, 5 Jul 2022 21:43:56 -0300 Subject: [PATCH 1/4] changed the test lib reference --- benchmarks/go.sum | 11 +- go.mod | 1 + go.sum | 29 ++++ kbuilder/insert_test.go | 8 +- kbuilder/query_test.go | 8 +- ksql_test.go | 6 +- ksqltest/testhelpers_test.go | 64 ++++----- kstructs/testhelpers_test.go | 64 ++++----- test_adapters.go | 268 +++++++++++++++++------------------ 9 files changed, 249 insertions(+), 210 deletions(-) diff --git a/benchmarks/go.sum b/benchmarks/go.sum index df7143f..1fc356d 100644 --- a/benchmarks/go.sum +++ b/benchmarks/go.sum @@ -70,6 +70,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= @@ -247,6 +248,7 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -277,6 +279,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -286,14 +289,16 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -312,6 +317,8 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -337,7 +344,9 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/go.mod b/go.mod index 36516fd..489e946 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.14 require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/ditointernet/go-assert v0.0.0-20200120164340-9e13125a7018 + github.com/golang/mock v1.6.0 // indirect github.com/kr/pretty v0.2.1 // indirect github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 13e6c09..2483e35 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditointernet/go-assert v0.0.0-20200120164340-9e13125a7018 h1:QsFkVafcKOaZoAB4WcyUHdkPbwh+VYwZgYJb/rU6EIM= github.com/ditointernet/go-assert v0.0.0-20200120164340-9e13125a7018/go.mod h1:5C3SWkut69TSdkerzRDxXMRM5x73PGWNcRLe/xKjXhs= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -17,6 +19,33 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/kbuilder/insert_test.go b/kbuilder/insert_test.go index 88b6058..c053e3b 100644 --- a/kbuilder/insert_test.go +++ b/kbuilder/insert_test.go @@ -3,7 +3,7 @@ package kbuilder_test import ( "testing" - "github.com/ditointernet/go-assert" + tt "github.com/vingarcia/ksql/internal/testtools" "github.com/vingarcia/ksql/kbuilder" ) @@ -80,13 +80,13 @@ func TestInsertQuery(t *testing.T) { for _, test := range tests { t.Run(test.desc, func(t *testing.T) { b, err := kbuilder.New("postgres") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) query, params, err := b.Build(test.query) expectError(t, test.expectedErr, err) - assert.Equal(t, test.expectedQuery, query) - assert.Equal(t, test.expectedParams, params) + tt.AssertEqual(t, query, test.expectedQuery) + tt.AssertEqual(t, params, test.expectedParams) }) } } diff --git a/kbuilder/query_test.go b/kbuilder/query_test.go index d1eec32..4573f63 100644 --- a/kbuilder/query_test.go +++ b/kbuilder/query_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/ditointernet/go-assert" "github.com/stretchr/testify/require" + tt "github.com/vingarcia/ksql/internal/testtools" "github.com/vingarcia/ksql/kbuilder" ) @@ -124,13 +124,13 @@ func TestSelectQuery(t *testing.T) { for _, test := range tests { t.Run(test.desc, func(t *testing.T) { b, err := kbuilder.New("postgres") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) query, params, err := b.Build(test.query) expectError(t, test.expectedErr, err) - assert.Equal(t, test.expectedQuery, query) - assert.Equal(t, test.expectedParams, params) + tt.AssertEqual(t, query, test.expectedQuery) + tt.AssertEqual(t, params, test.expectedParams) }) } } diff --git a/ksql_test.go b/ksql_test.go index d1e8bbf..3208e91 100644 --- a/ksql_test.go +++ b/ksql_test.go @@ -25,9 +25,9 @@ func TestNewAdapterWith(t *testing.T) { dialectName, ) - assert.Equal(t, nil, err) - assert.Equal(t, supportedDialects[dialectName], db.dialect) - assert.Equal(t, dialectName, db.driver) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, db.dialect, supportedDialects[dialectName]) + tt.AssertEqual(t, db.driver, dialectName) } }) diff --git a/ksqltest/testhelpers_test.go b/ksqltest/testhelpers_test.go index 6dda318..da3e666 100644 --- a/ksqltest/testhelpers_test.go +++ b/ksqltest/testhelpers_test.go @@ -20,11 +20,11 @@ func TestStructToMap(t *testing.T) { Age: 22, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "my name", "age_attr": 22, - }, m) + }) }) t.Run("should not ignore zero value attrs, if they are not pointers", func(t *testing.T) { @@ -33,11 +33,11 @@ func TestStructToMap(t *testing.T) { Age: 0, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "", "age_attr": 0, - }, m) + }) }) type S2 struct { @@ -53,11 +53,11 @@ func TestStructToMap(t *testing.T) { Age: &age, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name": "", "age": 0, - }, m) + }) }) t.Run("should ignore nil pointers", func(t *testing.T) { @@ -66,8 +66,8 @@ func TestStructToMap(t *testing.T) { Age: nil, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{}, m) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{}) }) t.Run("should ignore fields not tagged with ksql", func(t *testing.T) { @@ -81,11 +81,11 @@ func TestStructToMap(t *testing.T) { NotPartOfTheQuery: 42, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "fake-name", "age_attr": 42, - }, m) + }) }) t.Run("should return error for duplicated ksql tag names", func(t *testing.T) { @@ -126,9 +126,9 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - assert.Equal(t, nil, err) - assert.Equal(t, "Breno", user.Name) - assert.Equal(t, 22, user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, "Breno") + tt.AssertEqual(t, user.Age, 22) }) t.Run("should fill ptr fields with ptr values", func(t *testing.T) { @@ -141,9 +141,9 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - assert.Equal(t, nil, err) - assert.Equal(t, nullable.String("Breno"), user.Name) - assert.Equal(t, nullable.Int(22), user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, nullable.String("Breno")) + tt.AssertEqual(t, user.Age, nullable.Int(22)) }) t.Run("should fill ptr fields with non-ptr values", func(t *testing.T) { @@ -156,9 +156,9 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - assert.Equal(t, nil, err) - assert.Equal(t, nullable.String("Breno"), user.Name) - assert.Equal(t, nullable.Int(22), user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, nullable.String("Breno")) + tt.AssertEqual(t, user.Age, nullable.Int(22)) }) t.Run("should fill non ptr fields with ptr values", func(t *testing.T) { @@ -171,9 +171,9 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - assert.Equal(t, nil, err) - assert.Equal(t, "Breno", user.Name) - assert.Equal(t, 22, user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, "Breno") + tt.AssertEqual(t, user.Age, 22) }) t.Run("should fill ptr fields with nil when necessary", func(t *testing.T) { @@ -186,9 +186,9 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - assert.Equal(t, nil, err) - assert.Equal(t, (*string)(nil), user.Name) - assert.Equal(t, (*int)(nil), user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, (*string)(nil)) + tt.AssertEqual(t, user.Age, (*int)(nil)) }) t.Run("should interpret nil fields as zero values when necessary", func(t *testing.T) { @@ -204,9 +204,9 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - assert.Equal(t, nil, err) - assert.Equal(t, "", user.Name) - assert.Equal(t, 0, user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, "") + tt.AssertEqual(t, user.Age, 0) }) t.Run("should ignore extra or missing fields", func(t *testing.T) { diff --git a/kstructs/testhelpers_test.go b/kstructs/testhelpers_test.go index 92f12bf..2b1c109 100644 --- a/kstructs/testhelpers_test.go +++ b/kstructs/testhelpers_test.go @@ -20,11 +20,11 @@ func TestStructToMap(t *testing.T) { Age: 22, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "my name", "age_attr": 22, - }, m) + }) }) t.Run("should not ignore zero value attrs, if they are not pointers", func(t *testing.T) { @@ -33,11 +33,11 @@ func TestStructToMap(t *testing.T) { Age: 0, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "", "age_attr": 0, - }, m) + }) }) type S2 struct { @@ -53,11 +53,11 @@ func TestStructToMap(t *testing.T) { Age: &age, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name": "", "age": 0, - }, m) + }) }) t.Run("should ignore nil pointers", func(t *testing.T) { @@ -66,8 +66,8 @@ func TestStructToMap(t *testing.T) { Age: nil, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{}, m) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{}) }) t.Run("should ignore fields not tagged with ksql", func(t *testing.T) { @@ -81,11 +81,11 @@ func TestStructToMap(t *testing.T) { NotPartOfTheQuery: 42, }) - assert.Equal(t, nil, err) - assert.Equal(t, map[string]interface{}{ + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "fake-name", "age_attr": 42, - }, m) + }) }) t.Run("should return error for duplicated ksql tag names", func(t *testing.T) { @@ -126,9 +126,9 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - assert.Equal(t, nil, err) - assert.Equal(t, "Breno", user.Name) - assert.Equal(t, 22, user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, "Breno") + tt.AssertEqual(t, user.Age, 22) }) t.Run("should fill ptr fields with ptr values", func(t *testing.T) { @@ -141,9 +141,9 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - assert.Equal(t, nil, err) - assert.Equal(t, nullable.String("Breno"), user.Name) - assert.Equal(t, nullable.Int(22), user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, nullable.String("Breno")) + tt.AssertEqual(t, user.Age, nullable.Int(22)) }) t.Run("should fill ptr fields with non-ptr values", func(t *testing.T) { @@ -156,9 +156,9 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - assert.Equal(t, nil, err) - assert.Equal(t, nullable.String("Breno"), user.Name) - assert.Equal(t, nullable.Int(22), user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, nullable.String("Breno")) + tt.AssertEqual(t, user.Age, nullable.Int(22)) }) t.Run("should fill non ptr fields with ptr values", func(t *testing.T) { @@ -171,9 +171,9 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - assert.Equal(t, nil, err) - assert.Equal(t, "Breno", user.Name) - assert.Equal(t, 22, user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, "Breno") + tt.AssertEqual(t, user.Age, 22) }) t.Run("should fill ptr fields with nil when necessary", func(t *testing.T) { @@ -186,9 +186,9 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - assert.Equal(t, nil, err) - assert.Equal(t, (*string)(nil), user.Name) - assert.Equal(t, (*int)(nil), user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, (*string)(nil)) + tt.AssertEqual(t, user.Age, (*int)(nil)) }) t.Run("should interpret nil fields as zero values when necessary", func(t *testing.T) { @@ -204,9 +204,9 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - assert.Equal(t, nil, err) - assert.Equal(t, "", user.Name) - assert.Equal(t, 0, user.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, user.Name, "") + tt.AssertEqual(t, user.Age, 0) }) t.Run("should ignore extra or missing fields", func(t *testing.T) { diff --git a/test_adapters.go b/test_adapters.go index fa3b4ae..235cada 100644 --- a/test_adapters.go +++ b/test_adapters.go @@ -318,7 +318,7 @@ func QueryTest( getUserByName(db, driver, &joao, "João Ribeiro") _, err = db.ExecContext(ctx, `INSERT INTO users (name, age, address) VALUES ('Bia Ribeiro', 0, '{"country":"BR"}')`) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var bia user getUserByName(db, driver, &bia, "Bia Ribeiro") @@ -723,15 +723,15 @@ func InsertTest( } err := c.Insert(ctx, usersTable, &u) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, 0, u.ID) result := user{} err = getUserByID(c.db, c.dialect, &result, u.ID) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, u.Name, result.Name) - assert.Equal(t, u.Address, result.Address) + tt.AssertEqual(t, result.Name, u.Name) + tt.AssertEqual(t, result.Address, u.Address) }) t.Run("should insert ignoring the ID with multiple ids", func(t *testing.T) { @@ -758,15 +758,15 @@ func InsertTest( } err = c.Insert(ctx, table, &u) - assert.Equal(t, nil, err) - assert.Equal(t, uint(0), u.ID) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, u.ID, uint(0)) result := user{} err = getUserByName(c.db, driver, &result, "No ID returned") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, u.Age, result.Age) - assert.Equal(t, u.Address, result.Address) + tt.AssertEqual(t, result.Age, u.Age) + tt.AssertEqual(t, result.Address, u.Address) }) t.Run("should work with anonymous structs", func(t *testing.T) { @@ -780,7 +780,7 @@ func InsertTest( Name string `ksql:"name"` Address map[string]interface{} `ksql:"address,json"` }{Name: "fake-name", Address: map[string]interface{}{"city": "bar"}}) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) }) t.Run("should work with preset IDs", func(t *testing.T) { @@ -796,12 +796,12 @@ func InsertTest( Name string `ksql:"name"` Age int `ksql:"age"` }{Name: "Preset Name", Age: 5455}) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var inserted user err := getUserByName(db, driver, &inserted, "Preset Name") - assert.Equal(t, nil, err) - assert.Equal(t, 5455, inserted.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, inserted.Age, 5455) }) }) @@ -970,8 +970,8 @@ func InsertTest( }{NonExistingColumn: 42, Name: "fake-name"}) assert.NotEqual(t, nil, err) msg := err.Error() - assert.Equal(t, true, strings.Contains(msg, "column")) - assert.Equal(t, true, strings.Contains(msg, "non_existing")) + tt.AssertEqual(t, strings.Contains(msg, "column"), true) + tt.AssertEqual(t, strings.Contains(msg, "non_existing"), true) }) t.Run("should not panic if the ID column doesn't exist in the database", func(t *testing.T) { @@ -1001,13 +1001,13 @@ func InsertTest( Age int `ksql:"age"` Name string `ksql:"name"` }{Age: 42, Name: "Inserted With no ID"}) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var u user err = getUserByName(db, driver, &u, "Inserted With no ID") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u.ID) - assert.Equal(t, 42, u.Age) + tt.AssertEqual(t, u.Age, 42) }) }) }) @@ -1083,40 +1083,40 @@ func DeleteTest( } err := c.Insert(ctx, usersTable, &u1) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u1.ID) result := user{} err = getUserByID(c.db, c.dialect, &result, u1.ID) - assert.Equal(t, nil, err) - assert.Equal(t, u1.ID, result.ID) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, result.ID, u1.ID) u2 := user{ Name: "Won't be deleted", } err = c.Insert(ctx, usersTable, &u2) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u2.ID) result = user{} err = getUserByID(c.db, c.dialect, &result, u2.ID) - assert.Equal(t, nil, err) - assert.Equal(t, u2.ID, result.ID) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, result.ID, u2.ID) err = c.Delete(ctx, usersTable, test.deletionKeyForUser(u1)) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) result = user{} err = getUserByID(c.db, c.dialect, &result, u1.ID) - assert.Equal(t, sql.ErrNoRows, err) + tt.AssertEqual(t, err, sql.ErrNoRows) result = user{} err = getUserByID(c.db, c.dialect, &result, u2.ID) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), result.ID) - assert.Equal(t, "Won't be deleted", result.Name) + tt.AssertEqual(t, result.Name, "Won't be deleted") }) } }) @@ -1200,7 +1200,7 @@ func DeleteTest( c := newTestDB(db, driver) err = c.Delete(ctx, usersTable, 4200) - assert.Equal(t, ErrRecordNotFound, err) + tt.AssertEqual(t, err, ErrRecordNotFound) }) t.Run("should report error if it receives a nil pointer to a struct", func(t *testing.T) { @@ -1361,22 +1361,22 @@ func UpdateTest( Name: "Letícia", } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 0)`) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) err = getUserByName(db, driver, &u, "Letícia") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u.ID) err = c.Update(ctx, usersTable, user{ ID: u.ID, Name: "Thayane", }) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - assert.Equal(t, nil, err) - assert.Equal(t, "Thayane", result.Name) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, result.Name, "Thayane") }) t.Run("should update one &user{} correctly", func(t *testing.T) { @@ -1390,22 +1390,22 @@ func UpdateTest( Name: "Letícia", } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 0)`) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) err = getUserByName(db, driver, &u, "Letícia") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u.ID) err = c.Update(ctx, usersTable, &user{ ID: u.ID, Name: "Thayane", }) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - assert.Equal(t, nil, err) - assert.Equal(t, "Thayane", result.Name) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, result.Name, "Thayane") }) t.Run("should ignore null pointers on partial updates", func(t *testing.T) { @@ -1422,11 +1422,11 @@ func UpdateTest( } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 22)`) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var u user err = getUserByName(db, driver, &u, "Letícia") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u.ID) err = c.Update(ctx, usersTable, partialUser{ @@ -1436,13 +1436,13 @@ func UpdateTest( // Should not be updated because it is null: Age: nil, }) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - assert.Equal(t, nil, err) - assert.Equal(t, "", result.Name) - assert.Equal(t, 22, result.Age) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, result.Name, "") + tt.AssertEqual(t, result.Age, 22) }) t.Run("should update valid pointers on partial updates", func(t *testing.T) { @@ -1459,11 +1459,11 @@ func UpdateTest( } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 22)`) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var u user err = getUserByName(db, driver, &u, "Letícia") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) assert.NotEqual(t, uint(0), u.ID) // Should update all fields: @@ -1472,14 +1472,14 @@ func UpdateTest( Name: "Thay", Age: nullable.Int(42), }) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, "Thay", result.Name) - assert.Equal(t, 42, result.Age) + tt.AssertEqual(t, result.Name, "Thay") + tt.AssertEqual(t, result.Age, 42) }) t.Run("should return ErrRecordNotFound when asked to update an inexistent user", func(t *testing.T) { @@ -1493,7 +1493,7 @@ func UpdateTest( ID: 4200, Name: "Thayane", }) - assert.Equal(t, ErrRecordNotFound, err) + tt.AssertEqual(t, err, ErrRecordNotFound) }) t.Run("should report database errors correctly", func(t *testing.T) { @@ -1581,11 +1581,11 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 1, length) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, length, 1) assert.NotEqual(t, uint(0), u.ID) - assert.Equal(t, "User1", u.Name) - assert.Equal(t, "BR", u.Address.Country) + tt.AssertEqual(t, u.Name, "User1") + tt.AssertEqual(t, u.Address.Country, "BR") }) t.Run("should query one chunk correctly", func(t *testing.T) { @@ -1617,17 +1617,17 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 1, len(lengths)) - assert.Equal(t, 2, lengths[0]) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, len(lengths), 1) + tt.AssertEqual(t, lengths[0], 2) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) - assert.Equal(t, "US", users[0].Address.Country) + tt.AssertEqual(t, users[0].Name, "User1") + tt.AssertEqual(t, users[0].Address.Country, "US") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) - assert.Equal(t, "BR", users[1].Address.Country) + tt.AssertEqual(t, users[1].Name, "User2") + tt.AssertEqual(t, users[1].Address.Country, "BR") }) t.Run("should query chunks of 1 correctly", func(t *testing.T) { @@ -1659,17 +1659,17 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 2, len(users)) - assert.Equal(t, []int{1, 1}, lengths) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, len(users), 2) + tt.AssertEqual(t, lengths, []int{1, 1}) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) - assert.Equal(t, "US", users[0].Address.Country) + tt.AssertEqual(t, users[0].Name, "User1") + tt.AssertEqual(t, users[0].Address.Country, "US") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) - assert.Equal(t, "BR", users[1].Address.Country) + tt.AssertEqual(t, users[1].Name, "User2") + tt.AssertEqual(t, users[1].Address.Country, "BR") }) t.Run("should load partially filled chunks correctly", func(t *testing.T) { @@ -1702,15 +1702,15 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 3, len(users)) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, len(users), 3) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) + tt.AssertEqual(t, users[0].Name, "User1") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) + tt.AssertEqual(t, users[1].Name, "User2") assert.NotEqual(t, uint(0), users[2].ID) - assert.Equal(t, "User3", users[2].Name) - assert.Equal(t, []int{2, 1}, lengths) + tt.AssertEqual(t, users[2].Name, "User3") + tt.AssertEqual(t, lengths, []int{2, 1}) }) // xxx @@ -1738,11 +1738,11 @@ func QueryChunksTest( _ = c.Insert(ctx, usersTable, &thatiana) _, err := db.ExecContext(ctx, fmt.Sprint(`INSERT INTO posts (user_id, title) VALUES (`, thatiana.ID, `, 'Thatiana Post1')`)) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) _, err = db.ExecContext(ctx, fmt.Sprint(`INSERT INTO posts (user_id, title) VALUES (`, thatiana.ID, `, 'Thatiana Post2')`)) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) _, err = db.ExecContext(ctx, fmt.Sprint(`INSERT INTO posts (user_id, title) VALUES (`, joao.ID, `, 'Thiago Post1')`)) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var lengths []int var users []user @@ -1769,20 +1769,20 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 3, len(posts)) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, len(posts), 3) - assert.Equal(t, joao.ID, users[0].ID) - assert.Equal(t, "Thiago Ribeiro", users[0].Name) - assert.Equal(t, "Thiago Post1", posts[0].Title) + tt.AssertEqual(t, users[0].ID, joao.ID) + tt.AssertEqual(t, users[0].Name, "Thiago Ribeiro") + tt.AssertEqual(t, posts[0].Title, "Thiago Post1") - assert.Equal(t, thatiana.ID, users[1].ID) - assert.Equal(t, "Thatiana Ribeiro", users[1].Name) - assert.Equal(t, "Thatiana Post1", posts[1].Title) + tt.AssertEqual(t, users[1].ID, thatiana.ID) + tt.AssertEqual(t, users[1].Name, "Thatiana Ribeiro") + tt.AssertEqual(t, posts[1].Title, "Thatiana Post1") - assert.Equal(t, thatiana.ID, users[2].ID) - assert.Equal(t, "Thatiana Ribeiro", users[2].Name) - assert.Equal(t, "Thatiana Post2", posts[2].Title) + tt.AssertEqual(t, users[2].ID, thatiana.ID) + tt.AssertEqual(t, users[2].Name, "Thatiana Ribeiro") + tt.AssertEqual(t, posts[2].Title, "Thatiana Post2") }) t.Run("should abort the first iteration when the callback returns an ErrAbortIteration", func(t *testing.T) { @@ -1815,13 +1815,13 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 2, len(users)) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, len(users), 2) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) + tt.AssertEqual(t, users[0].Name, "User1") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) - assert.Equal(t, []int{2}, lengths) + tt.AssertEqual(t, users[1].Name, "User2") + tt.AssertEqual(t, lengths, []int{2}) }) t.Run("should abort the last iteration when the callback returns an ErrAbortIteration", func(t *testing.T) { @@ -1856,15 +1856,15 @@ func QueryChunksTest( }, }) - assert.Equal(t, nil, err) - assert.Equal(t, 3, len(users)) + tt.AssertEqual(t, err, nil) + tt.AssertEqual(t, len(users), 3) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) + tt.AssertEqual(t, users[0].Name, "User1") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) + tt.AssertEqual(t, users[1].Name, "User2") assert.NotEqual(t, uint(0), users[2].ID) - assert.Equal(t, "User3", users[2].Name) - assert.Equal(t, []int{2, 1}, lengths) + tt.AssertEqual(t, users[2].Name, "User3") + tt.AssertEqual(t, lengths, []int{2, 1}) }) t.Run("should return error if the callback returns an error in the first iteration", func(t *testing.T) { @@ -1898,12 +1898,12 @@ func QueryChunksTest( }) assert.NotEqual(t, nil, err) - assert.Equal(t, 2, len(users)) + tt.AssertEqual(t, len(users), 2) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) + tt.AssertEqual(t, users[0].Name, "User1") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) - assert.Equal(t, []int{2}, lengths) + tt.AssertEqual(t, users[1].Name, "User2") + tt.AssertEqual(t, lengths, []int{2}) }) t.Run("should return error if the callback returns an error in the last iteration", func(t *testing.T) { @@ -1939,14 +1939,14 @@ func QueryChunksTest( }) assert.NotEqual(t, nil, err) - assert.Equal(t, 3, len(users)) + tt.AssertEqual(t, len(users), 3) assert.NotEqual(t, uint(0), users[0].ID) - assert.Equal(t, "User1", users[0].Name) + tt.AssertEqual(t, users[0].Name, "User1") assert.NotEqual(t, uint(0), users[1].ID) - assert.Equal(t, "User2", users[1].Name) + tt.AssertEqual(t, users[1].Name, "User2") assert.NotEqual(t, uint(0), users[2].ID) - assert.Equal(t, "User3", users[2].Name) - assert.Equal(t, []int{2, 1}, lengths) + tt.AssertEqual(t, users[2].Name, "User3") + tt.AssertEqual(t, lengths, []int{2, 1}) }) t.Run("should report error if the input function is invalid", func(t *testing.T) { @@ -2032,8 +2032,8 @@ func QueryChunksTest( }) assert.NotEqual(t, nil, err) - assert.Equal(t, true, strings.Contains(err.Error(), "nested struct"), "unexpected error msg: "+err.Error()) - assert.Equal(t, true, strings.Contains(err.Error(), "feature"), "unexpected error msg: "+err.Error()) + tt.AssertEqual(t, strings.Contains(err.Error(), "nested struct"), true, "unexpected error msg: "+err.Error()) + tt.AssertEqual(t, strings.Contains(err.Error(), "feature"), true, "unexpected error msg: "+err.Error()) }) }) } @@ -2069,11 +2069,11 @@ func TransactionTest( db.Query(ctx, &users, "SELECT * FROM users ORDER BY id ASC") return nil }) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, 2, len(users)) - assert.Equal(t, "User1", users[0].Name) - assert.Equal(t, "User2", users[1].Name) + tt.AssertEqual(t, len(users), 2) + tt.AssertEqual(t, users[0].Name, "User1") + tt.AssertEqual(t, users[1].Name, "User2") }) t.Run("should rollback when there are errors", func(t *testing.T) { @@ -2095,22 +2095,22 @@ func TransactionTest( err = c.Transaction(ctx, func(db Provider) error { err = db.Insert(ctx, usersTable, &user{Name: "User3"}) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) err = db.Insert(ctx, usersTable, &user{Name: "User4"}) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) _, err = db.Exec(ctx, "UPDATE users SET age = 22") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) return errors.New("fake-error") }) assert.NotEqual(t, nil, err) - assert.Equal(t, "fake-error", err.Error()) + tt.AssertEqual(t, err.Error(), "fake-error") var users []user err = c.Query(ctx, &users, "SELECT * FROM users ORDER BY id ASC") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, []user{u1, u2}, users) + tt.AssertEqual(t, users, []user{u1, u2}) }) }) } @@ -2140,17 +2140,17 @@ func ScanRowsTest( _ = c.Insert(ctx, usersTable, &user{Name: "User3", Age: 43}) rows, err := db.QueryContext(ctx, "SELECT * FROM users WHERE name='User2'") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) defer rows.Close() - assert.Equal(t, true, rows.Next()) + tt.AssertEqual(t, rows.Next(), true) var u user err = scanRows(dialect, rows, &u) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, "User2", u.Name) - assert.Equal(t, 14, u.Age) + tt.AssertEqual(t, u.Name, "User2") + tt.AssertEqual(t, u.Age, 14) }) t.Run("should ignore extra columns from query", func(t *testing.T) { @@ -2167,10 +2167,10 @@ func ScanRowsTest( _ = c.Insert(ctx, usersTable, &user{Name: "User1", Age: 22}) rows, err := db.QueryContext(ctx, "SELECT * FROM users WHERE name='User1'") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) defer rows.Close() - assert.Equal(t, true, rows.Next()) + tt.AssertEqual(t, rows.Next(), true) var u struct { ID int `ksql:"id"` @@ -2180,9 +2180,9 @@ func ScanRowsTest( // Name string `ksql:"name"` } err = scanRows(dialect, rows, &u) - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) - assert.Equal(t, 22, u.Age) + tt.AssertEqual(t, u.Age, 22) }) t.Run("should report error for closed rows", func(t *testing.T) { @@ -2197,11 +2197,11 @@ func ScanRowsTest( defer closer.Close() rows, err := db.QueryContext(ctx, "SELECT * FROM users WHERE name='User2'") - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) var u user err = rows.Close() - assert.Equal(t, nil, err) + tt.AssertEqual(t, err, nil) err = scanRows(dialect, rows, &u) assert.NotEqual(t, nil, err) }) From ab09051ab30b26001d99bd53e6027ad6a5cb390f Mon Sep 17 00:00:00 2001 From: Jadson Medeiros Date: Tue, 5 Jul 2022 23:17:30 -0300 Subject: [PATCH 2/4] removed mock reference --- benchmarks/go.sum | 11 +---------- go.mod | 1 - go.sum | 29 ----------------------------- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/benchmarks/go.sum b/benchmarks/go.sum index 1fc356d..df7143f 100644 --- a/benchmarks/go.sum +++ b/benchmarks/go.sum @@ -70,7 +70,6 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= @@ -248,7 +247,6 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -279,7 +277,6 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -289,16 +286,14 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -317,8 +312,6 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -344,9 +337,7 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/go.mod b/go.mod index 489e946..36516fd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.14 require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/ditointernet/go-assert v0.0.0-20200120164340-9e13125a7018 - github.com/golang/mock v1.6.0 // indirect github.com/kr/pretty v0.2.1 // indirect github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 2483e35..13e6c09 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditointernet/go-assert v0.0.0-20200120164340-9e13125a7018 h1:QsFkVafcKOaZoAB4WcyUHdkPbwh+VYwZgYJb/rU6EIM= github.com/ditointernet/go-assert v0.0.0-20200120164340-9e13125a7018/go.mod h1:5C3SWkut69TSdkerzRDxXMRM5x73PGWNcRLe/xKjXhs= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -19,33 +17,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 985254ad3e9fcfc2b7a7e6b03410af97d3ba1eeb Mon Sep 17 00:00:00 2001 From: Jadson Medeiros Date: Wed, 6 Jul 2022 21:43:17 -0300 Subject: [PATCH 3/4] applied new refactor to test lib --- kbuilder/insert_test.go | 2 +- kbuilder/query_test.go | 2 +- ksql_test.go | 6 +- ksqltest/testhelpers_test.go | 29 ++++--- kstructs/testhelpers_test.go | 29 ++++--- test_adapters.go | 149 +++++++++++++++++------------------ 6 files changed, 104 insertions(+), 113 deletions(-) diff --git a/kbuilder/insert_test.go b/kbuilder/insert_test.go index c053e3b..ed7f21e 100644 --- a/kbuilder/insert_test.go +++ b/kbuilder/insert_test.go @@ -80,7 +80,7 @@ func TestInsertQuery(t *testing.T) { for _, test := range tests { t.Run(test.desc, func(t *testing.T) { b, err := kbuilder.New("postgres") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) query, params, err := b.Build(test.query) diff --git a/kbuilder/query_test.go b/kbuilder/query_test.go index 4573f63..dfd0c78 100644 --- a/kbuilder/query_test.go +++ b/kbuilder/query_test.go @@ -124,7 +124,7 @@ func TestSelectQuery(t *testing.T) { for _, test := range tests { t.Run(test.desc, func(t *testing.T) { b, err := kbuilder.New("postgres") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) query, params, err := b.Build(test.query) diff --git a/ksql_test.go b/ksql_test.go index 3208e91..1f3b579 100644 --- a/ksql_test.go +++ b/ksql_test.go @@ -3,8 +3,6 @@ package ksql import ( "testing" - "github.com/ditointernet/go-assert" - tt "github.com/vingarcia/ksql/internal/testtools" ) @@ -25,7 +23,7 @@ func TestNewAdapterWith(t *testing.T) { dialectName, ) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, db.dialect, supportedDialects[dialectName]) tt.AssertEqual(t, db.driver, dialectName) } @@ -37,6 +35,6 @@ func TestNewAdapterWith(t *testing.T) { "fake-dialect-name", ) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) } diff --git a/ksqltest/testhelpers_test.go b/ksqltest/testhelpers_test.go index da3e666..f582e6f 100644 --- a/ksqltest/testhelpers_test.go +++ b/ksqltest/testhelpers_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/ditointernet/go-assert" tt "github.com/vingarcia/ksql/internal/testtools" "github.com/vingarcia/ksql/nullable" ) @@ -20,7 +19,7 @@ func TestStructToMap(t *testing.T) { Age: 22, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "my name", "age_attr": 22, @@ -33,7 +32,7 @@ func TestStructToMap(t *testing.T) { Age: 0, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "", "age_attr": 0, @@ -53,7 +52,7 @@ func TestStructToMap(t *testing.T) { Age: &age, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name": "", "age": 0, @@ -66,7 +65,7 @@ func TestStructToMap(t *testing.T) { Age: nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{}) }) @@ -81,7 +80,7 @@ func TestStructToMap(t *testing.T) { NotPartOfTheQuery: 42, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "fake-name", "age_attr": 42, @@ -99,7 +98,7 @@ func TestStructToMap(t *testing.T) { DuplicatedName: "fake-duplicated-name", }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should return error for structs with no ksql tags", func(t *testing.T) { @@ -111,7 +110,7 @@ func TestStructToMap(t *testing.T) { Age: 42, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) } @@ -126,7 +125,7 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, "Breno") tt.AssertEqual(t, user.Age, 22) }) @@ -141,7 +140,7 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, nullable.String("Breno")) tt.AssertEqual(t, user.Age, nullable.Int(22)) }) @@ -156,7 +155,7 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, nullable.String("Breno")) tt.AssertEqual(t, user.Age, nullable.Int(22)) }) @@ -171,7 +170,7 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, "Breno") tt.AssertEqual(t, user.Age, 22) }) @@ -186,7 +185,7 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, (*string)(nil)) tt.AssertEqual(t, user.Age, (*int)(nil)) }) @@ -204,7 +203,7 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, "") tt.AssertEqual(t, user.Age, 0) }) @@ -295,7 +294,7 @@ func TestFillSliceWith(t *testing.T) { }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 3) tt.AssertEqual(t, users[0].Name, "Jorge") tt.AssertEqual(t, users[1].Name, "Luciana") diff --git a/kstructs/testhelpers_test.go b/kstructs/testhelpers_test.go index 2b1c109..d7fd65b 100644 --- a/kstructs/testhelpers_test.go +++ b/kstructs/testhelpers_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/ditointernet/go-assert" tt "github.com/vingarcia/ksql/internal/testtools" "github.com/vingarcia/ksql/nullable" ) @@ -20,7 +19,7 @@ func TestStructToMap(t *testing.T) { Age: 22, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "my name", "age_attr": 22, @@ -33,7 +32,7 @@ func TestStructToMap(t *testing.T) { Age: 0, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "", "age_attr": 0, @@ -53,7 +52,7 @@ func TestStructToMap(t *testing.T) { Age: &age, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name": "", "age": 0, @@ -66,7 +65,7 @@ func TestStructToMap(t *testing.T) { Age: nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{}) }) @@ -81,7 +80,7 @@ func TestStructToMap(t *testing.T) { NotPartOfTheQuery: 42, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, m, map[string]interface{}{ "name_attr": "fake-name", "age_attr": 42, @@ -99,7 +98,7 @@ func TestStructToMap(t *testing.T) { DuplicatedName: "fake-duplicated-name", }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should return error for structs with no ksql tags", func(t *testing.T) { @@ -111,7 +110,7 @@ func TestStructToMap(t *testing.T) { Age: 42, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) } @@ -126,7 +125,7 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, "Breno") tt.AssertEqual(t, user.Age, 22) }) @@ -141,7 +140,7 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, nullable.String("Breno")) tt.AssertEqual(t, user.Age, nullable.Int(22)) }) @@ -156,7 +155,7 @@ func TestFillStructWith(t *testing.T) { "age": 22, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, nullable.String("Breno")) tt.AssertEqual(t, user.Age, nullable.Int(22)) }) @@ -171,7 +170,7 @@ func TestFillStructWith(t *testing.T) { "age": nullable.Int(22), }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, "Breno") tt.AssertEqual(t, user.Age, 22) }) @@ -186,7 +185,7 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, (*string)(nil)) tt.AssertEqual(t, user.Age, (*int)(nil)) }) @@ -204,7 +203,7 @@ func TestFillStructWith(t *testing.T) { "age": nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, user.Name, "") tt.AssertEqual(t, user.Age, 0) }) @@ -295,7 +294,7 @@ func TestFillSliceWith(t *testing.T) { }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 3) tt.AssertEqual(t, users[0].Name, "Jorge") tt.AssertEqual(t, users[1].Name, "Luciana") diff --git a/test_adapters.go b/test_adapters.go index 235cada..a4a09d6 100644 --- a/test_adapters.go +++ b/test_adapters.go @@ -6,7 +6,6 @@ import ( "encoding/json" "fmt" "io" - "strings" "testing" "github.com/ditointernet/go-assert" @@ -318,7 +317,7 @@ func QueryTest( getUserByName(db, driver, &joao, "João Ribeiro") _, err = db.ExecContext(ctx, `INSERT INTO users (name, age, address) VALUES ('Bia Ribeiro', 0, '{"country":"BR"}')`) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var bia user getUserByName(db, driver, &bia, "Bia Ribeiro") @@ -723,12 +722,12 @@ func InsertTest( } err := c.Insert(ctx, usersTable, &u) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, 0, u.ID) result := user{} err = getUserByID(c.db, c.dialect, &result, u.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.Name, u.Name) tt.AssertEqual(t, result.Address, u.Address) @@ -758,12 +757,12 @@ func InsertTest( } err = c.Insert(ctx, table, &u) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, u.ID, uint(0)) result := user{} err = getUserByName(c.db, driver, &result, "No ID returned") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.Age, u.Age) tt.AssertEqual(t, result.Address, u.Address) @@ -780,7 +779,7 @@ func InsertTest( Name string `ksql:"name"` Address map[string]interface{} `ksql:"address,json"` }{Name: "fake-name", Address: map[string]interface{}{"city": "bar"}}) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) }) t.Run("should work with preset IDs", func(t *testing.T) { @@ -796,11 +795,11 @@ func InsertTest( Name string `ksql:"name"` Age int `ksql:"age"` }{Name: "Preset Name", Age: 5455}) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var inserted user err := getUserByName(db, driver, &inserted, "Preset Name") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, inserted.Age, 5455) }) }) @@ -885,27 +884,27 @@ func InsertTest( c := newTestDB(db, driver) err = c.Insert(ctx, usersTable, "foo") - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) err = c.Insert(ctx, usersTable, nullable.String("foo")) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) err = c.Insert(ctx, usersTable, map[string]interface{}{ "name": "foo", "age": 12, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) cantInsertSlice := []interface{}{ &user{Name: "foo", Age: 22}, &user{Name: "bar", Age: 32}, } err = c.Insert(ctx, usersTable, cantInsertSlice) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) // We might want to support this in the future, but not for now: err = c.Insert(ctx, usersTable, user{Name: "not a ptr to user", Age: 42}) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report error if for some reason the insertMethod is invalid", func(t *testing.T) { @@ -919,7 +918,7 @@ func InsertTest( c.dialect = brokenDialect{} err = c.Insert(ctx, usersTable, &user{Name: "foo"}) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report error if it receives a nil pointer to a struct", func(t *testing.T) { @@ -931,7 +930,7 @@ func InsertTest( var u *user err := c.Insert(ctx, usersTable, u) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report error if table contains an empty ID name", func(t *testing.T) { @@ -968,10 +967,8 @@ func InsertTest( NonExistingColumn int `ksql:"non_existing"` Name string `ksql:"name"` }{NonExistingColumn: 42, Name: "fake-name"}) - assert.NotEqual(t, nil, err) - msg := err.Error() - tt.AssertEqual(t, strings.Contains(msg, "column"), true) - tt.AssertEqual(t, strings.Contains(msg, "non_existing"), true) + + tt.AssertErrContains(t, err, "column", "non_existing") }) t.Run("should not panic if the ID column doesn't exist in the database", func(t *testing.T) { @@ -1001,11 +998,11 @@ func InsertTest( Age int `ksql:"age"` Name string `ksql:"name"` }{Age: 42, Name: "Inserted With no ID"}) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var u user err = getUserByName(db, driver, &u, "Inserted With no ID") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u.ID) tt.AssertEqual(t, u.Age, 42) }) @@ -1083,12 +1080,12 @@ func DeleteTest( } err := c.Insert(ctx, usersTable, &u1) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u1.ID) result := user{} err = getUserByID(c.db, c.dialect, &result, u1.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.ID, u1.ID) u2 := user{ @@ -1096,16 +1093,16 @@ func DeleteTest( } err = c.Insert(ctx, usersTable, &u2) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u2.ID) result = user{} err = getUserByID(c.db, c.dialect, &result, u2.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.ID, u2.ID) err = c.Delete(ctx, usersTable, test.deletionKeyForUser(u1)) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) result = user{} err = getUserByID(c.db, c.dialect, &result, u1.ID) @@ -1113,7 +1110,7 @@ func DeleteTest( result = user{} err = getUserByID(c.db, c.dialect, &result, u2.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), result.ID) tt.AssertEqual(t, result.Name, "Won't be deleted") @@ -1212,7 +1209,7 @@ func DeleteTest( var u *user err := c.Delete(ctx, usersTable, u) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report error if one of the ids is missing from the input", func(t *testing.T) { @@ -1361,21 +1358,21 @@ func UpdateTest( Name: "Letícia", } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 0)`) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) err = getUserByName(db, driver, &u, "Letícia") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u.ID) err = c.Update(ctx, usersTable, user{ ID: u.ID, Name: "Thayane", }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.Name, "Thayane") }) @@ -1390,21 +1387,21 @@ func UpdateTest( Name: "Letícia", } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 0)`) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) err = getUserByName(db, driver, &u, "Letícia") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u.ID) err = c.Update(ctx, usersTable, &user{ ID: u.ID, Name: "Thayane", }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.Name, "Thayane") }) @@ -1422,11 +1419,11 @@ func UpdateTest( } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 22)`) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var u user err = getUserByName(db, driver, &u, "Letícia") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u.ID) err = c.Update(ctx, usersTable, partialUser{ @@ -1436,11 +1433,11 @@ func UpdateTest( // Should not be updated because it is null: Age: nil, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.Name, "") tt.AssertEqual(t, result.Age, 22) }) @@ -1459,11 +1456,11 @@ func UpdateTest( } _, err := db.ExecContext(ctx, `INSERT INTO users (name, age) VALUES ('Letícia', 22)`) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var u user err = getUserByName(db, driver, &u, "Letícia") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) assert.NotEqual(t, uint(0), u.ID) // Should update all fields: @@ -1472,11 +1469,11 @@ func UpdateTest( Name: "Thay", Age: nullable.Int(42), }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var result user err = getUserByID(c.db, c.dialect, &result, u.ID) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, result.Name, "Thay") tt.AssertEqual(t, result.Age, 42) @@ -1507,7 +1504,7 @@ func UpdateTest( ID: 1, Name: "Thayane", }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report error if it receives a nil pointer to a struct", func(t *testing.T) { @@ -1519,7 +1516,7 @@ func UpdateTest( var u *user err := c.Update(ctx, usersTable, u) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) }) } @@ -1581,7 +1578,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, length, 1) assert.NotEqual(t, uint(0), u.ID) tt.AssertEqual(t, u.Name, "User1") @@ -1617,7 +1614,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(lengths), 1) tt.AssertEqual(t, lengths[0], 2) @@ -1659,7 +1656,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 2) tt.AssertEqual(t, lengths, []int{1, 1}) @@ -1702,7 +1699,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 3) assert.NotEqual(t, uint(0), users[0].ID) tt.AssertEqual(t, users[0].Name, "User1") @@ -1738,11 +1735,11 @@ func QueryChunksTest( _ = c.Insert(ctx, usersTable, &thatiana) _, err := db.ExecContext(ctx, fmt.Sprint(`INSERT INTO posts (user_id, title) VALUES (`, thatiana.ID, `, 'Thatiana Post1')`)) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) _, err = db.ExecContext(ctx, fmt.Sprint(`INSERT INTO posts (user_id, title) VALUES (`, thatiana.ID, `, 'Thatiana Post2')`)) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) _, err = db.ExecContext(ctx, fmt.Sprint(`INSERT INTO posts (user_id, title) VALUES (`, joao.ID, `, 'Thiago Post1')`)) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var lengths []int var users []user @@ -1769,7 +1766,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(posts), 3) tt.AssertEqual(t, users[0].ID, joao.ID) @@ -1815,7 +1812,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 2) assert.NotEqual(t, uint(0), users[0].ID) tt.AssertEqual(t, users[0].Name, "User1") @@ -1856,7 +1853,7 @@ func QueryChunksTest( }, }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 3) assert.NotEqual(t, uint(0), users[0].ID) tt.AssertEqual(t, users[0].Name, "User1") @@ -1897,7 +1894,7 @@ func QueryChunksTest( }, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) tt.AssertEqual(t, len(users), 2) assert.NotEqual(t, uint(0), users[0].ID) tt.AssertEqual(t, users[0].Name, "User1") @@ -1938,7 +1935,7 @@ func QueryChunksTest( }, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) tt.AssertEqual(t, len(users), 3) assert.NotEqual(t, uint(0), users[0].ID) tt.AssertEqual(t, users[0].Name, "User1") @@ -1989,7 +1986,7 @@ func QueryChunksTest( ChunkSize: 2, ForEachChunk: fn, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) } }) @@ -2008,7 +2005,7 @@ func QueryChunksTest( return nil }, }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report error if using nested struct and the query starts with SELECT", func(t *testing.T) { @@ -2031,9 +2028,7 @@ func QueryChunksTest( }, }) - assert.NotEqual(t, nil, err) - tt.AssertEqual(t, strings.Contains(err.Error(), "nested struct"), true, "unexpected error msg: "+err.Error()) - tt.AssertEqual(t, strings.Contains(err.Error(), "feature"), true, "unexpected error msg: "+err.Error()) + tt.AssertErrContains(t, err, "nested struct", "feature") }) }) } @@ -2069,7 +2064,7 @@ func TransactionTest( db.Query(ctx, &users, "SELECT * FROM users ORDER BY id ASC") return nil }) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 2) tt.AssertEqual(t, users[0].Name, "User1") @@ -2095,20 +2090,20 @@ func TransactionTest( err = c.Transaction(ctx, func(db Provider) error { err = db.Insert(ctx, usersTable, &user{Name: "User3"}) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) err = db.Insert(ctx, usersTable, &user{Name: "User4"}) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) _, err = db.Exec(ctx, "UPDATE users SET age = 22") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) return errors.New("fake-error") }) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) tt.AssertEqual(t, err.Error(), "fake-error") var users []user err = c.Query(ctx, &users, "SELECT * FROM users ORDER BY id ASC") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, users, []user{u1, u2}) }) @@ -2140,14 +2135,14 @@ func ScanRowsTest( _ = c.Insert(ctx, usersTable, &user{Name: "User3", Age: 43}) rows, err := db.QueryContext(ctx, "SELECT * FROM users WHERE name='User2'") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) defer rows.Close() tt.AssertEqual(t, rows.Next(), true) var u user err = scanRows(dialect, rows, &u) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, u.Name, "User2") tt.AssertEqual(t, u.Age, 14) @@ -2167,7 +2162,7 @@ func ScanRowsTest( _ = c.Insert(ctx, usersTable, &user{Name: "User1", Age: 22}) rows, err := db.QueryContext(ctx, "SELECT * FROM users WHERE name='User1'") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) defer rows.Close() tt.AssertEqual(t, rows.Next(), true) @@ -2180,7 +2175,7 @@ func ScanRowsTest( // Name string `ksql:"name"` } err = scanRows(dialect, rows, &u) - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) tt.AssertEqual(t, u.Age, 22) }) @@ -2197,13 +2192,13 @@ func ScanRowsTest( defer closer.Close() rows, err := db.QueryContext(ctx, "SELECT * FROM users WHERE name='User2'") - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) var u user err = rows.Close() - tt.AssertEqual(t, err, nil) + tt.AssertNoErr(t, err) err = scanRows(dialect, rows, &u) - assert.NotEqual(t, nil, err) + tt.AssertNotEqual(t, err, nil) }) t.Run("should report if record is not a pointer", func(t *testing.T) { From e464f3b6ea77efe62db79128e1dd0c01afd8fa70 Mon Sep 17 00:00:00 2001 From: Jadson Medeiros Date: Wed, 6 Jul 2022 21:53:23 -0300 Subject: [PATCH 4/4] chenged reference from assert.NotEqual to tt.AssertNotEqual --- test_adapters.go | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/test_adapters.go b/test_adapters.go index a4a09d6..8933807 100644 --- a/test_adapters.go +++ b/test_adapters.go @@ -8,7 +8,6 @@ import ( "io" "testing" - "github.com/ditointernet/go-assert" "github.com/pkg/errors" tt "github.com/vingarcia/ksql/internal/testtools" "github.com/vingarcia/ksql/nullable" @@ -723,7 +722,7 @@ func InsertTest( err := c.Insert(ctx, usersTable, &u) tt.AssertNoErr(t, err) - assert.NotEqual(t, 0, u.ID) + tt.AssertNotEqual(t, u.ID, 0) result := user{} err = getUserByID(c.db, c.dialect, &result, u.ID) @@ -1003,7 +1002,7 @@ func InsertTest( var u user err = getUserByName(db, driver, &u, "Inserted With no ID") tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u.ID) + tt.AssertNotEqual(t, u.ID, uint(0)) tt.AssertEqual(t, u.Age, 42) }) }) @@ -1081,7 +1080,7 @@ func DeleteTest( err := c.Insert(ctx, usersTable, &u1) tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u1.ID) + tt.AssertNotEqual(t, u1.ID, uint(0)) result := user{} err = getUserByID(c.db, c.dialect, &result, u1.ID) @@ -1094,7 +1093,7 @@ func DeleteTest( err = c.Insert(ctx, usersTable, &u2) tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u2.ID) + tt.AssertNotEqual(t, u2.ID, uint(0)) result = user{} err = getUserByID(c.db, c.dialect, &result, u2.ID) @@ -1112,7 +1111,7 @@ func DeleteTest( err = getUserByID(c.db, c.dialect, &result, u2.ID) tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), result.ID) + tt.AssertNotEqual(t, result.ID, uint(0)) tt.AssertEqual(t, result.Name, "Won't be deleted") }) } @@ -1362,7 +1361,7 @@ func UpdateTest( err = getUserByName(db, driver, &u, "Letícia") tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u.ID) + tt.AssertNotEqual(t, u.ID, uint(0)) err = c.Update(ctx, usersTable, user{ ID: u.ID, @@ -1391,7 +1390,7 @@ func UpdateTest( err = getUserByName(db, driver, &u, "Letícia") tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u.ID) + tt.AssertNotEqual(t, u.ID, uint(0)) err = c.Update(ctx, usersTable, &user{ ID: u.ID, @@ -1424,7 +1423,7 @@ func UpdateTest( var u user err = getUserByName(db, driver, &u, "Letícia") tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u.ID) + tt.AssertNotEqual(t, u.ID, uint(0)) err = c.Update(ctx, usersTable, partialUser{ ID: u.ID, @@ -1461,7 +1460,7 @@ func UpdateTest( var u user err = getUserByName(db, driver, &u, "Letícia") tt.AssertNoErr(t, err) - assert.NotEqual(t, uint(0), u.ID) + tt.AssertNotEqual(t, u.ID, uint(0)) // Should update all fields: err = c.Update(ctx, usersTable, partialUser{ @@ -1580,7 +1579,7 @@ func QueryChunksTest( tt.AssertNoErr(t, err) tt.AssertEqual(t, length, 1) - assert.NotEqual(t, uint(0), u.ID) + tt.AssertNotEqual(t, u.ID, uint(0)) tt.AssertEqual(t, u.Name, "User1") tt.AssertEqual(t, u.Address.Country, "BR") }) @@ -1618,11 +1617,11 @@ func QueryChunksTest( tt.AssertEqual(t, len(lengths), 1) tt.AssertEqual(t, lengths[0], 2) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") tt.AssertEqual(t, users[0].Address.Country, "US") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") tt.AssertEqual(t, users[1].Address.Country, "BR") }) @@ -1660,11 +1659,11 @@ func QueryChunksTest( tt.AssertEqual(t, len(users), 2) tt.AssertEqual(t, lengths, []int{1, 1}) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") tt.AssertEqual(t, users[0].Address.Country, "US") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") tt.AssertEqual(t, users[1].Address.Country, "BR") }) @@ -1701,11 +1700,11 @@ func QueryChunksTest( tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 3) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") - assert.NotEqual(t, uint(0), users[2].ID) + tt.AssertNotEqual(t, users[2].ID, uint(0)) tt.AssertEqual(t, users[2].Name, "User3") tt.AssertEqual(t, lengths, []int{2, 1}) }) @@ -1814,9 +1813,9 @@ func QueryChunksTest( tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 2) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") tt.AssertEqual(t, lengths, []int{2}) }) @@ -1855,11 +1854,11 @@ func QueryChunksTest( tt.AssertNoErr(t, err) tt.AssertEqual(t, len(users), 3) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") - assert.NotEqual(t, uint(0), users[2].ID) + tt.AssertNotEqual(t, users[2].ID, uint(0)) tt.AssertEqual(t, users[2].Name, "User3") tt.AssertEqual(t, lengths, []int{2, 1}) }) @@ -1896,9 +1895,9 @@ func QueryChunksTest( tt.AssertNotEqual(t, err, nil) tt.AssertEqual(t, len(users), 2) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") tt.AssertEqual(t, lengths, []int{2}) }) @@ -1937,11 +1936,11 @@ func QueryChunksTest( tt.AssertNotEqual(t, err, nil) tt.AssertEqual(t, len(users), 3) - assert.NotEqual(t, uint(0), users[0].ID) + tt.AssertNotEqual(t, users[0].ID, uint(0)) tt.AssertEqual(t, users[0].Name, "User1") - assert.NotEqual(t, uint(0), users[1].ID) + tt.AssertNotEqual(t, users[1].ID, uint(0)) tt.AssertEqual(t, users[1].Name, "User2") - assert.NotEqual(t, uint(0), users[2].ID) + tt.AssertNotEqual(t, users[2].ID, uint(0)) tt.AssertEqual(t, users[2].Name, "User3") tt.AssertEqual(t, lengths, []int{2, 1}) })