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

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/r2dbc/R2dbcRepositoriesAutoConfigurationTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.data.r2dbc;
import java.time.Duration;
import io.r2dbc.spi.ConnectionFactory;
import org.junit.jupiter.api.Test;
import reactor.test.StepVerifier;
@@ -39,8 +41,6 @@ import org.springframework.data.repository.Repository;
import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator;
import org.springframework.r2dbc.core.DatabaseClient;
import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -82,7 +82,8 @@ class R2dbcRepositoriesAutoConfigurationTests {
.findById(2000L)
.as(StepVerifier::create)
.expectNextCount(1)
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
});
}
@@ -105,7 +106,8 @@ class R2dbcRepositoriesAutoConfigurationTests {
.findById(2000L)
.as(StepVerifier::create)
.expectNextCount(1)
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
});
}

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcTransactionManagerAutoConfigurationTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.r2dbc;
import java.time.Duration;
import io.r2dbc.spi.Connection;
import io.r2dbc.spi.ConnectionFactory;
import org.junit.jupiter.api.Test;
@@ -33,8 +35,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.reactive.TransactionSynchronizationManager;
import org.springframework.transaction.reactive.TransactionalOperator;
import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
@@ -67,7 +67,11 @@ class R2dbcTransactionManagerAutoConfigurationTests {
this.contextRunner.withUserConfiguration(SingleConnectionFactoryConfiguration.class, BaseConfiguration.class)
.run((context) -> {
TransactionalService bean = context.getBean(TransactionalService.class);
bean.isTransactionActive().as(StepVerifier::create).expectNext(true).expectComplete().verify(Duration.ofSeconds(5));
bean.isTransactionActive()
.as(StepVerifier::create)
.expectNext(true)
.expectComplete()
.verify(Duration.ofSeconds(30));
});
}