Skip to content

Commit 13da659

Browse files
committed
Merge pull request #35336 from davin111
* gh-35336: Polish "Fix test for backing off when a TransactionManager is already defined" Fix test for backing off when a TransactionManager is already defined Closes gh-35336
2 parents 40a392f + 7427e2d commit 13da659

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
* @author Dave Syer
3939
* @author Stephane Nicoll
4040
* @author Kazuki Shimizu
41+
* @author Davin Byeon
4142
*/
4243
class DataSourceTransactionManagerAutoConfigurationTests {
4344

@@ -76,9 +77,10 @@ void transactionManagerWithCustomizationIsConfigured() {
7677

7778
@Test
7879
void transactionManagerWithExistingTransactionManagerIsNotOverridden() {
79-
this.contextRunner
80+
this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
8081
.withBean("myTransactionManager", TransactionManager.class, () -> mock(TransactionManager.class))
81-
.run((context) -> assertThat(context).hasSingleBean(TransactionManager.class)
82+
.run((context) -> assertThat(context).hasSingleBean(DataSource.class)
83+
.hasSingleBean(TransactionManager.class)
8284
.hasBean("myTransactionManager"));
8385
}
8486

0 commit comments

Comments
 (0)