root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-35362
This commit is contained in:
Andy Wilkinson 2023-05-09 12:24:04 +01:00
parent c00e6ebbdf 6c1c8fb405
commit 2b6b178560
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
View File

@ -38,6 +38,7 @@ import static org.mockito.Mockito.mock;
* @author Dave Syer
* @author Stephane Nicoll
* @author Kazuki Shimizu
* @author Davin Byeon
*/
class DataSourceTransactionManagerAutoConfigurationTests {
@ -76,9 +77,10 @@ class DataSourceTransactionManagerAutoConfigurationTests {
@Test
void transactionManagerWithExistingTransactionManagerIsNotOverridden() {
this.contextRunner
this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
.withBean("myTransactionManager", TransactionManager.class, () -> mock(TransactionManager.class))
.run((context) -> assertThat(context).hasSingleBean(TransactionManager.class)
.run((context) -> assertThat(context).hasSingleBean(DataSource.class)
.hasSingleBean(TransactionManager.class)
.hasBean("myTransactionManager"));
}