You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2021/11/02 08:47:16 UTC
[flink] 01/03: [hotfix][table-planner][tests] Improve exception
assertion in BuiltInFunctionTestBase
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 a97d3695b712e6134d1fd0bd353c47c5ed3a4cd1
Author: Marios Trivyzas <ma...@gmail.com>
AuthorDate: Fri Oct 29 16:41:46 2021 +0200
[hotfix][table-planner][tests] Improve exception assertion in BuiltInFunctionTestBase
Improve assertion of TableApi exception validation.
---
.../flink/table/planner/functions/BuiltInFunctionTestBase.java | 9 ++-------
.../flink/table/planner/functions/MiscFunctionsITCase.java | 4 +++-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInFunctionTestBase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInFunctionTestBase.java
index c4586af..4ef3b01 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInFunctionTestBase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInFunctionTestBase.java
@@ -52,7 +52,6 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static java.util.Collections.singletonList;
-import static org.apache.flink.core.testutils.FlinkMatchers.containsCause;
import static org.apache.flink.core.testutils.FlinkMatchers.containsMessage;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -194,12 +193,8 @@ public abstract class BuiltInFunctionTestBase {
} catch (AssertionError e) {
throw e;
} catch (Throwable t) {
- if (testItem instanceof TableApiErrorTestItem) {
- assertThat(t, containsCause(new ValidationException(testItem.errorMessage)));
- } else {
- assertTrue(t instanceof ValidationException);
- assertThat(t.getMessage(), containsString(testItem.errorMessage));
- }
+ assertTrue(t instanceof ValidationException);
+ assertThat(t.getMessage(), containsString(testItem.errorMessage));
}
}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/MiscFunctionsITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/MiscFunctionsITCase.java
index acc6658..e7b2ab8 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/MiscFunctionsITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/MiscFunctionsITCase.java
@@ -46,7 +46,9 @@ public class MiscFunctionsITCase extends BuiltInFunctionTestBase {
"INT NOT NULL",
DataTypes.STRING())
.testTableApiValidationError(
- call("TYPEOF", $("f0"), $("f2")), "Invalid input arguments.")
+ call("TYPEOF", $("f0"), $("f2")),
+ "Invalid function call:\n"
+ + "TYPEOF(INT NOT NULL, BOOLEAN NOT NULL)")
.testSqlValidationError(
"TYPEOF(f0, f2)",
"SQL validation failed. Invalid function call:\nTYPEOF(INT NOT NULL, BOOLEAN NOT NULL)")