This is an automated email from the ASF dual-hosted git repository. godfrey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit ed9ee279e50781b7bd2d85f1486721c02fc7e32b Author: Yuxin Tan <[email protected]> AuthorDate: Wed Apr 19 14:27:31 2023 +0800 [FLINK-30815][tests] Migrate BatchTestBase to junit5 This closes #22427 --- .../runtime/batch/sql/TimestampITCase.scala | 3 +- .../planner/runtime/utils/BatchTestBase.scala | 50 +++++++++++++--------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TimestampITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TimestampITCase.scala index c9e100da1ce..d97c68c0211 100644 --- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TimestampITCase.scala +++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TimestampITCase.scala @@ -24,7 +24,7 @@ import org.apache.flink.table.planner.utils.DateTimeTestUtil._ import org.apache.flink.table.planner.utils.TestDataTypeTableSource import org.apache.flink.types.Row -import org.junit.Test +import org.junit.jupiter.api.{BeforeEach, Test} import java.sql.Timestamp import java.time.{Instant, ZoneId} @@ -33,6 +33,7 @@ import scala.collection.mutable class TimestampITCase extends BatchTestBase { + @BeforeEach override def before(): Unit = { super.before() diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/BatchTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/BatchTestBase.scala index 1f47933f407..c1c74c69901 100644 --- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/BatchTestBase.scala +++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/BatchTestBase.scala @@ -51,8 +51,8 @@ import org.apache.calcite.rel.RelNode import org.apache.calcite.runtime.CalciteContextException import org.apache.calcite.sql.SqlExplainLevel import org.apache.calcite.sql.parser.SqlParseException -import org.junit.{After, Assert, Before} -import org.junit.Assert._ +import org.assertj.core.api.Assertions.fail +import org.junit.jupiter.api.{AfterEach, BeforeEach} class BatchTestBase extends BatchAbstractTestBase { @@ -73,12 +73,12 @@ class BatchTestBase extends BatchAbstractTestBase { + " column ([0-9]+) to line ([0-9]+), column ([0-9]+): (.*)") @throws(classOf[Exception]) - @Before + @BeforeEach def before(): Unit = { BatchTestBase.configForMiniCluster(tableConfig) } - @After + @AfterEach def after(): Unit = { TestValuesTableFactory.clearAllData() } @@ -146,12 +146,12 @@ class BatchTestBase extends BatchAbstractTestBase { checkFunc(result).foreach { results => val plan = explainLogical(table) - Assert.fail(s""" - |Results do not match for query: - | $sqlQuery - |$results - |Plan: - | $plan + fail(s""" + |Results do not match for query: + | $sqlQuery + |$results + |Plan: + | $plan """.stripMargin) } } @@ -162,11 +162,11 @@ class BatchTestBase extends BatchAbstractTestBase { checkFunc(result).foreach { results => val plan = explainLogical(table) - Assert.fail(s""" - |Results do not match: - |$results - |Plan: - | $plan + fail(s""" + |Results do not match: + |$results + |Plan: + | $plan """.stripMargin) } } @@ -295,9 +295,9 @@ class BatchTestBase extends BatchAbstractTestBase { checkEmpty(result).foreach { results => - Assert.fail(s""" - |Results do not match for query: - |$results + fail(s""" + |Results do not match for query: + |$results """.stripMargin) } } @@ -478,7 +478,10 @@ object BatchTestBase { } def binaryRow(types: Array[LogicalType], fields: Any*): BinaryRowData = { - assertEquals("Filed count inconsistent with type information", fields.length, types.length) + // TODO, replace the failure check with a new and simpler checking method + if (fields.length != types.length) { + fail("Filed count inconsistent with type information") + } val row = new BinaryRowData(fields.length) val writer = new BinaryRowWriter(row) writer.reset() @@ -528,10 +531,15 @@ object BatchTestBase { s"and received ${resultStrings.length}\n " + s"expected: ${expectedStrings.mkString}\n " + s"received: ${resultStrings.mkString}" - assertEquals(msg, expectedStrings.length, resultStrings.length) + // TODO, replace these two failure checks with new and simpler checking methods + if (expectedStrings.length != resultStrings.length) { + fail(msg) + } expectedStrings.zip(resultStrings).foreach { case (e, r) => - assertEquals(msg, e, r) + if (e != r) { + fail(msg) + } } }
