[hotfix][test-utils-junit] Improve exception assertions

akalash · Apr 1, 2022 · f9f4284 · f9f4284
1 parent 39854d1
commit f9f4284
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 46 deletions.
diff --git a/.../java/org/apache/flink/streaming/connectors/kafka/table/KafkaDynamicTableFactoryTest.java b/.../java/org/apache/flink/streaming/connectors/kafka/table/KafkaDynamicTableFactoryTest.java
@@ -93,7 +93,7 @@
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
 
-import static org.apache.flink.core.testutils.FlinkAssertions.containsCause;
+import static org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches;
 import static org.apache.flink.streaming.connectors.kafka.table.KafkaConnectorOptionsUtil.AVRO_CONFLUENT;
 import static org.apache.flink.streaming.connectors.kafka.table.KafkaConnectorOptionsUtil.DEBEZIUM_AVRO_CONFLUENT;
 import static org.apache.flink.streaming.connectors.kafka.table.KafkaConnectorOptionsUtil.PROPERTIES_PREFIX;
@@ -744,9 +744,9 @@ public void testSourceTableWithTopicAndTopicPattern() {
                         })
                 .isInstanceOf(ValidationException.class)
                 .satisfies(
-                        containsCause(
-                                new ValidationException(
-                                        "Option 'topic' and 'topic-pattern' shouldn't be set together.")));
+                        anyCauseMatches(
+                                ValidationException.class,
+                                "Option 'topic' and 'topic-pattern' shouldn't be set together."));
     }
 
     @Test
@@ -763,10 +763,10 @@ public void testMissingStartupTimestamp() {
                         })
                 .isInstanceOf(ValidationException.class)
                 .satisfies(
-                        containsCause(
-                                new ValidationException(
-                                        "'scan.startup.timestamp-millis' "
-                                                + "is required in 'timestamp' startup mode but missing.")));
+                        anyCauseMatches(
+                                ValidationException.class,
+                                "'scan.startup.timestamp-millis' "
+                                        + "is required in 'timestamp' startup mode but missing."));
     }
 
     @Test
@@ -784,10 +784,10 @@ public void testMissingSpecificOffsets() {
                         })
                 .isInstanceOf(ValidationException.class)
                 .satisfies(
-                        containsCause(
-                                new ValidationException(
-                                        "'scan.startup.specific-offsets' "
-                                                + "is required in 'specific-offsets' startup mode but missing.")));
+                        anyCauseMatches(
+                                ValidationException.class,
+                                "'scan.startup.specific-offsets' "
+                                        + "is required in 'specific-offsets' startup mode but missing."));
     }
 
     @Test
@@ -803,10 +803,9 @@ public void testInvalidSinkPartitioner() {
                         })
                 .isInstanceOf(ValidationException.class)
                 .satisfies(
-                        containsCause(
-                                new ValidationException(
-                                        "Could not find and instantiate partitioner "
-                                                + "class 'abc'")));
+                        anyCauseMatches(
+                                ValidationException.class,
+                                "Could not find and instantiate partitioner " + "class 'abc'"));
     }
 
     @Test
@@ -823,10 +822,10 @@ public void testInvalidRoundRobinPartitionerWithKeyFields() {
                         })
                 .isInstanceOf(ValidationException.class)
                 .satisfies(
-                        containsCause(
-                                new ValidationException(
-                                        "Currently 'round-robin' partitioner only works "
-                                                + "when option 'key.fields' is not specified.")));
+                        anyCauseMatches(
+                                ValidationException.class,
+                                "Currently 'round-robin' partitioner only works "
+                                        + "when option 'key.fields' is not specified."));
     }
 
     @Test
@@ -850,9 +849,9 @@ public void testExactlyOnceGuaranteeWithoutTransactionalIdPrefix() {
                         })
                 .isInstanceOf(ValidationException.class)
                 .satisfies(
-                        containsCause(
-                                new ValidationException(
-                                        "sink.transactional-id-prefix must be specified when using DeliveryGuarantee.EXACTLY_ONCE.")));
+                        anyCauseMatches(
+                                ValidationException.class,
+                                "sink.transactional-id-prefix must be specified when using DeliveryGuarantee.EXACTLY_ONCE."));
     }
 
     @Test

diff --git a/...-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcActorTest.java b/...-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcActorTest.java
@@ -430,7 +430,9 @@ void testOnStartFails() throws Exception {
         onStartEndpoint.awaitUntilOnStartCalled();
 
         assertThatThrownBy(() -> onStartEndpoint.getTerminationFuture().get())
-                .satisfies(FlinkAssertions.containsCause(testException));
+                .satisfies(
+                        FlinkAssertions.anyCauseMatches(
+                                testException.getClass(), testException.getMessage()));
     }
 
     /**

diff --git a/...flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/FlinkAssertions.java b/...flink-test-utils-junit/src/main/java/org/apache/flink/core/testutils/FlinkAssertions.java
@@ -57,35 +57,16 @@ public static ThrowingConsumer<? super Throwable> anyCauseMatches(
             Class<? extends Throwable> clazz, String containsMessage) {
         return t ->
                 assertThatChainOfCauses(t)
+                        .as(
+                                "Any cause is instance of class '%s' and contains message '%s'",
+                                clazz, containsMessage)
                         .anySatisfy(
                                 cause ->
                                         assertThat(cause)
                                                 .isInstanceOf(clazz)
                                                 .hasMessageContaining(containsMessage));
     }
 
-    /**
-     * Shorthand to assert the chain of causes includes a specific {@link Throwable}. Same as:
-     *
-     * <pre>{@code
-     * assertThatChainOfCauses(t)
-     *     .anySatisfy(
-     *          cause ->
-     *              assertThat(cause)
-     *                  .isInstanceOf(throwable.getClass())
-     *                  .hasMessage(throwable.getMessage()));
-     * }</pre>
-     */
-    public static ThrowingConsumer<? super Throwable> containsCause(Throwable throwable) {
-        return t ->
-                assertThatChainOfCauses(t)
-                        .anySatisfy(
-                                cause ->
-                                        assertThat(cause)
-                                                .isInstanceOf(throwable.getClass())
-                                                .hasMessage(throwable.getMessage()));
-    }
-
     /**
      * Shorthand to assert the chain of causes includes a {@link Throwable} matching a specific
      * {@link Class}. Same as:
@@ -102,6 +83,7 @@ public static ThrowingConsumer<? super Throwable> anyCauseMatches(
             Class<? extends Throwable> clazz) {
         return t ->
                 assertThatChainOfCauses(t)
+                        .as("Any cause is instance of class '%s'", clazz)
                         .anySatisfy(cause -> assertThat(cause).isInstanceOf(clazz));
     }
 
@@ -120,6 +102,7 @@ public static ThrowingConsumer<? super Throwable> anyCauseMatches(
     public static ThrowingConsumer<? super Throwable> anyCauseMatches(String containsMessage) {
         return t ->
                 assertThatChainOfCauses(t)
+                        .as("Any cause contains message '%s'", containsMessage)
                         .anySatisfy(t1 -> assertThat(t1).hasMessageContaining(containsMessage));
     }