planner/core: migrate test-infra to testify for integration_test.go (#…

…32560) Signed-off-by: tison <wander4096@gmail.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
pingcap · Feb 23, 2022 · a11ece9 · a11ece9
1 parent cce1ebd
commit a11ece9
Show file tree

Hide file tree

Showing 8 changed files with 6,031 additions and 5,633 deletions.
diff --git a/planner/core/integration_test.go b/planner/core/integration_test.go
diff --git a/planner/core/main_test.go b/planner/core/main_test.go
@@ -42,6 +42,7 @@ func TestMain(m *testing.M) {
 	testDataMap.LoadTestSuiteData("testdata", "expression_rewriter_suite")
 	testDataMap.LoadTestSuiteData("testdata", "partition_pruner")
 	testDataMap.LoadTestSuiteData("testdata", "plan_suite")
+	testDataMap.LoadTestSuiteData("testdata", "integration_suite")
 
 	indexMergeSuiteData = testDataMap["index_merge_suite"]
 
@@ -93,3 +94,7 @@ func GetPartitionPrunerData() testdata.TestData {
 func GetPlanSuiteData() testdata.TestData {
 	return testDataMap["plan_suite"]
 }
+
+func GetIntegrationSuiteData() testdata.TestData {
+	return testDataMap["integration_suite"]
+}
diff --git a/planner/core/prepare_test.go b/planner/core/prepare_test.go
@@ -1747,7 +1747,7 @@ func TestPrepareForGroupByMultiItems(t *testing.T) {
 	tk.MustQuery(`execute stmt2 using @v1, @v2`).Check(testkit.Rows("10"))
 }
 
-func TestInvisibleIndex(t *testing.T) {
+func TestInvisibleIndexPrepare(t *testing.T) {
 	store, clean := testkit.CreateMockStore(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)

diff --git a/planner/core/testdata/integration_serial_suite_in.json b/planner/core/testdata/integration_serial_suite_in.json
diff --git a/planner/core/testdata/integration_serial_suite_out.json b/planner/core/testdata/integration_serial_suite_out.json
diff --git a/planner/core/testdata/integration_suite_in.json b/planner/core/testdata/integration_suite_in.json
diff --git a/planner/core/testdata/integration_suite_out.json b/planner/core/testdata/integration_suite_out.json
diff --git a/testkit/result.go b/testkit/result.go
@@ -99,3 +99,22 @@ func (res *Result) Rows() [][]interface{} {
 	}
 	return ifacesSlice
 }
+
+// CheckAt asserts the result of selected columns equals the expected results.
+func (res *Result) CheckAt(cols []int, expected [][]interface{}) {
+	for _, e := range expected {
+		res.require.Equal(len(e), len(cols))
+	}
+
+	rows := make([][]string, 0, len(expected))
+	for i := range res.rows {
+		row := make([]string, 0, len(cols))
+		for _, r := range cols {
+			row = append(row, res.rows[i][r])
+		}
+		rows = append(rows, row)
+	}
+	got := fmt.Sprintf("%s", rows)
+	need := fmt.Sprintf("%s", expected)
+	res.require.Equal(need, got, res.comment)
+}