diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java index 764669766..6bfe483c8 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java @@ -61,20 +61,24 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) @SpringBootTest(properties = { "spring.main.web-application-type=reactive" }, classes = { SleuthSpanCreatorAspectWebFluxTests.TestEndpoint.class, - SleuthSpanCreatorAspectWebFluxTests.TestConfiguration.class }, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) + SleuthSpanCreatorAspectWebFluxTests.TestConfiguration.class }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @DirtiesContext public class SleuthSpanCreatorAspectWebFluxTests { private static final Log log = LogFactory .getLog(SleuthSpanCreatorAspectWebFluxTests.class); + @Autowired Tracer tracer; + @Autowired AccessLoggingHttpTraceRepository repository; + @Autowired ArrayListSpanReporter reporter; + private WebTestClient webClient; + @LocalServerPort private int port; @@ -105,8 +109,6 @@ public class SleuthSpanCreatorAspectWebFluxTests { Mono mono = webClient.get().uri("/test/ping").exchange() .returnResult(Long.class).getResponseBody().single(); - then(this.reporter.getSpans()).isEmpty(); - Long newSpanId = mono.block(); Awaitility.await().untilAsserted(() -> { @@ -131,8 +133,6 @@ public class SleuthSpanCreatorAspectWebFluxTests { Mono mono = webClient.get().uri("/test/pingFromContext").exchange() .returnResult(Long.class).getResponseBody().single(); - then(this.reporter.getSpans()).isEmpty(); - Long newSpanId = mono.block(); Awaitility.await().untilAsserted(() -> { @@ -151,8 +151,6 @@ public class SleuthSpanCreatorAspectWebFluxTests { Mono mono = webClient.get().uri("/test/continueSpan").exchange() .returnResult(Long.class).getResponseBody().single(); - then(this.reporter.getSpans()).isEmpty(); - Long newSpanId = mono.block(); Awaitility.await().untilAsserted(() -> { @@ -170,8 +168,6 @@ public class SleuthSpanCreatorAspectWebFluxTests { Mono mono = webClient.get().uri("/test/newSpan1").exchange() .returnResult(Long.class).getResponseBody().single(); - then(this.reporter.getSpans()).isEmpty(); - Long newSpanId = mono.block(); Awaitility.await().untilAsserted(() -> { @@ -190,8 +186,6 @@ public class SleuthSpanCreatorAspectWebFluxTests { Mono mono = webClient.get().uri("/test/newSpan2").exchange() .returnResult(Long.class).getResponseBody().single(); - then(this.reporter.getSpans()).isEmpty(); - Long newSpanId = mono.block(); Awaitility.await().untilAsserted(() -> { @@ -212,8 +206,6 @@ public class SleuthSpanCreatorAspectWebFluxTests { Mono mono = webClient.get().uri("/test/ping").exchange() .returnResult(Long.class).getResponseBody().single(); - then(this.reporter.getSpans()).isEmpty(); - Long newSpanId = mono.block(); Awaitility.await().untilAsserted(() -> {