This is an automated email from the ASF dual-hosted git repository. leonard pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1fbe223a5d7b9232d58f471ae620306b9dad58ea Author: Jiabao Sun <[email protected]> AuthorDate: Tue Sep 12 15:42:18 2023 +0800 [FLINK-33023][table-planner][JUnit5 Migration] Module: flink-table-planner/planner/catalog,expressions,runtime (TableTestBase) --- .../planner/catalog/JavaCatalogTableTest.java | 34 ++++++++++++---------- .../runtime/batch/ParallelismSettingTest.java | 20 ++++++------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/JavaCatalogTableTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/JavaCatalogTableTest.java index 1bec0f771eb..fbb5d8e89f5 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/JavaCatalogTableTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/JavaCatalogTableTest.java @@ -30,10 +30,12 @@ import org.apache.flink.table.catalog.GenericInMemoryCatalog; import org.apache.flink.table.catalog.ObjectPath; import org.apache.flink.table.planner.utils.TableTestBase; import org.apache.flink.table.planner.utils.TableTestUtil; +import org.apache.flink.testutils.junit.extensions.parameterized.Parameter; +import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension; +import org.apache.flink.testutils.junit.extensions.parameterized.Parameters; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.TestTemplate; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.Arrays; import java.util.Collection; @@ -49,14 +51,14 @@ import static org.apache.flink.table.api.Expressions.lit; /** * Tests for resolving types of computed columns (including time attributes) of tables from catalog. */ -@RunWith(Parameterized.class) -public class JavaCatalogTableTest extends TableTestBase { - @Parameterized.Parameters(name = "streamingMode = {0}") - public static Collection<Boolean> parameters() { +@ExtendWith(ParameterizedTestExtension.class) +class JavaCatalogTableTest extends TableTestBase { + @Parameters(name = "streamingMode = {0}") + private static Collection<Boolean> parameters() { return Arrays.asList(true, false); } - @Parameterized.Parameter public boolean isStreamingMode; + @Parameter private boolean isStreamingMode; private TableTestUtil getTestUtil() { if (isStreamingMode) { @@ -66,8 +68,8 @@ public class JavaCatalogTableTest extends TableTestBase { } } - @Test - public void testResolvingSchemaOfCustomCatalogTableSql() throws Exception { + @TestTemplate + void testResolvingSchemaOfCustomCatalogTableSql() throws Exception { TableTestUtil testUtil = getTestUtil(); TableEnvironment tableEnvironment = testUtil.getTableEnv(); GenericInMemoryCatalog genericInMemoryCatalog = new GenericInMemoryCatalog("in-memory"); @@ -83,8 +85,8 @@ public class JavaCatalogTableTest extends TableTestBase { "SELECT COUNT(*) FROM testTable2 GROUP BY TUMBLE(rowtime, INTERVAL '10' MINUTE)"); } - @Test - public void testResolvingSchemaOfCustomCatalogTableTableApi() throws Exception { + @TestTemplate + void testResolvingSchemaOfCustomCatalogTableTableApi() throws Exception { TableTestUtil testUtil = getTestUtil(); TableEnvironment tableEnvironment = testUtil.getTableEnv(); GenericInMemoryCatalog genericInMemoryCatalog = new GenericInMemoryCatalog("in-memory"); @@ -103,8 +105,8 @@ public class JavaCatalogTableTest extends TableTestBase { testUtil.verifyExecPlan(table); } - @Test - public void testResolvingProctimeOfCustomTableSql() throws Exception { + @TestTemplate + void testResolvingProctimeOfCustomTableSql() throws Exception { if (!isStreamingMode) { // proctime not supported in batch return; @@ -123,8 +125,8 @@ public class JavaCatalogTableTest extends TableTestBase { + "GROUP BY TUMBLE(proctime, INTERVAL '10' MINUTE)"); } - @Test - public void testResolvingProctimeOfCustomTableTableApi() throws Exception { + @TestTemplate + void testResolvingProctimeOfCustomTableTableApi() throws Exception { if (!isStreamingMode) { // proctime not supported in batch return; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java index e5115a4d3e8..844a0fbec33 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java @@ -25,8 +25,8 @@ import org.apache.flink.table.operations.Operation; import org.apache.flink.table.planner.utils.BatchTableTestUtil; import org.apache.flink.table.planner.utils.TableTestBase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; @@ -38,8 +38,8 @@ public class ParallelismSettingTest extends TableTestBase { private BatchTableTestUtil util; - @Before - public void before() { + @BeforeEach + void before() { util = batchTestUtil(TableConfig.getDefault()); util.getTableEnv() .getConfig() @@ -58,7 +58,7 @@ public class ParallelismSettingTest extends TableTestBase { } @Test - public void testParallelismSettingAfterSingletonShuffleRemove() { + void testParallelismSettingAfterSingletonShuffleRemove() { util.getTableEnv() .executeSql( "CREATE TABLE MySink (\n" @@ -88,7 +88,7 @@ public class ParallelismSettingTest extends TableTestBase { } @Test - public void testSortQuery() { + void testSortQuery() { util.getTableEnv() .executeSql( "CREATE TABLE MySink (\n" @@ -121,7 +121,7 @@ public class ParallelismSettingTest extends TableTestBase { } @Test - public void testLimitQuery() { + void testLimitQuery() { util.getTableEnv() .executeSql( "CREATE TABLE MySink (\n" @@ -155,7 +155,7 @@ public class ParallelismSettingTest extends TableTestBase { } @Test - public void testSortLimitQuery() { + void testSortLimitQuery() { util.getTableEnv() .executeSql( "CREATE TABLE MySink (\n" @@ -190,7 +190,7 @@ public class ParallelismSettingTest extends TableTestBase { } @Test - public void testRankQuery() { + void testRankQuery() { util.getTableEnv() .executeSql( "CREATE TABLE MySink (\n" @@ -241,7 +241,7 @@ public class ParallelismSettingTest extends TableTestBase { } @Test - public void testJoinQuery() { + void testJoinQuery() { util.tableEnv() .executeSql( "CREATE TABLE MyTable2 (\n"
