From 3423dbf6ac53b46a2043dce8ebac822d1d7a2ff2 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 26 Jul 2019 18:07:57 -0700 Subject: [PATCH] Add transaction manager in Spring Data jdbc tests See gh-17654 --- .../jdbc/JdbcRepositoriesAutoConfigurationTests.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java index 8a01c7d7c27..e419b96bab6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage; import org.springframework.boot.autoconfigure.data.jdbc.city.City; import org.springframework.boot.autoconfigure.data.jdbc.city.CityRepository; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -65,8 +66,8 @@ class JdbcRepositoriesAutoConfigurationTests { @Test void basicAutoConfiguration() { this.contextRunner - .withConfiguration( - AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, DataSourceAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, + DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class)) .withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.datasource.schema=classpath:data-jdbc-schema.sql", "spring.datasource.data=classpath:city.sql", "spring.datasource.generate-unique-name:true") @@ -90,8 +91,8 @@ class JdbcRepositoriesAutoConfigurationTests { @Test void honoursUsersEnableJdbcRepositoriesConfiguration() { this.contextRunner - .withConfiguration( - AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, DataSourceAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, + DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class)) .withUserConfiguration(EnableRepositoriesConfiguration.class, EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.datasource.schema=classpath:data-jdbc-schema.sql", "spring.datasource.data=classpath:city.sql", "spring.datasource.generate-unique-name:true")