From cf5500fc78b185eeff24f10d590069373d65b0ef Mon Sep 17 00:00:00 2001 From: davin111 Date: Sat, 6 May 2023 21:05:59 +0900 Subject: [PATCH] Fix test for backing off when a TransactionManager is already defined See gh-35336 --- .../DataSourceTransactionManagerAutoConfigurationTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index a469c0495ae..0c4b6d9e26a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -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,7 +77,7 @@ 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) .hasBean("myTransactionManager"));