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

Made tests less brittle

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-12-16 14:53:54 +01:00
parent 22a4c77219
commit 1298d3d581
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfigurationTests.java
View File

@@ -21,6 +21,7 @@ import java.net.URI;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.assertj.core.api.BDDAssertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
@@ -50,6 +51,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.AsyncRestTemplate;
import com.jayway.awaitility.Awaitility;
import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then;
/**
@@ -197,16 +200,20 @@ public class TraceWebAsyncClientAutoConfigurationTests {
future = this.asyncRestTemplate
.getForEntity("http://localhost:" + port() + "/blowsup", String.class);
future.get();
BDDAssertions.fail("should throw an exception from the controller");
} catch (Exception e) {
then(e.getMessage()).contains("Internal Server Error");
}
then(this.accumulator.getSpans().stream().filter(
span -> span.logs().stream().filter(log -> Span.CLIENT_RECV.equals(log.getEvent())).findFirst().isPresent()
).findFirst().get()).matches(span -> span.getAccumulatedMicros() >= TimeUnit.MILLISECONDS.toMicros(100))
.hasATag(Span.SPAN_ERROR_TAG_NAME, "500 Internal Server Error");
then(this.tracer.getCurrentSpan()).isNull();
then(ExceptionUtils.getLastException()).isNull();
Awaitility.await().until(() -> {
then(this.accumulator.getSpans().stream()
.filter(span -> span.logs().stream().filter(log -> Span.CLIENT_RECV.equals(log.getEvent()))
.findFirst().isPresent()).findFirst().get()).matches(
span -> span.getAccumulatedMicros() >= TimeUnit.MILLISECONDS.toMicros(100))
.hasATag(Span.SPAN_ERROR_TAG_NAME, "500 Internal Server Error");
then(this.tracer.getCurrentSpan()).isNull();
then(ExceptionUtils.getLastException()).isNull();
});
}
int port() {