From 5a0779068fa74d7e8eb756631f3f14a86214b82f Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Wed, 9 Feb 2022 11:36:19 +0800 Subject: [PATCH] executor: migrate test-infra to testify for pkg_test Signed-off-by: Weizhen Wang --- executor/join_pkg_test.go | 7 +++++++ executor/pkg_test.go | 24 ++++++++---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/executor/join_pkg_test.go b/executor/join_pkg_test.go index 75af33d7acb5d..079010706db5f 100644 --- a/executor/join_pkg_test.go +++ b/executor/join_pkg_test.go @@ -25,6 +25,13 @@ import ( "github.com/pingcap/tidb/types" ) +var _ = Suite(&pkgTestSuite{}) +var _ = SerialSuites(&pkgTestSerialSuite{}) + +type pkgTestSuite struct{} + +type pkgTestSerialSuite struct{} + func (s *pkgTestSerialSuite) TestJoinExec(c *C) { c.Assert(failpoint.Enable("github.com/pingcap/tidb/executor/testRowContainerSpill", "return(true)"), IsNil) defer func() { c.Assert(failpoint.Disable("github.com/pingcap/tidb/executor/testRowContainerSpill"), IsNil) }() diff --git a/executor/pkg_test.go b/executor/pkg_test.go index 71cfec7ed9c1f..48c9678991d9b 100644 --- a/executor/pkg_test.go +++ b/executor/pkg_test.go @@ -17,8 +17,8 @@ package executor import ( "context" "fmt" + "testing" - . "github.com/pingcap/check" "github.com/pingcap/tidb/expression" "github.com/pingcap/tidb/parser/ast" "github.com/pingcap/tidb/parser/mysql" @@ -26,18 +26,10 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/chunk" "github.com/pingcap/tidb/util/mock" + "github.com/stretchr/testify/require" ) -var _ = Suite(&pkgTestSuite{}) -var _ = SerialSuites(&pkgTestSerialSuite{}) - -type pkgTestSuite struct { -} - -type pkgTestSerialSuite struct { -} - -func (s *pkgTestSuite) TestNestedLoopApply(c *C) { +func TestNestedLoopApply(t *testing.T) { ctx := context.Background() sctx := mock.NewContext() col0 := &expression.Column{Index: 0, RetType: types.NewFieldType(mysql.TypeLong)} @@ -88,20 +80,20 @@ func (s *pkgTestSuite) TestNestedLoopApply(c *C) { it := chunk.NewIterator4Chunk(joinChk) for rowIdx := 1; ; { err := join.Next(ctx, joinChk) - c.Check(err, IsNil) + require.NoError(t, err) if joinChk.NumRows() == 0 { break } for row := it.Begin(); row != it.End(); row = it.Next() { correctResult := fmt.Sprintf("%v %v", rowIdx, rowIdx) obtainedResult := fmt.Sprintf("%v %v", row.GetInt64(0), row.GetInt64(1)) - c.Check(obtainedResult, Equals, correctResult) + require.Equal(t, correctResult, obtainedResult) rowIdx++ } } } -func (s *pkgTestSuite) TestMoveInfoSchemaToFront(c *C) { +func TestMoveInfoSchemaToFront(t *testing.T) { dbss := [][]string{ {}, {"A", "B", "C", "a", "b", "c"}, @@ -124,9 +116,9 @@ func (s *pkgTestSuite) TestMoveInfoSchemaToFront(c *C) { } for i, dbs := range wanted { - c.Check(len(dbss[i]), Equals, len(dbs)) + require.Equal(t, len(dbs), len(dbss[i])) for j, db := range dbs { - c.Check(dbss[i][j], Equals, db) + require.Equal(t, db, dbss[i][j]) } } }