You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by "Jiabao-Sun (via GitHub)" <gi...@apache.org> on 2023/11/22 17:41:58 UTC

[PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Jiabao-Sun opened a new pull request, #23775:
URL: https://github.com/apache/flink/pull/23775

   <!--
   *Thank you very much for contributing to Apache Flink - we are happy that you want to help us improve Flink. To help the community review your contribution in the best possible way, please go through the checklist below, which will get the contribution into a shape in which it can be best reviewed.*
   
   *Please understand that we do not do this to make contributions to Flink a hassle. In order to uphold a high standard of quality for code contributions, while at the same time managing a large number of contributions, we need contributors to prepare the contributions well, and give reviewers enough contextual information for the review. Please also understand that contributions that do not follow this guide will take longer to review and thus typically be picked up with lower priority by the community.*
   
   ## Contribution Checklist
   
     - Make sure that the pull request corresponds to a [JIRA issue](https://issues.apache.org/jira/projects/FLINK/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no JIRA issue.
     
     - Name the pull request in the form "[FLINK-XXXX] [component] Title of the pull request", where *FLINK-XXXX* should be replaced by the actual issue number. Skip *component* if you are unsure about which is the best component.
     Typo fixes that have no associated JIRA issue should be named following this pattern: `[hotfix] [docs] Fix typo in event time introduction` or `[hotfix] [javadocs] Expand JavaDoc for PuncuatedWatermarkGenerator`.
   
     - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
     
     - Make sure that the change passes the automated tests, i.e., `mvn clean verify` passes. You can set up Azure Pipelines CI to do that following [this guide](https://cwiki.apache.org/confluence/display/FLINK/Azure+Pipelines#AzurePipelines-Tutorial:SettingupAzurePipelinesforaforkoftheFlinkrepository).
   
     - Each pull request should address only one issue, not mix up code from multiple issues.
     
     - Each commit in the pull request has a meaningful commit message (including the JIRA id)
   
     - Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below.
   
   
   **(The sections below can be removed for hotfixes of typos)**
   -->
   
   ## What is the purpose of the change
   
   [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests)
   
   ## Brief change log
   
   [JUnit5 Migration] Module: flink-table-planner (Remaining Tests)
   
   ## Verifying this change
   
   This change is already covered by existing tests
   
   ## Does this pull request potentially affect one of the following parts:
   
     - Dependencies (does it add or upgrade a dependency): (no)
     - The public API, i.e., is any changed class annotated with `@Public(Evolving)`: (no)
     - The serializers: (no)
     - The runtime per-record code paths (performance sensitive): (no)
     - Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn, ZooKeeper: (no)
     - The S3 file system connector: (no)
   
   ## Documentation
   
     - Does this pull request introduce a new feature? (no)
     - If yes, how is the feature documented? (not documented)
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "leonardBang (via GitHub)" <gi...@apache.org>.
leonardBang merged PR #23775:
URL: https://github.com/apache/flink/pull/23775


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "Jiabao-Sun (via GitHub)" <gi...@apache.org>.
Jiabao-Sun commented on PR #23775:
URL: https://github.com/apache/flink/pull/23775#issuecomment-1823858170

   Hi @leonardBang, please help review it when you have time.
   Thanks.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "flinkbot (via GitHub)" <gi...@apache.org>.
flinkbot commented on PR #23775:
URL: https://github.com/apache/flink/pull/23775#issuecomment-1823224922

   <!--
   Meta data
   {
     "version" : 1,
     "metaDataEntries" : [ {
       "hash" : "3116ca29e1ad846e72153e34fa1fb727b4891795",
       "status" : "UNKNOWN",
       "url" : "TBD",
       "triggerID" : "3116ca29e1ad846e72153e34fa1fb727b4891795",
       "triggerType" : "PUSH"
     } ]
   }-->
   ## CI report:
   
   * 3116ca29e1ad846e72153e34fa1fb727b4891795 UNKNOWN
   
   <details>
   <summary>Bot commands</summary>
     The @flinkbot bot supports the following commands:
   
    - `@flinkbot run azure` re-run the last Azure build
   </details>


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "Jiabao-Sun (via GitHub)" <gi...@apache.org>.
Jiabao-Sun commented on code in PR #23775:
URL: https://github.com/apache/flink/pull/23775#discussion_r1403027595


##########
flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSinkITCase.scala:
##########
@@ -255,7 +253,7 @@ class TableSinkITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
       "+I[jason, 1, null, null, null, null]",
       "+I[jason, 1, null, null, null, null]"
     )
-    assertEquals(expected.sorted, result.sorted)
+    assertThat(result.sorted).isEqualTo(expected.sorted)

Review Comment:
   Currently, it is very difficult to remove JUnit4 because its dependency is imported from `flink-parent`. To remove the dependency, it may be necessary to declare JUnit4 as `optional` in `flink-parent` and then add JUnit4 dependency to the submodules as needed.
   
   To avoid adding JUnit 4 tests in the `flink-table-planner` module, I'm wondering if we can add `ArchUnit` rules as a transitional solution.
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "leonardBang (via GitHub)" <gi...@apache.org>.
leonardBang commented on code in PR #23775:
URL: https://github.com/apache/flink/pull/23775#discussion_r1402980163


##########
flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSinkITCase.scala:
##########
@@ -255,7 +253,7 @@ class TableSinkITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
       "+I[jason, 1, null, null, null, null]",
       "+I[jason, 1, null, null, null, null]"
     )
-    assertEquals(expected.sorted, result.sorted)
+    assertThat(result.sorted).isEqualTo(expected.sorted)

Review Comment:
   Could we remove junit4 dependency in table-planner to make sure we have migrated all tests ?



##########
flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentITCase.scala:
##########
@@ -76,7 +76,7 @@ class TableEnvironmentITCase(tableEnvName: String, isStreaming: Boolean) extends
     TestTableSourceSinks.createPersonCsvTemporaryTable(tEnv, "MyTable")
   }
 
-  @Test
+  @TestTemplate

Review Comment:
   I found some tests use `TestTemplate` annotation with `ParameterizedTestExtension`,some tests use  `Test` annotation with `ParameterizedTestExtension`, IIUC, we should use `TestTemplate` for all tests with `ParameterizedTestExtension`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "leonardBang (via GitHub)" <gi...@apache.org>.
leonardBang commented on code in PR #23775:
URL: https://github.com/apache/flink/pull/23775#discussion_r1403333445


##########
flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSinkITCase.scala:
##########
@@ -255,7 +253,7 @@ class TableSinkITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
       "+I[jason, 1, null, null, null, null]",
       "+I[jason, 1, null, null, null, null]"
     )
-    assertEquals(expected.sorted, result.sorted)
+    assertThat(result.sorted).isEqualTo(expected.sorted)

Review Comment:
   Your detailed explanation makes sense to me. +1



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] [FLINK-33619][table-planner][JUnit5 Migration] Module: flink-table-planner (Remaining Tests) [flink]

Posted by "Jiabao-Sun (via GitHub)" <gi...@apache.org>.
Jiabao-Sun commented on code in PR #23775:
URL: https://github.com/apache/flink/pull/23775#discussion_r1402974265


##########
flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/UnsupportedOpsValidationTest.scala:
##########
@@ -18,68 +18,87 @@
 package org.apache.flink.table.planner.plan.stream.table.validation
 
 import org.apache.flink.api.scala._
+import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration
 import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
 import org.apache.flink.table.api._
 import org.apache.flink.table.api.bridge.scala._
 import org.apache.flink.table.planner.runtime.utils.TestData
 import org.apache.flink.table.planner.utils.TableTestUtil
-import org.apache.flink.test.util.AbstractTestBase
+import org.apache.flink.test.junit5.MiniClusterExtension
 
-import org.junit.Test
+import org.assertj.core.api.Assertions.assertThatThrownBy
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
 
-class UnsupportedOpsValidationTest extends AbstractTestBase {
+class UnsupportedOpsValidationTest {
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testJoin(): Unit = {
     val env = StreamExecutionEnvironment.getExecutionEnvironment
     val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
     val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
     val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
-    t1.join(t2)
+
+    assertThatThrownBy(() => t1.join(t2)).isInstanceOf(classOf[ValidationException])
   }
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testUnion(): Unit = {
     val env = StreamExecutionEnvironment.getExecutionEnvironment
     val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
     val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
     val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
-    t1.union(t2)
+
+    assertThatThrownBy(() => t1.union(t2)).isInstanceOf(classOf[ValidationException])
   }
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testIntersect(): Unit = {
     val env = StreamExecutionEnvironment.getExecutionEnvironment
     val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
     val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
     val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
-    t1.intersect(t2)
+
+    assertThatThrownBy(() => t1.intersect(t2)).isInstanceOf(classOf[ValidationException])
   }
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testIntersectAll(): Unit = {
     val env = StreamExecutionEnvironment.getExecutionEnvironment
     val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
     val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
     val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
-    t1.intersectAll(t2)
+
+    assertThatThrownBy(() => t1.intersectAll(t2)).isInstanceOf(classOf[ValidationException])
   }
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testMinus(): Unit = {
     val env = StreamExecutionEnvironment.getExecutionEnvironment
     val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
     val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
     val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
-    t1.minus(t2)
+
+    assertThatThrownBy(() => t1.minus(t2)).isInstanceOf(classOf[ValidationException])
   }
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testMinusAll(): Unit = {
     val env = StreamExecutionEnvironment.getExecutionEnvironment
     val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
     val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
     val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
-    t1.minusAll(t2)
+
+    assertThatThrownBy(() => t1.minusAll(t2)).isInstanceOf(classOf[ValidationException])
   }
 }
+
+object UnsupportedOpsValidationTest extends UnsupportedOpsValidationTest {

Review Comment:
   ```suggestion
   object UnsupportedOpsValidationTest {
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org