From 74e9988ee22f0fe91e6169163cddf028504877ce Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 17 Apr 2019 08:03:50 +0400 Subject: [PATCH] Made tests less brittle --- .../instrument/scheduling/TracingOnScheduledTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java index b8eb84451..602c6aaf3 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java @@ -71,6 +71,7 @@ public class TracingOnScheduledTests { } @Test + @DirtiesContext public void should_have_span_set_after_scheduled_method_has_been_executed() { await().atMost(10, SECONDS).untilAsserted(() -> { then(this.beanWithScheduledMethod.isExecuted()).isTrue(); @@ -109,8 +110,9 @@ public class TracingOnScheduledTests { then(storedSpan).isNotNull(); then(storedSpan.context().traceId()).isNotNull(); zipkin2.Span foundSpan = this.reporter.getSpans().stream() - .filter(span -> !span.tags().containsKey("error")).findFirst() - .orElseThrow(() -> new AssertionError("Span is missing")); + .filter(span -> !span.tags().containsKey("error") + && span.tags().containsValue("TestBeanWithScheduledMethod")) + .findFirst().orElseThrow(() -> new AssertionError("Span is missing")); then(foundSpan.tags()).contains( new AbstractMap.SimpleEntry<>("class", "TestBeanWithScheduledMethod"), new AbstractMap.SimpleEntry<>("method", "scheduledMethod"));