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

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-36043
This commit is contained in:
Andy Wilkinson
2023-06-23 15:50:02 +01:00
parent de9f249ef9 7b0aa7dcbb
commit 2fae5de245
24 changed files with 159 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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;
@@ -80,7 +82,8 @@ class R2dbcRepositoriesAutoConfigurationTests {
.findById(2000L)
.as(StepVerifier::create)
.expectNextCount(1)
.verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(30));
});
}
@@ -103,7 +106,8 @@ class R2dbcRepositoriesAutoConfigurationTests {
.findById(2000L)
.as(StepVerifier::create)
.expectNextCount(1)
.verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(30));
});
}

8
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 io.r2dbc.spi.TransactionDefinition;
@@ -67,7 +69,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).verifyComplete();
bean.isTransactionActive()
.as(StepVerifier::create)
.expectNext(true)
.expectComplete()
.verify(Duration.ofSeconds(30));
});
}