From 0929ddbdcd21215fbc2969b55bd1958047b3be8c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 12 Aug 2020 09:14:11 +0200 Subject: [PATCH] DATAREDIS-1199 - Polishing. Improve test synchronization. --- .../connection/jedis/JedisClusterConnectionTests.java | 2 +- .../lettuce/LettuceReactiveKeyCommandsTests.java | 5 +++-- ...aultReactiveHyperLogLogOperationsIntegrationTests.java | 8 +++++++- .../StreamMessageListenerContainerIntegrationTests.java | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java index 0a53428fe..6c5203bcf 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java @@ -2346,7 +2346,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, VALUE_1_BYTES); nativeConnection.get(KEY_1_BYTES); - assertThat(clusterConnection.keyCommands().idletime(KEY_1_BYTES)).isEqualTo(Duration.ofSeconds(0)); + assertThat(clusterConnection.keyCommands().idletime(KEY_1_BYTES)).isLessThan(Duration.ofSeconds(5)); } @Test // DATAREDIS-716 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java index 5e70fe27a..6e4a978e3 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java @@ -415,8 +415,9 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest nativeCommands.set(KEY_1, "1000"); nativeCommands.get(KEY_1); - connection.keyCommands().idletime(KEY_1_BBUFFER).as(StepVerifier::create).expectNext(Duration.ofSeconds(0)) - .verifyComplete(); + connection.keyCommands().idletime(KEY_1_BBUFFER).as(StepVerifier::create).assertNext(actual -> { + assertThat(actual).isLessThan(Duration.ofSeconds(5)); + }).verifyComplete(); } @Test // DATAREDIS-716 diff --git a/src/test/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperationsIntegrationTests.java b/src/test/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperationsIntegrationTests.java index 3726b4c39..fc2f17942 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperationsIntegrationTests.java @@ -15,6 +15,8 @@ */ package org.springframework.data.redis.core; +import static org.assertj.core.api.Assertions.*; + import reactor.test.StepVerifier; import java.util.Collection; @@ -25,6 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.connection.RedisConnection; @@ -111,7 +114,10 @@ public class DefaultReactiveHyperLogLogOperationsIntegrationTests { hyperLogLogOperations.add(key2, value2, sharedValue).as(StepVerifier::create).expectNext(1L).verifyComplete(); hyperLogLogOperations.union(mergedKey, key1, key2).as(StepVerifier::create).expectNext(true).verifyComplete(); - hyperLogLogOperations.size(mergedKey).as(StepVerifier::create).expectNext(3L).verifyComplete(); + hyperLogLogOperations.size(mergedKey).as(StepVerifier::create).assertNext(actual -> { + + assertThat(actual).isBetween(2L, 3L); + }).verifyComplete(); } @Test // DATAREDIS-602 diff --git a/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java b/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java index c2b5d9d28..450420661 100644 --- a/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java @@ -278,6 +278,8 @@ public class StreamMessageListenerContainerIntegrationTests { redisTemplate.delete("my-stream"); assertThat(failures.poll(3, TimeUnit.SECONDS)).isNotNull(); + + Awaitility.await().until(() -> !subscription.isActive()); assertThat(subscription.isActive()).isFalse(); cancelAwait(subscription);