Unified test naming

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(),

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(),

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;

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(),

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();

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;

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;

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;

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;

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();
 

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();

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();
 

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));
 

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;