SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to boot 2.0 changes

Browse Source
This commit is contained in:
Spencer Gibb
2017-05-16 13:23:21 -06:00
parent 3f005ab238
commit ebf4112116
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-commons/src/test/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessorTests.java
View File

@@ -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);
}

2
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java
View File

@@ -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"});
}
}

14
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java
View File

@@ -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