From 35fa602286ffc49e6e14dd5fcd3df252d27fa8ce Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 28 Mar 2019 12:29:49 -0400 Subject: [PATCH] Fixing broken tests --- .../netflix/eureka/EurekaClientAutoConfigurationTests.java | 4 ++-- .../cloud/netflix/eureka/EurekaClientConfigBeanTests.java | 6 +++--- .../eureka/server/EurekaControllerReplicasTests.java | 4 ++-- 3 files changed, 7 insertions(+), 7 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 0def77a39..a72aa49ee 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 @@ -336,9 +336,9 @@ public class EurekaClientAutoConfigurationTests { EurekaInstanceConfigBean instance = this.context .getBean(EurekaInstanceConfigBean.class); - assertEquals("statusPageUrl is wrong", "https://192.168.13.90:9999/actuator/info", + assertEquals("statusPageUrl is wrong", "http://192.168.13.90:9999/actuator/info", instance.getStatusPageUrl()); - assertEquals("healthCheckUrl is wrong", "https://192.168.13.90:9999/actuator/health", + assertEquals("healthCheckUrl is wrong", "http://192.168.13.90:9999/actuator/health", instance.getHealthCheckUrl()); } 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 f6c8661a0..d68fca841 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 @@ -74,14 +74,14 @@ public class EurekaClientConfigBeanTests { this.context.getEnvironment().getPropertySources().addFirst(source); 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(); - assertEquals("{defaultZone=https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}", + assertEquals("{defaultZone=https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}", this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() .toString()); - assertEquals("[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com]", + assertEquals("[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com/]", getEurekaServiceUrlsForDefaultZone()); } 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 2c8e35627..cd2311345 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 @@ -17,8 +17,8 @@ import com.netflix.eureka.util.StatusInfo; public class EurekaControllerReplicasTests { - String noAuthList1 = "http://test1.com"; - String noAuthList2 = noAuthList1 + ",http://test2.com"; + String noAuthList1 = "https://test1.com"; + String noAuthList2 = noAuthList1 + ",https://test2.com"; String authList1 = "https://user:pwd@test1.com"; String authList2 = authList1 + ",https://user2:pwd2@test2.com";