From 6d77a2e25a3c0ad1e64bdde8271d23b32dc4550c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 28 Mar 2019 11:58:51 -0400 Subject: [PATCH] Fixing broken tests --- .../netflix/eureka/EurekaClientAutoConfigurationTests.java | 4 ++-- .../cloud/netflix/eureka/EurekaClientConfigBeanTests.java | 6 +++--- .../eureka/server/EurekaControllerReplicasTests.java | 4 ++-- .../ribbon/okhttp/OkHttpStatusCodeExceptionTest.java | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index d61859ef2..270af8275 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java @@ -360,9 +360,9 @@ public class EurekaClientAutoConfigurationTests { .getBean(EurekaInstanceConfigBean.class); assertThat(instance.getStatusPageUrl()).as("statusPageUrl is wrong") - .isEqualTo("https://192.168.13.90:9999/actuator/info"); + .isEqualTo("http://192.168.13.90:9999/actuator/info"); assertThat(instance.getHealthCheckUrl()).as("healthCheckUrl is wrong") - .isEqualTo("https://192.168.13.90:9999/actuator/health"); + .isEqualTo("http://192.168.13.90:9999/actuator/health"); } @Test diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java index e1cf80e37..dc6a59345 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java @@ -76,15 +76,15 @@ public class EurekaClientConfigBeanTests { source.addPropertySource(new MapPropertySource("config", Collections.singletonMap( "eureka.client.serviceUrl.defaultZone", - "https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com"))); + "https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com"))); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() .toString()).isEqualTo( - "{defaultZone=https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}"); + "{defaultZone=https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}"); assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo( - "[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com]"); + "[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com/]"); } @Test diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java index 7c95cfadd..22da4fafe 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java @@ -32,9 +32,9 @@ import static org.springframework.cloud.netflix.eureka.server.EurekaControllerTe public class EurekaControllerReplicasTests { - String noAuthList1 = "http://test1.com"; + String noAuthList1 = "https://test1.com"; - String noAuthList2 = noAuthList1 + ",http://test2.com"; + String noAuthList2 = noAuthList1 + ",https://test2.com"; String authList1 = "https://user:pwd@test1.com"; diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java index 776c9c8af..d24ac6029 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java @@ -43,7 +43,8 @@ public class OkHttpStatusCodeExceptionTest { .message("Success") .body(ResponseBody.create(MediaType.parse("text/plain"), "foo")) .protocol(Protocol.HTTP_1_1) - .request(new Request.Builder().url("https://service.com").build()).build(); + .request(new Request.Builder().url("https://service.com").build()) + .build(); ResponseBody body = response.peekBody(Integer.MAX_VALUE); OkHttpStatusCodeException ex = new OkHttpStatusCodeException("service", response, body, new URI("https://service.com"));