diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTests.java similarity index 98% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTests.java index cf9c39979..6be5c5333 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTests.java @@ -20,7 +20,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.util.JdkIdGenerator; @RunWith(MockitoJUnitRunner.class) -public class TraceCallableTest { +public class TraceCallableTests { ExecutorService executor = Executors.newSingleThreadExecutor(); TraceManager traceManager = new DefaultTraceManager(new AlwaysSampler(), diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTests.java similarity index 98% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTests.java index 962ce2d80..3275605b0 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTests.java @@ -19,7 +19,7 @@ import java.util.concurrent.Executors; import static org.assertj.core.api.BDDAssertions.then; @RunWith(MockitoJUnitRunner.class) -public class TraceRunnableTest { +public class TraceRunnableTests { ExecutorService executor = Executors.newSingleThreadExecutor(); TraceManager traceManager = new DefaultTraceManager(new AlwaysSampler(), diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/SpanPassingForHystrixViaAnnotationsITest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/SpanPassingForHystrixViaAnnotationsIntegrationTests.java similarity index 95% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/SpanPassingForHystrixViaAnnotationsITest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/SpanPassingForHystrixViaAnnotationsIntegrationTests.java index 2ad699739..a71c8a4a6 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/SpanPassingForHystrixViaAnnotationsITest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/SpanPassingForHystrixViaAnnotationsIntegrationTests.java @@ -22,8 +22,8 @@ import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = { - SpanPassingForHystrixViaAnnotationsITest.TestConfig.class }) -public class SpanPassingForHystrixViaAnnotationsITest { + SpanPassingForHystrixViaAnnotationsIntegrationTests.TestConfig.class }) +public class SpanPassingForHystrixViaAnnotationsIntegrationTests { @Autowired HystrixCommandInvocationSpanCatcher hystrixCommandInvocationSpanCatcher; @Autowired TraceManager traceManager; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java similarity index 98% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java index 0f8a32b5f..4d312275a 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java @@ -19,7 +19,7 @@ import static com.netflix.hystrix.HystrixCommand.Setter.withGroupKey; import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey; import static org.assertj.core.api.BDDAssertions.then; -public class TraceCommandTest { +public class TraceCommandTests { static final String EXPECTED_TRACE_ID = "A"; TraceManager traceManager = new DefaultTraceManager(new AlwaysSampler(), diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/RestTemplateTraceAspectITest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/RestTemplateTraceAspectIntegrationTests.java similarity index 94% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/RestTemplateTraceAspectITest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/RestTemplateTraceAspectIntegrationTests.java index e95be9463..120a218ff 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/RestTemplateTraceAspectITest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/RestTemplateTraceAspectIntegrationTests.java @@ -12,7 +12,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.sleuth.Trace; import org.springframework.cloud.sleuth.instrument.DefaultTestAutoConfiguration; import org.springframework.cloud.sleuth.instrument.web.common.HttpMockServer; -import org.springframework.cloud.sleuth.instrument.web.common.MvcWiremockITest; +import org.springframework.cloud.sleuth.instrument.web.common.AbstractMvcWiremockIntegrationTest; import org.springframework.context.annotation.Import; import org.springframework.http.MediaType; import org.springframework.scheduling.annotation.EnableAsync; @@ -36,9 +36,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@SpringApplicationConfiguration(classes = {RestTemplateTraceAspectITest.CorrelationIdAspectTestConfiguration.class}) +@SpringApplicationConfiguration(classes = {RestTemplateTraceAspectIntegrationTests.CorrelationIdAspectTestConfiguration.class}) @RunWith(JUnitParamsRunner.class) -public class RestTemplateTraceAspectITest extends MvcWiremockITest { +public class RestTemplateTraceAspectIntegrationTests extends AbstractMvcWiremockIntegrationTest { @ClassRule public static final SpringClassRule SCR = new SpringClassRule(); @Rule public final SpringMethodRule springMethodRule = new SpringMethodRule(); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegartionTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegartionTests.java index 8e77edf22..5c94e700d 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegartionTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegartionTests.java @@ -11,7 +11,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.sleuth.Trace; import org.springframework.cloud.sleuth.TraceManager; import org.springframework.cloud.sleuth.instrument.DefaultTestAutoConfiguration; -import org.springframework.cloud.sleuth.instrument.web.common.MvcITest; +import org.springframework.cloud.sleuth.instrument.web.common.AbstractMvcIntegrationTest; import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.web.servlet.MvcResult; @@ -21,7 +21,7 @@ import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(TraceFilterIntegartionTests.class) @DefaultTestAutoConfiguration -public class TraceFilterIntegartionTests extends MvcITest { +public class TraceFilterIntegartionTests extends AbstractMvcIntegrationTest { @Autowired TraceManager traceManager; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTests.java similarity index 96% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTests.java index b330f76a3..770c3b37a 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTests.java @@ -22,7 +22,6 @@ import org.springframework.cloud.sleuth.Trace; import org.springframework.cloud.sleuth.TraceManager; import org.springframework.cloud.sleuth.event.ClientReceivedEvent; import org.springframework.cloud.sleuth.event.ClientSentEvent; -import org.springframework.cloud.sleuth.instrument.web.TraceWebAutoConfiguration; import org.springframework.cloud.sleuth.trace.TraceContextHolder; import org.springframework.context.ApplicationEvent; import org.springframework.context.annotation.Bean; @@ -43,10 +42,10 @@ import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.Server; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { FeignTraceTest.TestConfiguration.class }) +@SpringApplicationConfiguration(classes = { FeignTraceTests.TestConfiguration.class }) @WebIntegrationTest(value = { "spring.application.name=fooservice" }, randomPort = true) @DirtiesContext -public class FeignTraceTest { +public class FeignTraceTests { @Autowired TestFeignInterface testFeignInterface; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcITest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/AbstractMvcIntegrationTest.java similarity index 96% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcITest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/AbstractMvcIntegrationTest.java index 398e649c8..4ef085e78 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcITest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/AbstractMvcIntegrationTest.java @@ -20,7 +20,7 @@ import org.springframework.web.context.WebApplicationContext; * @author 4financeIT */ @WebIntegrationTest(randomPort = true) -public abstract class MvcITest { +public abstract class AbstractMvcIntegrationTest { @Autowired protected WebApplicationContext webApplicationContext; @Autowired protected ApplicationContext applicationContext; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/AbstractMvcWiremockIntegrationTest.java similarity index 94% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/AbstractMvcWiremockIntegrationTest.java index 96017c190..aeb9af4ee 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/AbstractMvcWiremockIntegrationTest.java @@ -23,7 +23,7 @@ import com.github.tomakehurst.wiremock.client.WireMock; * @author 4financeIT */ @ContextConfiguration(classes = {MockServerConfiguration.class}) -public abstract class MvcWiremockITest extends MvcITest { +public abstract class AbstractMvcWiremockIntegrationTest extends AbstractMvcIntegrationTest { protected WireMock wireMock; @Autowired protected HttpMockServer httpMockServer; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/DefaultStringToUuidConverterTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/DefaultStringToUuidConverterTests.java similarity index 86% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/DefaultStringToUuidConverterTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/DefaultStringToUuidConverterTests.java index 4b8297e7a..90e2d7618 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/DefaultStringToUuidConverterTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/DefaultStringToUuidConverterTests.java @@ -4,11 +4,9 @@ import org.junit.Test; import java.util.UUID; -import static org.assertj.core.api.Assertions.in; import static org.assertj.core.api.BDDAssertions.then; -import static org.junit.Assert.fail; -public class DefaultStringToUuidConverterTest { +public class DefaultStringToUuidConverterTests { DefaultStringToUuidConverter defaultStringToUuidConverter = new DefaultStringToUuidConverter(); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java similarity index 98% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java index 307a8da11..5e90e09c7 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java @@ -9,7 +9,7 @@ import org.springframework.util.JdkIdGenerator; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.Percentage.withPercentage; -public class PercentageBasedSamplerTest { +public class PercentageBasedSamplerTests { SamplerConfiguration samplerConfiguration = new SamplerConfiguration(); TraceAccessor traceAccessor = traceReturningSpanWithUuid(); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/UuidTraceIdToThresholdComparableTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/UuidTraceIdToThresholdComparableTests.java similarity index 96% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/UuidTraceIdToThresholdComparableTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/UuidTraceIdToThresholdComparableTests.java index 684217eba..beb63e120 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/UuidTraceIdToThresholdComparableTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/UuidTraceIdToThresholdComparableTests.java @@ -8,7 +8,7 @@ import java.util.stream.Stream; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.Percentage.withPercentage; -public class UuidTraceIdToThresholdComparableTest { +public class UuidTraceIdToThresholdComparableTests { final UUID[] traceIds = createRandomUuids(); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTests.java similarity index 97% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTests.java index 2e26f2697..d3d51e437 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTests.java @@ -1,7 +1,5 @@ package org.springframework.cloud.sleuth.template; -import static org.assertj.core.api.BDDAssertions.then; - import org.junit.Test; import org.mockito.Mockito; import org.springframework.cloud.sleuth.Trace; @@ -12,7 +10,9 @@ import org.springframework.cloud.sleuth.trace.TraceContextHolder; import org.springframework.context.ApplicationEventPublisher; import org.springframework.util.JdkIdGenerator; -public class TraceTemplateTest { +import static org.assertj.core.api.BDDAssertions.then; + +public class TraceTemplateTests { TraceManager traceManager = new DefaultTraceManager(new AlwaysSampler(), new JdkIdGenerator(), Mockito.mock(ApplicationEventPublisher.class)); diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTest.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java similarity index 97% rename from spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTest.java rename to spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java index 84b05fcc5..2f7a18145 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTest.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java @@ -10,7 +10,7 @@ import org.mockito.runners.MockitoJUnitRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(MockitoJUnitRunner.class) -public class FallbackHavingEndpointLocatorTest { +public class FallbackHavingEndpointLocatorTests { @Mock DiscoveryClientEndpointLocator discoveryClientEndpointLocator; @Mock ServerPropertiesEndpointLocator serverPropertiesEndpointLocator;