expression: migrate test-infra to testify for constant_propagation_te…

…st.go This closes pingcap#28853. Signed-off-by: tison <[email protected]>
tisonkun · Dec 6, 2021 · 62d2768 · 62d2768
1 parent 0b3ec09
commit 62d2768
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 44 deletions.
diff --git a/expression/constant_propagation_test.go b/expression/constant_propagation_test.go
@@ -15,41 +15,20 @@
 package expression_test
 
 import (
-	. "github.com/pingcap/check"
-	"github.com/pingcap/tidb/domain"
-	"github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/sessionctx"
-	"github.com/pingcap/tidb/util/mock"
-	"github.com/pingcap/tidb/util/testkit"
-	"github.com/pingcap/tidb/util/testutil"
-)
+	"testing"
 
-var _ = Suite(&testSuite{})
+	"github.com/pingcap/tidb/expression"
+	"github.com/pingcap/tidb/testkit"
+	"github.com/pingcap/tidb/testkit/testdata"
+)
 
-type testSuite struct {
-	store    kv.Storage
-	dom      *domain.Domain
-	ctx      sessionctx.Context
-	testData testutil.TestData
-}
+func TestOuterJoinPropConst(t *testing.T) {
+	t.Parallel()
 
-func (s *testSuite) SetUpSuite(c *C) {
-	var err error
-	s.store, s.dom, err = newStoreWithBootstrap()
-	c.Assert(err, IsNil)
-	s.ctx = mock.NewContext()
-	s.testData, err = testutil.LoadTestSuiteData("testdata", "expression_suite")
-	c.Assert(err, IsNil)
-}
+	store, clean := testkit.CreateMockStore(t)
+	defer clean()
 
-func (s *testSuite) TearDownSuite(c *C) {
-	c.Assert(s.testData.GenerateOutputIfNeeded(), IsNil)
-	s.dom.Close()
-	s.store.Close()
-}
-
-func (s *testSuite) TestOuterJoinPropConst(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
+	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
 	tk.MustExec("drop table if exists t1, t2;")
 	tk.MustExec("create table t1(id bigint primary key, a int, b int);")
@@ -60,11 +39,13 @@ func (s *testSuite) TestOuterJoinPropConst(c *C) {
 		SQL    string
 		Result []string
 	}
-	s.testData.GetTestCases(c, &input, &output)
+
+	expressionSuiteData := expression.GetExpressionSuiteData()
+	expressionSuiteData.GetTestCases(t, &input, &output)
 	for i, tt := range input {
-		s.testData.OnRecord(func() {
+		testdata.OnRecord(func() {
 			output[i].SQL = tt
-			output[i].Result = s.testData.ConvertRowsToStrings(tk.MustQuery(tt).Rows())
+			output[i].Result = testdata.ConvertRowsToStrings(tk.MustQuery(tt).Rows())
 		})
 		tk.MustQuery(tt).Check(testkit.Rows(output[i].Result...))
 	}

diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -6580,7 +6580,7 @@ func (s *testIntegrationSerialSuite) TestCacheConstEval(c *C) {
 	tk.MustExec("admin reload expr_pushdown_blacklist")
 }
 
-func (s *testSuite) TestIssue20071(c *C) {
+func (s *testIntegrationSuite) TestIssue20071(c *C) {
 	tk := testkit.NewTestKitWithInit(c, s.store)
 	tk.MustExec("drop table if exists table_30_utf8_4")
 	tk.MustExec("drop table if exists t")
@@ -6593,7 +6593,7 @@ func (s *testSuite) TestIssue20071(c *C) {
 	tk.MustExec("select a from table_30_utf8_4 order by a")
 }
 
-func (s *testSuite) TestVirtualGeneratedColumnAndLimit(c *C) {
+func (s *testIntegrationSuite) TestVirtualGeneratedColumnAndLimit(c *C) {
 	tk := testkit.NewTestKitWithInit(c, s.store)
 	tk.MustExec("drop table if exists t;")
 	tk.MustExec("create table t (a int, b int as (a + 1));")
@@ -9148,7 +9148,7 @@ func (s *testIntegrationSuite) TestIssue11333(c *C) {
 	tk.MustQuery(`select 0.000000000000000000000000000000000000000000000000000000000000000000000001;`).Check(testkit.Rows("0.000000000000000000000000000000000000000000000000000000000000000000000001"))
 }
 
-func (s *testSuite) TestIssue12206(c *C) {
+func (s *testIntegrationSuite) TestIssue12206(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")
 	tk.MustExec("drop table if exists t12206;")

diff --git a/expression/main_test.go b/expression/main_test.go
@@ -49,6 +49,7 @@ func TestMain(m *testing.M) {
 	timeutil.SetSystemTZ("system")
 
 	testDataMap.LoadTestSuiteData("testdata", "flag_simplify")
+	testDataMap.LoadTestSuiteData("testdata", "expression_suite")
 
 	opts := []goleak.Option{
 		goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"),
@@ -76,3 +77,7 @@ func createContext(t *testing.T) *mock.Context {
 func GetFlagSimplifyData() testdata.TestData {
 	return testDataMap["flag_simplify"]
 }
+
+func GetExpressionSuiteData() testdata.TestData {
+	return testDataMap["expression_suite"]
+}
diff --git a/expression/typeinfer_test.go b/expression/typeinfer_test.go
@@ -35,13 +35,10 @@ import (
 
 func TestInferType(t *testing.T) {
 	t.Parallel()
-	store, dom, err := newStoreWithBootstrap()
-	require.NoError(t, err)
-	defer func() {
-		dom.Close()
-		err = store.Close()
-		require.NoError(t, err)
-	}()
+
+	store, clean := testkit.CreateMockStore(t)
+	defer clean()
+
 	s := InferTypeSuite{}
 	se, err := session.CreateSession4Test(store)
 	require.NoError(t, err)