From fbfed722c78be65caaf872b7e2ca33b448f3196d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 9 Jun 2016 21:42:57 +0200 Subject: [PATCH] Altered tests --- .../cloud/sleuth/assertions/ListOfSpansAssert.java | 8 -------- .../sleuth/instrument/zuul/TraceZuulIntegrationTests.java | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/ListOfSpansAssert.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/ListOfSpansAssert.java index 6172561ef..0a8252abe 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/ListOfSpansAssert.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/ListOfSpansAssert.java @@ -43,14 +43,6 @@ public class ListOfSpansAssert extends AbstractAssert spansWithParentSpanAsRootSpan = this.actual.spans.stream().filter(span -> span.getParents().contains(traceId)).collect(Collectors.toList()); - Assertions.assertThat(spansWithParentSpanAsRootSpan).hasSize(2).extracting("spanId").containsOnly(spansWithParentSpanAsRootSpan.get(0).getSpanId()); - return this; - } - public ListOfSpansAssert everyParentIdHasItsCorrespondingSpan() { isNotNull(); printSpans(); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java index 24a184eaa..a69589774 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java @@ -75,7 +75,7 @@ public class TraceZuulIntegrationTests { then(result.getBody()).isEqualTo("Hello world"); then(this.tracer.getCurrentSpan()).isNull(); then(new ListOfSpans(this.spanAccumulator.getSpans())) - .thereIsOnlyOneServerAndClientSideSpanWhoseParentIdIsEqualTo(span.getTraceId()); + .everyParentIdHasItsCorrespondingSpan(); } @Test @@ -90,7 +90,6 @@ public class TraceZuulIntegrationTests { then(result.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); then(this.tracer.getCurrentSpan()).isNull(); then(new ListOfSpans(this.spanAccumulator.getSpans())) - .thereIsOnlyOneServerAndClientSideSpanWhoseParentIdIsEqualTo(span.getTraceId()) .everyParentIdHasItsCorrespondingSpan(); } }