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

Revert "Fixed tests with a workaround"

Browse Source 
This reverts commit 94ed8cfe4b.
This commit is contained in:
Marcin Grzejszczak
2016-05-12 10:10:49 +02:00
parent 3fc2994d31
commit f8ed14bd5b
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ import org.springframework.cloud.sleuth.util.ArrayListSpanAccumulator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
@@ -179,8 +178,6 @@ public class TraceChannelInterceptorTests implements MessageHandler {
@Configuration
@EnableAutoConfiguration
// TODO: Remove once https://github.com/spring-projects/spring-boot/issues/5901 is resolved
@EnableIntegration
static class App {
@Bean

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

@@ -32,7 +32,6 @@ import org.springframework.cloud.sleuth.trace.TestSpanContextHolder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
@@ -92,8 +91,6 @@ public class TraceContextPropagationChannelInterceptorTests {
@Configuration
@EnableAutoConfiguration
// TODO: Remove once https://github.com/spring-projects/spring-boot/issues/5901 is resolved
@EnableIntegration
static class App {
@Bean

20
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationTests.java
View File

@@ -15,7 +15,13 @@
*/
package integration;
import integration.MessagingApplicationTests.IntegrationSpanCollectorConfig;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.stream.Collectors;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,21 +31,15 @@ import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.cloud.sleuth.zipkin.ZipkinSpanReporter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import integration.MessagingApplicationTests.IntegrationSpanCollectorConfig;
import sample.SampleMessagingApplication;
import tools.AbstractIntegrationTest;
import zipkin.Constants;
import zipkin.Span;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.stream.Collectors;
import static org.assertj.core.api.BDDAssertions.then;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -160,8 +160,6 @@ public class MessagingApplicationTests extends AbstractIntegrationTest {
}
@Configuration
// TODO: Remove once https://github.com/spring-projects/spring-boot/issues/5901 is resolved
@EnableIntegration
public static class IntegrationSpanCollectorConfig {
@Bean
ZipkinSpanReporter integrationTestZipkinSpanReporter() {