(flink-connector-jdbc) branch main updated: [FLINK-33883][jdbc] Bump CI flink version on flink-connector-jdbc to support flink 1.19

[snuyanzin]

This is an automated email from the ASF dual-hosted git repository.

snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git


The following commit(s) were added to refs/heads/main by this push:
     new e6645995 [FLINK-33883][jdbc] Bump CI flink version on 
flink-connector-jdbc to support flink 1.19
e6645995 is described below

commit e664599508315e8d2e270a82d91ddef3513b6567
Author: Jiabao Sun <jiabao....@xtransfer.cn>
AuthorDate: Thu Dec 21 18:11:40 2023 +0800

    [FLINK-33883][jdbc] Bump CI flink version on flink-connector-jdbc to 
support flink 1.19
---
 .github/workflows/push_pr.yml                      |  2 ++
 .github/workflows/weekly.yml                       |  4 ++++
 .../connector/jdbc/table/JdbcTablePlanTest.java    | 28 ++++++++++++++++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 38724aef..9d349c00 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -30,6 +30,8 @@ jobs:
         include:
           - flink: 1.18-SNAPSHOT
             jdk: '8, 11, 17'
+          - flink: 1.19-SNAPSHOT
+            jdk: '8, 11, 17, 21'
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 2e31b6bc..5012fc17 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -36,6 +36,10 @@ jobs:
           flink: 1.18-SNAPSHOT,
           jdk: '8, 11, 17',
           branch: main
+        }, {
+          flink: 1.19-SNAPSHOT,
+          jdk: '8, 11, 17, 21',
+          branch: main
         }, {
           flink: 1.16.2,
           branch: v3.1
diff --git 
a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
 
b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
index 055e0285..05d8a467 100644
--- 
a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
+++ 
b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
@@ -22,16 +22,21 @@ import org.apache.flink.table.api.TableConfig;
 import org.apache.flink.table.planner.utils.StreamTableTestUtil;
 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 org.junit.jupiter.api.TestInfo;
+import org.junit.rules.TestName;
 
 /** Plan tests for JDBC connector, for example, testing projection push down. 
*/
 public class JdbcTablePlanTest extends TableTestBase {
-    // TODO: Update to junit5 after TableTestBase migrated (maybe copy the 
class?)
+
     private final StreamTableTestUtil util = 
streamTestUtil(TableConfig.getDefault());
 
-    @Before
-    public void setup() {
+    private TestInfo testInfo;
+
+    @BeforeEach
+    public void setup(TestInfo testInfo) {
+        this.testInfo = testInfo;
         util.tableEnv()
                 .executeSql(
                         "CREATE TABLE jdbc ("
@@ -64,4 +69,17 @@ public class JdbcTablePlanTest extends TableTestBase {
         util.verifyExecPlan(
                 "SELECT id, time_col, real_col FROM jdbc WHERE id = 900001 AND 
time_col <> TIME '11:11:11' OR double_col >= -1000.23");
     }
+
+    /**
+     * Get the test method name, in order to adapt to {@link TableTestBase} 
that has not migrated to
+     * Junit5. Remove it when dropping support of Flink 1.18.
+     */
+    public TestName name() {
+        return new TestName() {
+            @Override
+            public String getMethodName() {
+                return testInfo.getTestMethod().get().getName();
+            }
+        };
+    }
 }