Replace calls to verifyComplete() to avoid indefinite blocking

See gh-35915
This commit is contained in:
ThomazPassarelli
2023-06-15 15:17:43 -03:00
committed by Andy Wilkinson
parent cee73cebd4
commit f9da30faf1
23 changed files with 91 additions and 64 deletions

View File

@@ -18,6 +18,7 @@ package org.springframework.boot.rsocket.netty;
import java.net.InetSocketAddress;
import java.nio.channels.ClosedChannelException;
import java.time.Duration;
import java.util.Arrays;
import java.util.concurrent.Callable;
@@ -194,7 +195,7 @@ class NettyRSocketServerFactoryTests {
private void checkEchoRequest() {
String payload = "test payload";
Mono<String> response = this.requester.route("test").data(payload).retrieveMono(String.class);
StepVerifier.create(response).expectNext(payload).verifyComplete();
StepVerifier.create(response).expectNext(payload).expectComplete().verify(Duration.ofSeconds(5));
}
private void testBasicSslWithKeyStore(String keyStore, String keyPassword, Transport transport) {

View File

@@ -110,7 +110,7 @@ class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor
void whenSslIsConfiguredWithAValidAliasARequestSucceeds() {
Mono<String> result = testSslWithAlias("test-alias");
StepVerifier.setDefaultTimeout(Duration.ofSeconds(30));
StepVerifier.create(result).expectNext("Hello World").verifyComplete();
StepVerifier.create(result).expectNext("Hello World").expectComplete().verify(Duration.ofSeconds(5));
}
@Test

View File

@@ -55,7 +55,7 @@ class MustacheViewTests {
.block(Duration.ofSeconds(30));
StepVerifier.create(exchange.getResponse().getBodyAsString())
.assertNext((body) -> assertThat(body).isEqualToIgnoringWhitespace("Hello Spring"))
.verifyComplete();
.expectComplete().verify(Duration.ofSeconds(5));
}
}

View File

@@ -194,7 +194,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
.bodyToMono(String.class);
StepVerifier.setDefaultTimeout(Duration.ofSeconds(30));
StepVerifier.create(result).expectNext("Hello World").verifyComplete();
StepVerifier.create(result).expectNext("Hello World").expectComplete().verify(Duration.ofSeconds(5));
}
@Test