From e449aaad810f441129d537b7f4de54cd9872b5e1 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 9 Jul 2019 10:15:55 +0200 Subject: [PATCH] Moved the rest template test --- .../web/client/RestTemplateTraceAspectIntegrationTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename {spring-cloud-sleuth-core => tests/spring-cloud-sleuth-instrumentation-mvc-tests}/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java (98%) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java similarity index 98% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java rename to tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java index b40f7dfc8..310c3737e 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java @@ -31,8 +31,8 @@ import org.junit.runner.RunWith; import zipkin2.Span; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.sleuth.instrument.DefaultTestAutoConfiguration; import org.springframework.cloud.sleuth.util.ArrayListSpanReporter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; @@ -181,7 +181,7 @@ public class RestTemplateTraceAspectIntegrationTests { .andExpect(status().isOk()); } - @DefaultTestAutoConfiguration + @EnableAutoConfiguration @Import(AspectTestingController.class) public static class Config {