From 7df9db3bb76eaa302e0ea06d7dd61b27d1103601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Basl=C3=A9?= Date: Tue, 24 Sep 2024 10:59:23 +0200 Subject: [PATCH] Polishing test Assert that BlockHound doesn't trigger, rather than assertions on a condition that makes the test flakky because concurrency is involved. --- .../core/SpringCoreBlockHoundIntegrationTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java b/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java index 1b88dc2147..b1f868ab26 100644 --- a/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java +++ b/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java @@ -29,6 +29,7 @@ import reactor.core.scheduler.Schedulers; import org.springframework.util.ConcurrentReferenceHashMap; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.condition.JRE.JAVA_18; @@ -107,8 +108,9 @@ class SpringCoreBlockHoundIntegrationTests { } }, future2); - CompletableFuture.allOf(future1, future2).join(); - assertThat(map).isEmpty(); + //ensure blockhound doesn't trigger + final CompletableFuture allOf = CompletableFuture.allOf(future1, future2); + assertThatNoException().isThrownBy(allOf::join); } private void testNonBlockingTask(NonBlockingTask task) {