From 30ff329e3d1842cf3a983c71253b5e124e1155c2 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 28 Jul 2017 10:11:49 -0700 Subject: [PATCH] Polish --- .../endpoint/LiquibaseEndpointTests.java | 7 ++-- ...stJpaDependencyAutoConfigurationTests.java | 38 +++++++++---------- 2 files changed, 23 insertions(+), 22 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 42ea01e4a41..b4079f6600d 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 @@ -51,9 +51,10 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests { - assertThat(postProcessors(context)) - .containsKey("hazelcastInstanceJpaDependencyPostProcessor"); - assertThat(entityManagerFactoryDependencies(context)).contains( - "hazelcastInstance"); - }); + this.contextRunner.withUserConfiguration(HazelcastConfiguration.class) + .run((context) -> { + assertThat(postProcessors(context)) + .containsKey("hazelcastInstanceJpaDependencyPostProcessor"); + assertThat(entityManagerFactoryDependencies(context)) + .contains("hazelcastInstance"); + }); } @Test public void noRegistrationIfHazelcastInstanceHasCustomBeanName() { - this.contextRunner.withUserConfiguration( - HazelcastCustomNameConfiguration.class).run((context) -> { - assertThat(entityManagerFactoryDependencies(context)) - .doesNotContain("hazelcastInstance"); - assertThat(postProcessors(context)) - .doesNotContainKey("hazelcastInstanceJpaDependencyPostProcessor"); - }); + this.contextRunner.withUserConfiguration(HazelcastCustomNameConfiguration.class) + .run((context) -> { + assertThat(entityManagerFactoryDependencies(context)) + .doesNotContain("hazelcastInstance"); + assertThat(postProcessors(context)).doesNotContainKey( + "hazelcastInstanceJpaDependencyPostProcessor"); + }); } @Test @@ -86,8 +86,8 @@ public class HazelcastJpaDependencyAutoConfigurationTests { @Test public void noRegistrationWithNoEntityManagerFactory() { new ApplicationContextRunner().withUserConfiguration(HazelcastConfiguration.class) - .withConfiguration(AutoConfigurations.of( - HazelcastJpaDependencyAutoConfiguration.class)) + .withConfiguration(AutoConfigurations + .of(HazelcastJpaDependencyAutoConfiguration.class)) .run((context) -> assertThat(postProcessors(context)).doesNotContainKey( "hazelcastInstanceJpaDependencyPostProcessor")); } @@ -99,13 +99,13 @@ public class HazelcastJpaDependencyAutoConfigurationTests { private List entityManagerFactoryDependencies( AssertableApplicationContext context) { - String[] dependsOn = ((BeanDefinitionRegistry) context.getSourceApplicationContext()) - .getBeanDefinition("entityManagerFactory").getDependsOn(); + String[] dependsOn = ((BeanDefinitionRegistry) context + .getSourceApplicationContext()).getBeanDefinition("entityManagerFactory") + .getDependsOn(); return dependsOn != null ? Arrays.asList(dependsOn) : Collections.emptyList(); } - @Configuration static class HazelcastConfiguration {