Skip to content

Commit 6d0f4d2

Browse files
committed
Polishing.
Ensure completion of all conditions to avoid races in subsequent assertions. See: #3236 Original Pull Request: #3243
1 parent 959637b commit 6d0f4d2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/test/java/org/springframework/data/redis/cache/DefaultRedisCacheWriterTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
*/
1616
package org.springframework.data.redis.cache;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.assertj.core.api.Assumptions.assumeThat;
20-
import static org.springframework.data.redis.cache.RedisCacheWriter.RedisCacheWriterConfigurer;
21-
import static org.springframework.data.redis.cache.RedisCacheWriter.TtlFunction;
22-
import static org.springframework.data.redis.cache.RedisCacheWriter.lockingRedisCacheWriter;
23-
import static org.springframework.data.redis.cache.RedisCacheWriter.nonLockingRedisCacheWriter;
18+
import static org.assertj.core.api.Assertions.*;
19+
import static org.assertj.core.api.Assumptions.*;
20+
import static org.springframework.data.redis.cache.RedisCacheWriter.*;
2421

2522
import java.nio.charset.StandardCharsets;
2623
import java.time.Duration;
@@ -45,6 +42,7 @@
4542
import org.junit.jupiter.params.ParameterizedTest;
4643
import org.junit.jupiter.params.provider.Arguments;
4744
import org.junit.jupiter.params.provider.MethodSource;
45+
4846
import org.springframework.data.redis.cache.BatchStrategies.Keys;
4947
import org.springframework.data.redis.connection.RedisConnection;
5048
import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -311,6 +309,8 @@ void evictShouldNonblockingDeleteEntry() {
311309

312310
doWithConnection(connection -> {
313311
Awaitility.await().pollInSameThread().pollDelay(Duration.ZERO).until(() -> !connection.exists(binaryCacheKey));
312+
Awaitility.await().pollInSameThread().pollDelay(Duration.ZERO)
313+
.until(() -> writer.getCacheStatistics(CACHE_NAME).getDeletes() > 0);
314314
assertThat(connection.exists(binaryCacheKey)).isFalse();
315315
});
316316

0 commit comments

Comments
 (0)