From 2c621f4094a40e68b20c9b073f927683fd5979c4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 16 Sep 2016 16:49:36 -0700 Subject: [PATCH] Fix @AutoConfigureTestDatabase imports Update `@AutoConfigureTestDatabase` so that it always imports `DataSourceAutoConfiguration`. Prior to this commit the annotation could only be applied if something else also imported DataSource auto-configuration. Fixes gh-6897 --- .../src/main/resources/META-INF/spring.factories | 3 ++- ...utoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories index 08517da27d..ec9a19edb7 100644 --- a/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories @@ -39,7 +39,8 @@ org.springframework.boot.test.autoconfigure.restdocs.RestDocsAutoConfiguration # AutoConfigureTestDatabase auto-configuration imports org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureTestDatabase=\ -org.springframework.boot.test.autoconfigure.orm.jpa.TestDatabaseAutoConfiguration +org.springframework.boot.test.autoconfigure.orm.jpa.TestDatabaseAutoConfiguration,\ +org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration # AutoConfigureTestEntityManager auto-configuration imports org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureTestEntityManager=\ diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java index 92f4eb03c9..e181cef919 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.test.autoconfigure.orm.jpa; +import javax.sql.DataSource; + import org.junit.Test; import org.junit.runner.RunWith; @@ -42,6 +44,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests { public void testContextLoades() throws Exception { // gh-6897 assertThat(this.context).isNotNull(); + assertThat(this.context.getBeanNamesForType(DataSource.class)).isNotEmpty(); } @TestConfiguration