Skip to content

Commit 9d0e1a2

Browse files
committed
Include SQL init auto-config in Data RDBC test slice
Closes gh-24741
1 parent 05adf02 commit 9d0e1a2

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\
6767
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\
6868
org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration,\
6969
org.springframework.boot.autoconfigure.r2dbc.R2dbcTransactionManagerAutoConfiguration,\
70+
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration,\
7071
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
7172

7273
# AutoConfigureDataRedis auto-configuration imports

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121
import reactor.test.StepVerifier;
2222

2323
import org.springframework.beans.factory.annotation.Autowired;
24-
import org.springframework.boot.test.context.TestConfiguration;
2524
import org.springframework.context.ApplicationContext;
26-
import org.springframework.core.io.DefaultResourceLoader;
27-
import org.springframework.core.io.Resource;
28-
import org.springframework.core.io.ResourceLoader;
29-
import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator;
3025
import org.springframework.r2dbc.core.DatabaseClient;
3126

3227
import static org.assertj.core.api.Assertions.assertThat;
@@ -36,7 +31,8 @@
3631
*
3732
* @author Mark Paluch
3833
*/
39-
@DataR2dbcTest
34+
@DataR2dbcTest(
35+
properties = "spring.sql.init.schemaLocations=classpath:org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql")
4036
class DataR2dbcTestIntegrationTests {
4137

4238
@Autowired
@@ -64,17 +60,4 @@ void registersExampleRepository() {
6460
assertThat(this.applicationContext.getBeanNamesForType(ExampleRepository.class)).isNotEmpty();
6561
}
6662

67-
@TestConfiguration
68-
static class DatabaseInitializationConfiguration {
69-
70-
@Autowired
71-
void initializeDatabase(ConnectionFactory connectionFactory) {
72-
ResourceLoader resourceLoader = new DefaultResourceLoader();
73-
Resource[] scripts = new Resource[] { resourceLoader
74-
.getResource("classpath:org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql") };
75-
new ResourceDatabasePopulator(scripts).populate(connectionFactory).block();
76-
}
77-
78-
}
79-
8063
}

0 commit comments

Comments
 (0)