This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8a7a613909ae7c43f2839d11bc0ad1640329d1b0
Author: Marios Trivyzas <mat...@gmail.com>
AuthorDate: Mon Mar 28 21:06:48 2022 +0300
[hotfix][table][tests] Clean-up tests and update to assertJ
---
.../client/gateway/local/LocalExecutorITCase.java | 2 +-
.../extraction/TypeInferenceExtractorScalaTest.scala | 18 +++++++-----------
.../formats/testcsv/TestCsvDeserializationSchema.java | 1 -
.../table/planner/functions/CastFunctionITCase.java | 1 -
.../flink/table/planner/utils/DiffRepository.java | 11 ++++-------
.../flink/table/planner/utils/JsonTestUtils.java | 4 ----
.../flink/table/planner/utils/OperationMatchers.java | 3 +--
7 files changed, 13 insertions(+), 27 deletions(-)
diff --git
a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
index b061921abdc..0154db0e9a8 100644
---
a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
+++
b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
@@ -140,7 +140,7 @@ public class LocalExecutorITCase extends TestLogger {
assertThat(executor.completeStatement(sessionId, "SELECT * FROM
TableNumber1 WH", 29))
.isEqualTo(expectedClause);
- final List<String> expectedField = Arrays.asList("IntegerField1");
+ final List<String> expectedField =
Collections.singletonList("IntegerField1");
assertThat(
executor.completeStatement(
sessionId, "SELECT * FROM TableNumber1 WHERE
Inte", 37))
diff --git
a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/types/extraction/TypeInferenceExtractorScalaTest.scala
b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/types/extraction/TypeInferenceExtractorScalaTest.scala
index c820963a034..c1050daf6c4 100644
---
a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/types/extraction/TypeInferenceExtractorScalaTest.scala
+++
b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/types/extraction/TypeInferenceExtractorScalaTest.scala
@@ -23,9 +23,8 @@ import org.apache.flink.table.functions.ScalarFunction
import
org.apache.flink.table.types.extraction.TypeInferenceExtractorTest.TestSpec
import org.apache.flink.table.types.inference.{ArgumentTypeStrategy,
InputTypeStrategies, TypeStrategies}
-import org.hamcrest.CoreMatchers.equalTo
+import org.assertj.core.api.AssertionsForClassTypes.assertThat
import org.junit.{Rule, Test}
-import org.junit.Assert.assertThat
import org.junit.rules.ExpectedException
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@@ -46,27 +45,24 @@ class TypeInferenceExtractorScalaTest(testSpec: TestSpec) {
@Test
def testArgumentNames(): Unit = {
if (testSpec.expectedArgumentNames != null) {
- assertThat(
- testSpec.typeInferenceExtraction.get.getNamedArguments,
- equalTo(Optional.of(testSpec.expectedArgumentNames)))
+ assertThat(testSpec.typeInferenceExtraction.get.getNamedArguments)
+ .isEqualTo(Optional.of(testSpec.expectedArgumentNames))
}
}
@Test
def testArgumentTypes(): Unit = {
if (testSpec.expectedArgumentTypes != null) {
- assertThat(
- testSpec.typeInferenceExtraction.get.getTypedArguments,
- equalTo(Optional.of(testSpec.expectedArgumentTypes)))
+ assertThat(testSpec.typeInferenceExtraction.get.getTypedArguments)
+ .isEqualTo(Optional.of(testSpec.expectedArgumentTypes))
}
}
@Test
def testOutputTypeStrategy(): Unit = {
if (!testSpec.expectedOutputStrategies.isEmpty) {
- assertThat(
- testSpec.typeInferenceExtraction.get.getOutputTypeStrategy,
- equalTo(TypeStrategies.mapping(testSpec.expectedOutputStrategies)))
+ assertThat(testSpec.typeInferenceExtraction.get.getOutputTypeStrategy)
+ .isEqualTo(TypeStrategies.mapping(testSpec.expectedOutputStrategies))
}
}
}
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/formats/testcsv/TestCsvDeserializationSchema.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/formats/testcsv/TestCsvDeserializationSchema.java
index 1569e0d5047..975c8a6a23d 100644
---
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/formats/testcsv/TestCsvDeserializationSchema.java
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/formats/testcsv/TestCsvDeserializationSchema.java
@@ -83,7 +83,6 @@ class TestCsvDeserializationSchema implements
DeserializationSchema<RowData> {
initFieldParsers();
}
- @SuppressWarnings("unchecked")
@Override
public RowData deserialize(byte[] message) throws IOException {
GenericRowData row = new GenericRowData(physicalFieldCount);
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/CastFunctionITCase.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/CastFunctionITCase.java
index 894699b9f9a..e737366d450 100644
---
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/CastFunctionITCase.java
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/CastFunctionITCase.java
@@ -1220,7 +1220,6 @@ public class CastFunctionITCase extends
BuiltInFunctionTestBase {
private final List<Object> columnData = new ArrayList<>();
private final List<DataType> columnTypes = new ArrayList<>();
private final List<Object> expectedValues = new ArrayList<>();
- private final List<Class<? extends Throwable>> expectedFailureClasses
= new ArrayList<>();
private final List<TestType> testTypes = new ArrayList<>();
private enum TestType {
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/DiffRepository.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/DiffRepository.java
index 5982b21773f..52c3077b9d5 100644
---
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/DiffRepository.java
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/DiffRepository.java
@@ -185,7 +185,7 @@ public class DiffRepository {
* share the same diff-repository: if the repository gets loaded once per
test case, then only
* one diff is recorded.
*/
- private static final Map<Class, DiffRepository> MAP_CLASS_TO_REPOSITORY =
new HashMap<>();
+ private static final Map<Class<?>, DiffRepository> MAP_CLASS_TO_REPOSITORY
= new HashMap<>();
// ~ Instance fields
--------------------------------------------------------
@@ -599,9 +599,6 @@ public class DiffRepository {
Node child = childNodes.item(i);
writeNode(child, out);
}
-
- // writeNode(((Document) node).getDocumentElement(),
- // out);
break;
case Node.ELEMENT_NODE:
@@ -678,7 +675,7 @@ public class DiffRepository {
* @param clazz Test case class
* @return The diff repository shared between test cases in this class.
*/
- public static DiffRepository lookup(Class clazz) {
+ public static DiffRepository lookup(Class<?> clazz) {
return lookup(clazz, null);
}
@@ -689,7 +686,7 @@ public class DiffRepository {
* @param baseRepository Base class of test class
* @return The diff repository shared between test cases in this class.
*/
- public static DiffRepository lookup(Class clazz, DiffRepository
baseRepository) {
+ public static DiffRepository lookup(Class<?> clazz, DiffRepository
baseRepository) {
return lookup(clazz, baseRepository, null);
}
@@ -716,7 +713,7 @@ public class DiffRepository {
* @return The diff repository shared between test cases in this class.
*/
public static synchronized DiffRepository lookup(
- Class clazz, DiffRepository baseRepository, Filter filter) {
+ Class<?> clazz, DiffRepository baseRepository, Filter filter) {
DiffRepository diffRepository = MAP_CLASS_TO_REPOSITORY.get(clazz);
if (diffRepository == null) {
final URL refFile = findFile(clazz, ".xml");
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
index f22ae56558d..682f3b3e656 100644
---
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
@@ -41,8 +41,4 @@ public final class JsonTestUtils {
return ((ObjectNode) target)
.set("flinkVersion",
OBJECT_MAPPER_INSTANCE.valueToTree(flinkVersion.toString()));
}
-
- public static JsonNode clearFlinkVersion(JsonNode target) {
- return ((ObjectNode) target).remove("flinkVersion");
- }
}
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/OperationMatchers.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/OperationMatchers.java
index d1d711a13b2..f2ee9d2f79f 100644
---
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/OperationMatchers.java
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/OperationMatchers.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.planner.utils;
import org.apache.flink.table.api.Schema;
-import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.operations.Operation;
import org.apache.flink.table.operations.ddl.CreateTableOperation;
@@ -68,7 +67,7 @@ public class OperationMatchers {
*
* @param nestedMatchers additional matchers that must match
* @see #withOptions(MapEntry[])
- * @see #withSchema(TableSchema)
+ * @see #withSchema(Schema)
* @see #partitionedBy(String...)
*/
@SafeVarargs
