From 5dc2339ec2a7e12437a955970f15ccf6705dec92 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 17 Jun 2019 11:37:05 +0100 Subject: [PATCH] Polish "Consider properties from @AutoConfigureTestDatabase" See gh-16814 --- .../flyway/FlywayAutoConfigurationTests.java | 16 +++++++--------- src/checkstyle/checkstyle-suppressions.xml | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 579db9c633..abd5e3ad85 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -30,7 +30,6 @@ import org.flywaydb.core.api.callback.Callback; import org.flywaydb.core.api.callback.Context; import org.flywaydb.core.api.callback.Event; import org.flywaydb.core.api.callback.FlywayCallback; -import org.flywaydb.core.internal.jdbc.DriverDataSource; import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform; import org.junit.Test; import org.mockito.InOrder; @@ -105,11 +104,10 @@ public class FlywayAutoConfigurationTests { this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.flyway.url:jdbc:hsqldb:mem:flywaytest").run((context) -> { assertThat(context).hasSingleBean(Flyway.class); - assertThat(context.getBean(Flyway.class).getDataSource()).isNotNull(); - assertThat(((DriverDataSource) context.getBean(Flyway.class).getDataSource()).getUser()) - .isEqualTo("sa"); - assertThat(((DriverDataSource) context.getBean(Flyway.class).getDataSource()).getPassword()) - .isEqualTo(""); + DataSource dataSource = context.getBean(Flyway.class).getDataSource(); + assertThat(dataSource).isNotNull(); + assertThat(dataSource).hasFieldOrPropertyWithValue("user", "sa"); + assertThat(dataSource).hasFieldOrPropertyWithValue("password", ""); }); } @@ -118,9 +116,9 @@ public class FlywayAutoConfigurationTests { this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.flyway.user:sa").run((context) -> { assertThat(context).hasSingleBean(Flyway.class); - assertThat(context.getBean(Flyway.class).getDataSource()).isNotNull(); - assertThat(((DriverDataSource) context.getBean(Flyway.class).getDataSource()).getUrl()) - .startsWith("jdbc:h2:mem:"); + DataSource dataSource = context.getBean(Flyway.class).getDataSource(); + assertThat(dataSource).isNotNull(); + assertThat(dataSource).extracting("url").hasSize(1).first().asString().startsWith("jdbc:h2:mem:"); }); } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 5ab2de11db..858ed62c32 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -35,5 +35,4 @@ -