From ebf41121164d18c9a57e8b39851118ac7ac21c19 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 16 May 2017 13:23:21 -0600 Subject: [PATCH] Updates to boot 2.0 changes --- .../HostInfoEnvironmentPostProcessorTests.java | 4 ++-- .../DiscoveryCompositeHealthIndicatorTests.java | 2 +- ...BootstrapListenerHierarchyIntegrationTests.java | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessorTests.java index 6b9b2288..6ebd7cae 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessorTests.java @@ -34,14 +34,14 @@ public class HostInfoEnvironmentPostProcessorTests { @Test public void hostname() { this.processor.postProcessEnvironment(this.environment, - new SpringApplication("")); + new SpringApplication()); assertNotNull(this.environment.getProperty("spring.cloud.client.hostname")); } @Test public void ipAddress() { this.processor.postProcessEnvironment(this.environment, - new SpringApplication("")); + new SpringApplication()); String address = this.environment.getProperty("spring.cloud.client.ip-address"); assertNotNull(address); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java index b4e09988..e35bbe82 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java @@ -107,7 +107,7 @@ public class DiscoveryCompositeHealthIndicatorTests { } public static void main(String[] args) { - SpringApplication.run(new Object[]{Config.class,CommonsClientAutoConfiguration.class}, new String[] {"--debug", "--spring.main.webEnvironment=false"}); + SpringApplication.run(new Class[]{Config.class,CommonsClientAutoConfiguration.class}, new String[] {"--debug", "--spring.main.webEnvironment=false"}); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java index f2ecf058..61d8f3cd 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java @@ -19,8 +19,10 @@ package org.springframework.cloud.bootstrap.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.springframework.boot.WebApplicationType.NONE; import org.junit.Test; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; @@ -37,7 +39,7 @@ public class BootstrapListenerHierarchyIntegrationTests { @Test public void shouldAddInABootstrapContext() { ConfigurableApplicationContext context = new SpringApplicationBuilder() - .sources(BasicConfiguration.class).web(false).run(); + .sources(BasicConfiguration.class).web(NONE).run(); assertNotNull(context.getParent()); } @@ -45,8 +47,8 @@ public class BootstrapListenerHierarchyIntegrationTests { @Test public void shouldAddInOneBootstrapForABasicParentChildHierarchy() { ConfigurableApplicationContext context = new SpringApplicationBuilder() - .sources(RootConfiguration.class).web(false) - .child(BasicConfiguration.class).web(false).run(); + .sources(RootConfiguration.class).web(NONE) + .child(BasicConfiguration.class).web(NONE).run(); // Should be RootConfiguration based context ConfigurableApplicationContext parent = (ConfigurableApplicationContext) context @@ -66,9 +68,9 @@ public class BootstrapListenerHierarchyIntegrationTests { @Test public void shouldAddInOneBootstrapForSiblingsBasedHierarchy() { ConfigurableApplicationContext context = new SpringApplicationBuilder() - .sources(RootConfiguration.class).web(false) - .child(BasicConfiguration.class).web(false) - .sibling(BasicConfiguration.class).web(false).run(); + .sources(RootConfiguration.class).web(NONE) + .child(BasicConfiguration.class).web(NONE) + .sibling(BasicConfiguration.class).web(NONE).run(); // Should be RootConfiguration based context ConfigurableApplicationContext parent = (ConfigurableApplicationContext) context