This is an automated email from the ASF dual-hosted git repository. mapohl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push: new f3a00d85006 [FLINK-28070][tests] Migrate ScalaAPICompletenessTestBase to Junit5 f3a00d85006 is described below commit f3a00d85006885302a1048f9bcea259ef3fa2448 Author: Sergey Nuyanzin <snuyan...@gmail.com> AuthorDate: Wed Jun 15 07:51:58 2022 +0200 [FLINK-28070][tests] Migrate ScalaAPICompletenessTestBase to Junit5 --- .../apache/flink/cep/scala/CEPScalaAPICompletenessTest.scala | 2 +- .../cep/scala/pattern/PatternScalaAPICompletenessTest.scala | 2 +- .../flink/graph/scala/test/GellyScalaAPICompletenessTest.scala | 2 +- .../api/scala/completeness/BatchScalaAPICompletenessTest.scala | 2 +- .../api/scala/completeness/ScalaAPICompletenessTestBase.scala | 10 ++++++---- .../api/scala/StreamingScalaAPICompletenessTest.scala | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/CEPScalaAPICompletenessTest.scala b/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/CEPScalaAPICompletenessTest.scala index 01fab9908d3..43ff5e03a6e 100644 --- a/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/CEPScalaAPICompletenessTest.scala +++ b/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/CEPScalaAPICompletenessTest.scala @@ -20,7 +20,7 @@ package org.apache.flink.cep.scala import org.apache.flink.api.scala.completeness.ScalaAPICompletenessTestBase import org.apache.flink.cep.{PatternStream => JPatternStream} -import org.junit.Test +import org.junit.jupiter.api.Test import java.lang.reflect.Method diff --git a/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/pattern/PatternScalaAPICompletenessTest.scala b/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/pattern/PatternScalaAPICompletenessTest.scala index 941553eadc7..d57ea0d1e7e 100644 --- a/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/pattern/PatternScalaAPICompletenessTest.scala +++ b/flink-libraries/flink-cep-scala/src/test/scala/org/apache/flink/cep/scala/pattern/PatternScalaAPICompletenessTest.scala @@ -20,7 +20,7 @@ package org.apache.flink.cep.scala.pattern import org.apache.flink.api.scala.completeness.ScalaAPICompletenessTestBase import org.apache.flink.cep.pattern.{Pattern => JPattern} -import org.junit.Test +import org.junit.jupiter.api.Test import java.lang.reflect.Method diff --git a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala index 7feb83bb421..3c5bf8c72b7 100644 --- a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala +++ b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala @@ -21,7 +21,7 @@ import org.apache.flink.api.scala.completeness.ScalaAPICompletenessTestBase import org.apache.flink.graph.{Graph => JavaGraph} import org.apache.flink.graph.scala._ -import org.junit.Test +import org.junit.jupiter.api.Test import java.lang.reflect.Method diff --git a/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/BatchScalaAPICompletenessTest.scala b/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/BatchScalaAPICompletenessTest.scala index 2fd32de4c86..52d67bf9405 100644 --- a/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/BatchScalaAPICompletenessTest.scala +++ b/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/BatchScalaAPICompletenessTest.scala @@ -21,7 +21,7 @@ import org.apache.flink.api.java.{DataSet => JavaDataSet} import org.apache.flink.api.java.operators._ import org.apache.flink.api.scala._ -import org.junit.Test +import org.junit.jupiter.api.Test import java.lang.reflect.Method diff --git a/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/ScalaAPICompletenessTestBase.scala b/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/ScalaAPICompletenessTestBase.scala index cbf5abc7f62..c3e5fffb927 100644 --- a/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/ScalaAPICompletenessTestBase.scala +++ b/flink-scala/src/test/scala/org/apache/flink/api/scala/completeness/ScalaAPICompletenessTestBase.scala @@ -17,10 +17,11 @@ */ package org.apache.flink.api.scala.completeness -import org.apache.flink.util.TestLogger +import org.apache.flink.util.TestLoggerExtension -import org.junit.Assert._ -import org.junit.Test +import org.assertj.core.api.Assertions.fail +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith import java.lang.reflect.Method @@ -34,7 +35,8 @@ import scala.language.existentials * * Note: This is inspired by the JavaAPICompletenessChecker from Spark. */ -abstract class ScalaAPICompletenessTestBase extends TestLogger { +@ExtendWith(Array(classOf[TestLoggerExtension])) +abstract class ScalaAPICompletenessTestBase { /** Determines whether a method is excluded by name. */ protected def isExcludedByName(method: Method): Boolean diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingScalaAPICompletenessTest.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingScalaAPICompletenessTest.scala index 58863749d2b..22f12738a0a 100644 --- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingScalaAPICompletenessTest.scala +++ b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/StreamingScalaAPICompletenessTest.scala @@ -20,7 +20,7 @@ package org.apache.flink.streaming.api.scala import org.apache.flink.api.scala.completeness.ScalaAPICompletenessTestBase import org.apache.flink.streaming.api.datastream.{DataStream => JavaStream} -import org.junit.Test +import org.junit.jupiter.api.Test import java.lang.reflect.Method