Skip to content

Commit 2c621f4

Browse files
committed
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
1 parent 825dd0a commit 2c621f4

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ org.springframework.boot.test.autoconfigure.restdocs.RestDocsAutoConfiguration
3939

4040
# AutoConfigureTestDatabase auto-configuration imports
4141
org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureTestDatabase=\
42-
org.springframework.boot.test.autoconfigure.orm.jpa.TestDatabaseAutoConfiguration
42+
org.springframework.boot.test.autoconfigure.orm.jpa.TestDatabaseAutoConfiguration,\
43+
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
4344

4445
# AutoConfigureTestEntityManager auto-configuration imports
4546
org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureTestEntityManager=\

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.boot.test.autoconfigure.orm.jpa;
1818

19+
import javax.sql.DataSource;
20+
1921
import org.junit.Test;
2022
import org.junit.runner.RunWith;
2123

@@ -42,6 +44,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests {
4244
public void testContextLoades() throws Exception {
4345
// gh-6897
4446
assertThat(this.context).isNotNull();
47+
assertThat(this.context.getBeanNamesForType(DataSource.class)).isNotEmpty();
4548
}
4649

4750
@TestConfiguration

0 commit comments

Comments
 (0)