SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Altered tests

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-06-09 21:42:57 +02:00
parent 0f60e5bf67
commit fbfed722c7
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/ListOfSpansAssert.java
View File

@@ -43,14 +43,6 @@ public class ListOfSpansAssert extends AbstractAssert<ListOfSpansAssert, ListOfS
return new ListOfSpansAssert(actual);
}
public ListOfSpansAssert thereIsOnlyOneServerAndClientSideSpanWhoseParentIdIsEqualTo(long traceId) {
isNotNull();
printSpans();
List<Span> 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();

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java
View File

@@ -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();
}
}