From 1c51c9fa5ee97ff3af5d808b3164ba1545cb8527 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 17 Jan 2018 11:45:56 -0500 Subject: [PATCH] Updates test to account for new application context id rules from boot 2 --- .../cloud/netflix/hystrix/contract/HystrixContractUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-hystrix-contract/src/main/java/org/springframework/cloud/netflix/hystrix/contract/HystrixContractUtils.java b/spring-cloud-netflix-hystrix-contract/src/main/java/org/springframework/cloud/netflix/hystrix/contract/HystrixContractUtils.java index d8e5364e..156750dd 100644 --- a/spring-cloud-netflix-hystrix-contract/src/main/java/org/springframework/cloud/netflix/hystrix/contract/HystrixContractUtils.java +++ b/spring-cloud-netflix-hystrix-contract/src/main/java/org/springframework/cloud/netflix/hystrix/contract/HystrixContractUtils.java @@ -51,8 +51,8 @@ public class HystrixContractUtils { assertThat(origin.get("host")).isNotNull(); assertThat(origin.get("port")).isNotNull(); assertThat(origin.get("serviceId")).isEqualTo("application"); - // TODO: should be server.port (but in a test it's a random port so -1)? - assertThat(origin.get("id")).isEqualTo("application:-1"); + // TODO: boot 2 changed application context id generation + assertThat(origin.get("id")).asString().startsWith("application"); } public static void checkData(Map data, String group, String name) {