Commit 37d92807 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish test

See gh-10139
parent 35f457ca
...@@ -21,12 +21,12 @@ import java.util.Map; ...@@ -21,12 +21,12 @@ import java.util.Map;
import liquibase.integration.spring.SpringLiquibase; import liquibase.integration.spring.SpringLiquibase;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
...@@ -35,12 +35,19 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -35,12 +35,19 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Stephane Nicoll
*/ */
public class LiquibaseEndpointTests { public class LiquibaseEndpointTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
LiquibaseAutoConfiguration.class))
.withPropertyValues("spring.datasource.generate-unique-name=true");
@Test @Test
public void liquibaseReportIsReturned() throws Exception { public void liquibaseReportIsReturned() throws Exception {
new ApplicationContextRunner().withUserConfiguration(Config.class) this.contextRunner.withUserConfiguration(Config.class)
.run((context) -> assertThat( .run((context) -> assertThat(
context.getBean(LiquibaseEndpoint.class).liquibaseReports()) context.getBean(LiquibaseEndpoint.class).liquibaseReports())
.hasSize(1)); .hasSize(1));
...@@ -48,17 +55,15 @@ public class LiquibaseEndpointTests { ...@@ -48,17 +55,15 @@ public class LiquibaseEndpointTests {
@Test @Test
public void invokeWithCustomSchema() throws Exception { public void invokeWithCustomSchema() throws Exception {
ApplicationContextRunner contextRunner = new ApplicationContextRunner() this.contextRunner.withUserConfiguration(Config.class)
.withUserConfiguration(Config.class) .withPropertyValues("spring.liquibase.default-schema=CUSTOMSCHEMA",
.withPropertyValues("liquibase.default-schema=CUSTOMSCHEMA", "spring.datasource.schema=classpath:/db/create-custom-schema.sql")
"spring.datasource.generate-unique-name=true", .run((context) -> assertThat(
"spring.datasource.schema=classpath:/db/create-custom-schema.sql"); context.getBean(LiquibaseEndpoint.class).liquibaseReports())
contextRunner.run((context) -> assertThat( .hasSize(1));
context.getBean(LiquibaseEndpoint.class).liquibaseReports()).hasSize(1));
} }
@Configuration @Configuration
@Import({ EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class })
public static class Config { public static class Config {
@Bean @Bean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment