diff --git a/src/test/java/org/springframework/data/redis/test/condition/EnabledOnCommandCondition.java b/src/test/java/org/springframework/data/redis/test/condition/EnabledOnCommandCondition.java index 9d5887ec63..58d55ac03c 100644 --- a/src/test/java/org/springframework/data/redis/test/condition/EnabledOnCommandCondition.java +++ b/src/test/java/org/springframework/data/redis/test/condition/EnabledOnCommandCondition.java @@ -33,6 +33,7 @@ * @see EnabledOnCommandCondition * @author Mark Paluch * @author Christoph Strobl + * @author Heramb Joshi */ class EnabledOnCommandCondition implements ExecutionCondition { @@ -55,9 +56,11 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con ExtensionContext.Store store = context.getRoot().getStore(NAMESPACE); RedisConditions conditions = store.getOrComputeIfAbsent(RedisConditions.class, ignore -> { - - try (StatefulRedisConnection connection = lettuceExtension.resolve(context, StatefulRedisConnection.class)) { + try { + StatefulRedisConnection connection = lettuceExtension.resolve(context, StatefulRedisConnection.class); return RedisConditions.of(connection); + } catch (Exception e) { + return RedisConditions.emptyConnection(); } }, RedisConditions.class); diff --git a/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java b/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java index 003ade86cd..36efe8c68b 100644 --- a/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java +++ b/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java @@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -35,6 +36,7 @@ * Collection of utility methods to test conditions during test execution. * * @author Mark Paluch + * @author Heramb Joshi */ class RedisConditions { @@ -62,6 +64,19 @@ private RedisConditions(RedisClusterCommands<String, String> commands) { } } + private RedisConditions(){ + commands = new HashMap<>(); + version = new Version(1); + } + + /** + * Create empty {@link RedisConditions}. + * + * @return + */public static RedisConditions emptyConnection() { + return new RedisConditions(); + } + /** * Create {@link RedisCommands} given {@link StatefulRedisConnection}. *