From 4520268303efb4571da5cf8c7679e17029d1d950 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 22 Nov 2017 10:30:01 +0100 Subject: [PATCH] Made tests less brittle --- .../instrument/web/TraceFilterWebIntegrationTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterWebIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterWebIntegrationTests.java index 0678e61e8..0f30e2d77 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterWebIntegrationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterWebIntegrationTests.java @@ -16,6 +16,9 @@ package org.springframework.cloud.sleuth.instrument.web; +import static org.assertj.core.api.Assertions.fail; +import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; + import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -51,9 +54,6 @@ import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import static org.assertj.core.api.Assertions.fail; -import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; - /** * @author Marcin Grzejszczak */ @@ -94,7 +94,7 @@ public class TraceFilterWebIntegrationTests { String[] split = capture.toString().split("\n"); List list = Arrays.stream(split).filter(s -> s.contains( "Uncaught exception thrown")) - .filter(s -> s.contains("[bootstrap," + hex + "," + hex + ",true]")) + .filter(s -> s.contains(hex + "," + hex + ",true]")) .collect(Collectors.toList()); then(list).isNotEmpty(); }