From 37d92807d68b755a0d44e7fc0d5673afddcc852f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 4 Sep 2017 10:01:14 +0200 Subject: [PATCH] Polish test See gh-10139 --- .../endpoint/LiquibaseEndpointTests.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java index 1ace1a76226..6094934559c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java @@ -21,12 +21,12 @@ import java.util.Map; import liquibase.integration.spring.SpringLiquibase; 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.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; 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 Andy Wilkinson + * @author Stephane Nicoll */ public class LiquibaseEndpointTests { + private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class, + LiquibaseAutoConfiguration.class)) + .withPropertyValues("spring.datasource.generate-unique-name=true"); + + @Test public void liquibaseReportIsReturned() throws Exception { - new ApplicationContextRunner().withUserConfiguration(Config.class) + this.contextRunner.withUserConfiguration(Config.class) .run((context) -> assertThat( context.getBean(LiquibaseEndpoint.class).liquibaseReports()) .hasSize(1)); @@ -48,17 +55,15 @@ public class LiquibaseEndpointTests { @Test public void invokeWithCustomSchema() throws Exception { - ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withUserConfiguration(Config.class) - .withPropertyValues("liquibase.default-schema=CUSTOMSCHEMA", - "spring.datasource.generate-unique-name=true", - "spring.datasource.schema=classpath:/db/create-custom-schema.sql"); - contextRunner.run((context) -> assertThat( - context.getBean(LiquibaseEndpoint.class).liquibaseReports()).hasSize(1)); + this.contextRunner.withUserConfiguration(Config.class) + .withPropertyValues("spring.liquibase.default-schema=CUSTOMSCHEMA", + "spring.datasource.schema=classpath:/db/create-custom-schema.sql") + .run((context) -> assertThat( + context.getBean(LiquibaseEndpoint.class).liquibaseReports()) + .hasSize(1)); } @Configuration - @Import({ EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class }) public static class Config { @Bean