This is an automated email from the ASF dual-hosted git repository. dgovorukhin pushed a commit to branch gg-21479 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 1d272977220c86f030a6e3a2252f83fa1153ec34 Author: Dmitriy Govorukhin <[email protected]> AuthorDate: Sat Jul 20 10:51:21 2019 +0300 GG-21479 Validation cache start with disk compression --- ...coveryDataDeserializationFailureHanderTest.java | 3 ++- .../apache/ignite/testframework/GridTestUtils.java | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/DiscoveryDataDeserializationFailureHanderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/DiscoveryDataDeserializationFailureHanderTest.java index 0eaeb18..cf7aba9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/DiscoveryDataDeserializationFailureHanderTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/DiscoveryDataDeserializationFailureHanderTest.java @@ -33,6 +33,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; +import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.cache.configuration.Factory; @@ -86,7 +87,7 @@ public class DiscoveryDataDeserializationFailureHanderTest extends GridCommonAbs assertTrue(latch.await(5, TimeUnit.SECONDS)); } finally { - GridTestUtils.assertThrows(log, fut::get, IgniteCheckedException.class, "Failed to start"); + GridTestUtils.assertThrows(log, (Callable<?>)fut::get, IgniteCheckedException.class, "Failed to start"); } } diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 9e341d9..8c2591c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -380,6 +380,29 @@ public final class GridTestUtils { } /** + * Checks whether runnable throws expected exception or not. + * + * @param log Logger (optional). + * @param run Runnable. + * @param cls Exception class. + * @param msg Exception message (optional). If provided exception message + * and this message should be equal. + * @return Thrown throwable. + */ + public static Throwable assertThrows( + @Nullable IgniteLogger log, + RunnableX run, + Class<? extends Throwable> cls, + @Nullable String msg + ) { + return assertThrows(log, () -> { + run.run(); + + return null; + }, cls, msg); + } + + /** * Checks whether callable throws expected exception or not. * * @param log Logger (optional).
