Skip to content

S
spring-cloud-netflix
Unverified Commit 52ee7c87 by Spencer Gibb
Options

Boot 2.0 compatibility fixes

parent cfb31419
Showing with 40 additions and 35 deletions
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java
...@@ -27,7 +27,7 @@ import org.springframework.aop.scope.ScopedProxyFactoryBean; ...@@ -27,7 +27,7 @@ import org.springframework.aop.scope.ScopedProxyFactoryBean;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.context.properties.source.ConfigurationPropertySources; import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration; import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
import org.springframework.cloud.commons.util.UtilAutoConfiguration; import org.springframework.cloud.commons.util.UtilAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
...@@ -43,7 +43,6 @@ import com.sun.jersey.client.apache4.ApacheHttpClient4; ...@@ -43,7 +43,6 @@ import com.sun.jersey.client.apache4.ApacheHttpClient4;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.springframework.boot.test.util.EnvironmentTestUtils.addEnvironment;
/** /**
* @author Spencer Gibb * @author Spencer Gibb
...@@ -76,20 +75,20 @@ public class EurekaClientAutoConfigurationTests { ...@@ -76,20 +75,20 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void nonSecurePortUnderscores() { public void nonSecurePortUnderscores() {
testNonSecurePort("SERVER_PORT"); testNonSecurePortSystemProp("SERVER_PORT");
} }
@Test @Test
public void nonSecurePort() { public void nonSecurePort() {
testNonSecurePort("PORT"); testNonSecurePortSystemProp("PORT");
assertEquals("eurekaClient", assertEquals("eurekaClient",
this.context.getBeanDefinition("eurekaClient").getFactoryMethodName()); this.context.getBeanDefinition("eurekaClient").getFactoryMethodName());
} }
@Test @Test
public void managementPort() { public void managementPort() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of("server.port=8989",
"management.port=9999"); "management.port=9999").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -99,9 +98,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -99,9 +98,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void statusPageUrlPathAndManagementPort() { public void statusPageUrlPathAndManagementPort() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.port=9999",
"eureka.instance.statusPageUrlPath=/myStatusPage"); "eureka.instance.statusPageUrlPath=/myStatusPage").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -111,9 +110,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -111,9 +110,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void healthCheckUrlPathAndManagementPort() { public void healthCheckUrlPathAndManagementPort() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.port=9999",
"eureka.instance.healthCheckUrlPath=/myHealthCheck"); "eureka.instance.healthCheckUrlPath=/myHealthCheck").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -123,9 +122,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -123,9 +122,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void statusPageUrlPathAndManagementPortAndContextPath() { public void statusPageUrlPathAndManagementPortAndContextPath() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.contextPath=/manage", "management.port=9999", "management.contextPath=/manage",
"eureka.instance.statusPageUrlPath=/myStatusPage"); "eureka.instance.statusPageUrlPath=/myStatusPage").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -135,9 +134,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -135,9 +134,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void healthCheckUrlPathAndManagementPortAndContextPath() { public void healthCheckUrlPathAndManagementPortAndContextPath() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.contextPath=/manage", "management.port=9999", "management.contextPath=/manage",
"eureka.instance.healthCheckUrlPath=/myHealthCheck"); "eureka.instance.healthCheckUrlPath=/myHealthCheck").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -147,9 +146,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -147,9 +146,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void statusPageUrlPathAndManagementPortAndContextPathKebobCase() { public void statusPageUrlPathAndManagementPortAndContextPathKebobCase() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.context-path=/manage", "management.port=9999", "management.context-path=/manage",
"eureka.instance.statusPageUrlPath=/myStatusPage"); "eureka.instance.statusPageUrlPath=/myStatusPage").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -159,9 +158,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -159,9 +158,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void healthCheckUrlPathAndManagementPortAndContextPathKebobCase() { public void healthCheckUrlPathAndManagementPortAndContextPathKebobCase() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.context-path=/manage", "management.port=9999", "management.context-path=/manage",
"eureka.instance.healthCheckUrlPath=/myHealthCheck"); "eureka.instance.healthCheckUrlPath=/myHealthCheck").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -171,9 +170,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -171,9 +170,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void statusPageUrlPathAndManagementPortKabobCase() { public void statusPageUrlPathAndManagementPortKabobCase() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.port=9999",
"eureka.instance.status-page-url-path=/myStatusPage"); "eureka.instance.status-page-url-path=/myStatusPage").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -183,9 +182,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -183,9 +182,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void statusPageUrlAndPreferIpAddress() { public void statusPageUrlAndPreferIpAddress() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "eureka.instance.hostname=foo", "management.port=9999", "eureka.instance.hostname=foo",
"eureka.instance.preferIpAddress:true"); "eureka.instance.preferIpAddress:true").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
...@@ -197,9 +196,9 @@ public class EurekaClientAutoConfigurationTests { ...@@ -197,9 +196,9 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void healthCheckUrlPathAndManagementPortKabobCase() { public void healthCheckUrlPathAndManagementPortKabobCase() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "management.port=9999",
"eureka.instance.health-check-url-path=/myHealthCheck"); "eureka.instance.health-check-url-path=/myHealthCheck").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -209,8 +208,8 @@ public class EurekaClientAutoConfigurationTests { ...@@ -209,8 +208,8 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void statusPageUrlPathAndManagementPortUpperCase() { public void statusPageUrlPathAndManagementPortUpperCase() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999"); "management.port=9999").applyTo(this.context);
addSystemEnvironment(this.context.getEnvironment(), "EUREKA_INSTANCE_STATUS_PAGE_URL_PATH=/myStatusPage"); addSystemEnvironment(this.context.getEnvironment(), "EUREKA_INSTANCE_STATUS_PAGE_URL_PATH=/myStatusPage");
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
...@@ -221,8 +220,8 @@ public class EurekaClientAutoConfigurationTests { ...@@ -221,8 +220,8 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void healthCheckUrlPathAndManagementPortUpperCase() { public void healthCheckUrlPathAndManagementPortUpperCase() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999"); "management.port=9999").applyTo(this.context);
addSystemEnvironment(this.context.getEnvironment(), "EUREKA_INSTANCE_HEALTH_CHECK_URL_PATH=/myHealthCheck"); addSystemEnvironment(this.context.getEnvironment(), "EUREKA_INSTANCE_HEALTH_CHECK_URL_PATH=/myHealthCheck");
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
...@@ -233,8 +232,8 @@ public class EurekaClientAutoConfigurationTests { ...@@ -233,8 +232,8 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void hostname() { public void hostname() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"management.port=9999", "eureka.instance.hostname=foo"); "management.port=9999", "eureka.instance.hostname=foo").applyTo(this.context);
setupContext(RefreshAutoConfiguration.class); setupContext(RefreshAutoConfiguration.class);
EurekaInstanceConfigBean instance = this.context EurekaInstanceConfigBean instance = this.context
.getBean(EurekaInstanceConfigBean.class); .getBean(EurekaInstanceConfigBean.class);
...@@ -253,8 +252,8 @@ public class EurekaClientAutoConfigurationTests { ...@@ -253,8 +252,8 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void basicAuth() { public void basicAuth() {
EnvironmentTestUtils.addEnvironment(this.context, "server.port=8989", TestPropertyValues.of( "server.port=8989",
"eureka.client.serviceUrl.defaultZone=http://user:foo@example.com:80/eureka"); "eureka.client.serviceUrl.defaultZone=http://user:foo@example.com:80/eureka").applyTo(this.context);
setupContext(MockClientConfiguration.class); setupContext(MockClientConfiguration.class);
// ApacheHttpClient4 http = this.context.getBean(ApacheHttpClient4.class); // ApacheHttpClient4 http = this.context.getBean(ApacheHttpClient4.class);
// Mockito.verify(http).addFilter(Matchers.any(HTTPBasicAuthFilter.class)); // Mockito.verify(http).addFilter(Matchers.any(HTTPBasicAuthFilter.class));
...@@ -270,7 +269,7 @@ public class EurekaClientAutoConfigurationTests { ...@@ -270,7 +269,7 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void testAppName() throws Exception { public void testAppName() throws Exception {
EnvironmentTestUtils.addEnvironment(this.context, "spring.application.name=mytest"); TestPropertyValues.of( "spring.application.name=mytest").applyTo(this.context);
setupContext(); setupContext();
assertEquals("mytest", getInstanceConfig().getAppname()); assertEquals("mytest", getInstanceConfig().getAppname());
assertEquals("mytest", getInstanceConfig().getVirtualHostName()); assertEquals("mytest", getInstanceConfig().getVirtualHostName());
...@@ -323,7 +322,7 @@ public class EurekaClientAutoConfigurationTests { ...@@ -323,7 +322,7 @@ public class EurekaClientAutoConfigurationTests {
@Test @Test
public void testInstanceNamePreferred() throws Exception { public void testInstanceNamePreferred() throws Exception {
addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestspringappname"); addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestspringappname");
EnvironmentTestUtils.addEnvironment(this.context, "eureka.instance.appname=mytesteurekaappname"); TestPropertyValues.of( "eureka.instance.appname=mytesteurekaappname").applyTo(this.context);
setupContext(); setupContext();
assertEquals("mytesteurekaappname", getInstanceConfig().getAppname()); assertEquals("mytesteurekaappname", getInstanceConfig().getAppname());
} }
...@@ -334,8 +333,14 @@ public class EurekaClientAutoConfigurationTests { ...@@ -334,8 +333,14 @@ public class EurekaClientAutoConfigurationTests {
this.context.getBean(EurekaHealthIndicator.class); this.context.getBean(EurekaHealthIndicator.class);
} }
private void testNonSecurePortSystemProp(String propName) {
addSystemEnvironment(this.context.getEnvironment(), propName + ":8888");
setupContext();
assertEquals(8888, getInstanceConfig().getNonSecurePort());
}
private void testNonSecurePort(String propName) { private void testNonSecurePort(String propName) {
addEnvironment(this.context, propName + ":8888"); TestPropertyValues.of(propName + ":8888").applyTo(this.context);
setupContext(); setupContext();
assertEquals(8888, getInstanceConfig().getNonSecurePort()); assertEquals(8888, getInstanceConfig().getNonSecurePort());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment