spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-10-03 10:09:32 +00:00
Code Issues Projects Releases Wiki Activity

Fixing broken tests

Browse Source
This commit is contained in:
Ryan Baxter
2019-03-28 12:29:49 -04:00
parent 4d9a4ea3f6
commit 35fa602286
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java
+2 -2
View File
@@ -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());
}
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java
+3 -3
View File
@@ -74,14 +74,14 @@ public class EurekaClientConfigBeanTests {
this.context.getEnvironment().getPropertySources().addFirst(source);
source.addPropertySource(new MapPropertySource("config", Collections
.<String, Object> 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());
}
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java
+2 -2
View File
@@ -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";