Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Simon Baslé
2024-09-24 11:01:57 +02:00
parent 5bc2ff70b5 7df9db3bb7
commit f7aa4409bb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
View File

@@ -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<Void> allOf = CompletableFuture.allOf(future1, future2);
assertThatNoException().isThrownBy(allOf::join);
}
private void testNonBlockingTask(NonBlockingTask task) {