Include SQL init auto-config in Data RDBC test slice

Closes gh-24741
spring-projects · Apr 14, 2021 · 9d0e1a2 · 9d0e1a2
1 parent 05adf02
commit 9d0e1a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/...-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories b/...-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -67,6 +67,7 @@ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\
 org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\
 org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration,\
 org.springframework.boot.autoconfigure.r2dbc.R2dbcTransactionManagerAutoConfiguration,\
+org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration,\
 org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
 
 # AutoConfigureDataRedis auto-configuration imports

diff --git a/...org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java b/...org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java
@@ -21,12 +21,7 @@
 import reactor.test.StepVerifier;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.ApplicationContext;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator;
 import org.springframework.r2dbc.core.DatabaseClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,7 +31,8 @@
  *
  * @author Mark Paluch
  */
-@DataR2dbcTest
+@DataR2dbcTest(
+		properties = "spring.sql.init.schemaLocations=classpath:org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql")
 class DataR2dbcTestIntegrationTests {
 
 	@Autowired
@@ -64,17 +60,4 @@ void registersExampleRepository() {
 		assertThat(this.applicationContext.getBeanNamesForType(ExampleRepository.class)).isNotEmpty();
 	}
 
-	@TestConfiguration
-	static class DatabaseInitializationConfiguration {
-
-		@Autowired
-		void initializeDatabase(ConnectionFactory connectionFactory) {
-			ResourceLoader resourceLoader = new DefaultResourceLoader();
-			Resource[] scripts = new Resource[] { resourceLoader
-					.getResource("classpath:org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql") };
-			new ResourceDatabasePopulator(scripts).populate(connectionFactory).block();
-		}
-
-	}
-
 }