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

Polish "Replace calls to verifyComplete() to avoid indefinite blocking"

Browse Source 
See gh-35915
This commit is contained in:
Andy Wilkinson
2023-06-23 12:17:07 +01:00
parent f9da30faf1
commit d2966e1cbf
25 changed files with 159 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java
View File

@@ -16,6 +16,8 @@
package smoketest.data.r2dbc;
import java.time.Duration;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
@@ -28,8 +30,6 @@ import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -62,7 +62,8 @@ class CityRepositoryTests {
void databaseHasBeenInitialized() {
StepVerifier.create(this.repository.findByState("DC").filter((city) -> city.getName().equals("Washington")))
.consumeNextWith((city) -> assertThat(city.getId()).isNotNull())
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
private static String r2dbcUrl() {

7
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java
View File

@@ -16,6 +16,8 @@
package smoketest.data.r2dbc;
import java.time.Duration;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
@@ -28,8 +30,6 @@ import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -62,7 +62,8 @@ class CityRepositoryTests {
void databaseHasBeenInitialized() {
StepVerifier.create(this.repository.findByState("DC").filter((city) -> city.getName().equals("Washington")))
.consumeNextWith((city) -> assertThat(city.getId()).isNotNull())
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
private static String r2dbcUrl() {

7
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/src/test/java/smoketest/rsocket/SampleRSocketApplicationTests.java
View File

@@ -16,6 +16,8 @@
package smoketest.rsocket;
import java.time.Duration;
import io.rsocket.metadata.WellKnownMimeType;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -30,8 +32,6 @@ import org.springframework.security.rsocket.metadata.SimpleAuthenticationEncoder
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.util.MimeTypeUtils;
import java.time.Duration;
@SpringBootTest(properties = "spring.rsocket.server.port=0")
class SampleRSocketApplicationTests {
@@ -58,7 +58,8 @@ class SampleRSocketApplicationTests {
Mono<Project> result = requester.route("find.project.spring-boot").retrieveMono(Project.class);
StepVerifier.create(result)
.assertNext((project) -> Assertions.assertThat(project.getName()).isEqualTo("spring-boot"))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
}