From 7b7ceefb0a74d6ecfab6ba514f5a6385b8da45ef Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 27 Feb 2017 17:31:14 +0100 Subject: [PATCH] Reverting the flickering fix it has become even more flickering --- .../cloud/sleuth/stream/StreamSpanListenerTests.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java index 74093c2bb..49b8f9d38 100644 --- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java +++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java @@ -17,7 +17,6 @@ package org.springframework.cloud.sleuth.stream; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.in; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; @@ -28,7 +27,6 @@ import java.util.concurrent.LinkedBlockingQueue; import javax.annotation.PostConstruct; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -82,7 +80,7 @@ public class StreamSpanListenerTests { @Autowired SpanReporter spanReporter; - @Before + @PostConstruct public void init() { this.test.spans.clear(); } @@ -178,9 +176,7 @@ public class StreamSpanListenerTests { StreamSpanReporter listener; @ServiceActivator(inputChannel = SleuthSource.OUTPUT) - public void handle(Spans input) { - this.spans.clear(); - this.spans.addAll(input.getSpans()); + public void handle(Message msg) { } @Bean @@ -189,7 +185,7 @@ public class StreamSpanListenerTests { } @Bean - Sampler defaultSampler() { + public Sampler defaultSampler() { return new AlwaysSampler(); }