Change Test Names

Closes gh-746

buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java

@@ -28,7 +28,7 @@ import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class IncludeCheckRemotePluginTest {
+class IncludeCheckRemotePluginTests {
 
 	Project rootProject;
 

buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Rob Winch
  */
-public class IntegrationPluginTest {
+public class IntegrationPluginTests {
 	Project rootProject;
 
 	@AfterEach

buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java

@@ -12,7 +12,7 @@ import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class IntegrationTestPluginITest {
+public class IntegrationTestPluginITests {
 	private io.spring.gradle.TestKit testKit;
 
 	@BeforeEach

buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java

@@ -11,7 +11,7 @@ import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JacocoPluginITest{
+public class JacocoPluginITests{
 	private io.spring.gradle.TestKit testKit;
 
 	@BeforeEach

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java

@@ -14,7 +14,7 @@ import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JavadocApiPluginITest {
+public class JavadocApiPluginITests {
 	private TestKit testKit;
 
 	@BeforeEach

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java

@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 /**
  * @author Rob Winch
  */
-public class JavadocApiPluginTest {
+public class JavadocApiPluginTests {
 	Project rootProject;
 
 	@AfterEach

buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java

@@ -14,7 +14,7 @@ import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ShowcaseITest {
+public class ShowcaseITests {
 	private TestKit testKit;
 
 	@BeforeEach

buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java

@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SpringMavenPluginITest {
+public class SpringMavenPluginITests {
 
 	private TestKit testKit;
 

buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java

@@ -11,7 +11,7 @@ import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestsConfigurationPluginITest {
+public class TestsConfigurationPluginITests {
 
 	private TestKit testKit;
 

buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java

@@ -11,7 +11,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class UtilsTest {
+public class UtilsTests {
 	@Mock
 	Project project;
 	@Mock

buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java

@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TransitiveDependencyLookupUtilsTest {
+public class TransitiveDependencyLookupUtilsTests {
 
 	@Test
 	public void lookupJwtVersionWhen93Then961() {

buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java

@@ -3,7 +3,7 @@ package sample;
 import org.junit.Test;
 import org.springframework.core.Ordered;
 
-public class TheTest {
+public class TheTests {
 	@Test
 	public void compilesAndRuns() {
 		Ordered ordered = new Ordered() {
@@ -13,4 +13,4 @@ public class TheTest {
 			}
 		};
 	}
-}
+}

buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java

@@ -3,9 +3,9 @@ package sample;
 import org.junit.Test;
 import jakarta.servlet.http.HttpServletRequest;
 
-public class TheTest {
+public class TheTests {
 	@Test
 	public void compilesAndRuns() {
 		HttpServletRequest request = null;
 	}
-}
+}

buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java

@@ -4,7 +4,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-public class TheClassTest {
+public class TheClassTests {
 	TheClass theClass = new TheClass();
 
 	@Test
@@ -16,4 +16,4 @@ public class TheClassTest {
 	public void doStuffWhenTrueThenFalse() {
 		assertFalse(theClass.doStuff(false));
 	}
-}
+}

buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTests.java

@@ -2,7 +2,7 @@ package api;
 
 import org.junit.jupiter.api.Test;
 
-public class ApiTest {
+public class ApiTests {
 
 	@Test
 	public void api() {}

buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTests.java

@@ -2,7 +2,7 @@ package core;
 
 import org.junit.jupiter.api.Test;
 
-public class CoreClassTest {
+public class CoreClassTests {
 
 	@Test
 	public void test() {

buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTests.java

@@ -2,7 +2,7 @@ package core;
 
 import org.junit.jupiter.api.Test;
 
-public class HasOptionalTest {
+public class HasOptionalTests {
 
 	@Test
 	public void test() {

buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java

@@ -2,9 +2,9 @@ package sample;
 
 import org.junit.*;
 
-public class DependencyTest {
+public class DependencyTests {
 	@Test
 	public void findsDependencyOnClasspath() {
 		new Dependency();
 	}
-}
+}

core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java

@@ -32,7 +32,7 @@ import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
  * @author Mattias Hellborg Arthursson
  * @author Ulrik Sandberg
  */
-public class LdapTemplateLookupOpenLdapITest extends
+public class LdapTemplateLookupOpenLdapITests extends
 		AbstractDependencyInjectionSpringContextTests {
 
 	private LdapTemplate tested;

core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java

@@ -42,7 +42,7 @@ import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
  * 
  * @author Ulrik Sandberg
  */
-public class LdapTemplatePagedSearchITest extends
+public class LdapTemplatePagedSearchITests extends
 		AbstractDependencyInjectionSpringContextTests {
 
 	private static final Name BASE = DistinguishedName.EMPTY_PATH;

core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java

@@ -38,7 +38,7 @@ import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
  * 
  * @author Ulrik Sandberg
  */
-public class LdapTemplateSortedSearchITest extends
+public class LdapTemplateSortedSearchITests extends
 		AbstractDependencyInjectionSpringContextTests {
 
 	private static final Name BASE = DistinguishedName.EMPTY_PATH;

core/src/test/java/org/springframework/ldap/NamingExceptionTests.java

@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull;
  *
  * @author Ulrik Sandberg
  */
-public class NamingExceptionTest {
+public class NamingExceptionTests {
 
 	private ByteArrayOutputStream byteArrayOutputStream;
 

core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class DefaultValuesAuthenticationSourceDecoratorTest {
+public class DefaultValuesAuthenticationSourceDecoratorTests {
 
 	private static final String DEFAULT_PASSWORD = "defaultPassword";
 

core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java

@@ -54,7 +54,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class LdapTemplateNamespaceHandlerTest {
+public class LdapTemplateNamespaceHandlerTests {
 
 	@Test
 	public void verifyParseWithDefaultValues() {

core/src/test/java/org/springframework/ldap/control/PagedResultTests.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @author Mattias Hellborg Arthursson
  * @author Ulrik Sandberg
  */
-public class PagedResultTest {
+public class PagedResultTests {
 
 	@Test
 	public void testEquals() throws Exception {

core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java

@@ -19,7 +19,7 @@ package org.springframework.ldap.control;
 import com.gargoylesoftware.base.testing.EqualsTester;
 import org.junit.Test;
 
-public class PagedResultsCookieTest {
+public class PagedResultsCookieTests {
 
 	@Test
 	public void testEquals() {

core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class PagedResultsDirContextProcessorTest {
+public class PagedResultsDirContextProcessorTests {
 
 	private LdapContext ldapContextMock;
 

core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java

@@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class RequestControlDirContextProcessorTest {
+public class RequestControlDirContextProcessorTests {
 
 	private AbstractRequestControlDirContextProcessor tested;
 
@@ -58,7 +58,7 @@ public class RequestControlDirContextProcessorTest {
 		this.tested = new AbstractRequestControlDirContextProcessor() {
 
 			public Control createRequestControl() {
-				return RequestControlDirContextProcessorTest.this.requestControlMock;
+				return RequestControlDirContextProcessorTests.this.requestControlMock;
 			}
 
 			public void postProcess(DirContext ctx) throws NamingException {

core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Ulrik Sandberg
  */
-public class SortControlDirContextProcessorTest {
+public class SortControlDirContextProcessorTests {
 
 	private LdapContext ldapContextMock;
 

core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java

@@ -26,7 +26,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertSame;
 
-public class CollectingNameClassPairCallbackHandlerTest {
+public class CollectingNameClassPairCallbackHandlerTests {
 
 	private CollectingNameClassPairCallbackHandler tested;
 
@@ -41,8 +41,8 @@ public class CollectingNameClassPairCallbackHandlerTest {
 		this.tested = new CollectingNameClassPairCallbackHandler() {
 			public Object getObjectFromNameClassPair(NameClassPair nameClassPair) {
 				assertThat(nameClassPair)
-						.isSameAs(CollectingNameClassPairCallbackHandlerTest.this.expectedNameClassPair);
-				return CollectingNameClassPairCallbackHandlerTest.this.expectedResult;
+						.isSameAs(CollectingNameClassPairCallbackHandlerTests.this.expectedNameClassPair);
+				return CollectingNameClassPairCallbackHandlerTests.this.expectedResult;
 			}
 		};
 	}

core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ContextMapperCallbackHandlerTest {
+public class ContextMapperCallbackHandlerTests {
 
 	private ContextMapper mapperMock;
 

core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java

@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Ulrik Sandberg
  */
-public class DefaultLdapClientListTest {
+public class DefaultLdapClientListTests {
 
 	private static final String NAME = "o=example.com";
 

core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java

@@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class DefaultLdapClientLookupTest {
+public class DefaultLdapClientLookupTests {
 
 	private static final Name DEFAULT_BASE = LdapUtils.newLdapName("o=example.com");
 

core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java

@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Josh Cummings
  */
-public class DefaultLdapClientRenameTest {
+public class DefaultLdapClientRenameTests {
 
 	private ContextSource contextSourceMock;
 

core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java

@@ -64,7 +64,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Josh Cummings
  */
-public class DefaultLdapClientTest {
+public class DefaultLdapClientTests {
 
 	private static final Name DEFAULT_BASE = LdapUtils.newLdapName("o=example.com");
 

core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java

@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Luke Taylor
  */
-public class DirContextAdapterBugTest {
+public class DirContextAdapterBugTests {
 
 	@Test
 	public void testResetAttributeValuesNotReportedAsModifications() {

core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java

@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.fail;
  * @author Mattias Hellborg Arthursson
  * @author Ulrik Sandberg
  */
-public class DirContextAdapterTest {
+public class DirContextAdapterTests {
 
 	private static final LdapName BASE_NAME = LdapUtils.newLdapName("dc=jayway,dc=se");
 

core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java

@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.fail;
  *
  * @author Mattias Hellborg Arthursson
  */
-public class DistinguishedNameEditorTest {
+public class DistinguishedNameEditorTests {
 
 	private DistinguishedNameEditor tested;
 

core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java

@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.fail;
  * @author Adam Skogman
  * @author Mattias Hellborg Arthursson
  */
-public class DistinguishedNameTest {
+public class DistinguishedNameTests {
 
 	@Test
 	public void testDistinguishedName_CompositeWithSlash() throws Exception {

core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Mattias Hellborg Arthursson
  */
-public class LdapRdnComponentTest {
+public class LdapRdnComponentTests {
 
 	@Test
 	public void testCompareTo_Less() {

core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java

@@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Adam Skogman
  */
-public class LdapRdnTest {
+public class LdapRdnTests {
 
 	@Test
 	public void testLdapRdn_parse_simple() {

core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java

@@ -41,7 +41,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Ulrik Sandberg
  */
-public class LdapTemplateListTest {
+public class LdapTemplateListTests {
 
 	private static final String NAME = "o=example.com";
 

core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java

@@ -37,7 +37,7 @@ import org.springframework.ldap.NameNotFoundException;
 import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
 import org.springframework.ldap.support.LdapUtils;
 
-public class LdapTemplateLookupTest {
+public class LdapTemplateLookupTests {
 
 	private static final String DEFAULT_BASE_STRING = "o=example.com";
 

core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java

@@ -11,7 +11,7 @@ import static org.mockito.Mockito.mock;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class LdapTemplateOdmTest {
+public class LdapTemplateOdmTests {
 
 	private LdapTemplate tested;
 

core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Ulrik Sandberg
  */
-public class LdapTemplateRenameTest {
+public class LdapTemplateRenameTests {
 
 	private ContextSource contextSourceMock;
 

core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java

@@ -70,7 +70,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query;
  * @author Mattias Hellborg Arthursson
  * @author Ulrik Sandberg
  */
-public class LdapTemplateTest {
+public class LdapTemplateTests {
 
 	private static final String DEFAULT_BASE_STRING = "o=example.com";
 

core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java

@@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class NameAwareAttributeTest {
+public class NameAwareAttributeTests {
 
 	@Test
 	public void testEqualsWithIdNotSame() {

core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java

@@ -4,7 +4,7 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class NameAwareAttributesTest {
+public class NameAwareAttributesTests {
 
 	// gh-548
 	@Test

core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java

@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class AbstractContextSourceTest {
+public class AbstractContextSourceTests {
 
 	@Test
 	public void testFormatForUrlNormal() throws InvalidNameException {

core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java

@@ -24,7 +24,7 @@ import javax.naming.NamingException;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class AggregateDirContextProcessorTest {
+public class AggregateDirContextProcessorTests {
 
 	private DirContextProcessor processor1Mock;
 

core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java

@@ -34,7 +34,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Mattias Hellborg Arthursson
  */
-public class BaseLdapPathBeanPostProcessorTest {
+public class BaseLdapPathBeanPostProcessorTests {
 
 	private BaseLdapPathBeanPostProcessor tested;
 

core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
  * @Ulrik Sandberg
  * @author Mattias Hellborg Arthursson
  */
-public class ContextMapperCallbackHandlerWithControlsTest {
+public class ContextMapperCallbackHandlerWithControlsTests {
 
 	private ContextMapperWithControls mapperMock;
 

core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java

@@ -22,7 +22,7 @@ import javax.naming.directory.SearchResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CountNameClassPairResultCallbackHandlerTest {
+public class CountNameClassPairResultCallbackHandlerTests {
 
 	private CountNameClassPairCallbackHandler tested;
 

core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java

@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class DefaultDirObjectFactoryTest {
+public class DefaultDirObjectFactoryTests {
 
 	private Context contextMock;
 

core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java

@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Marius Scurtescu
  * @author Mattias Hellborg Arthursson
  */
-public class DefaultIncrementalAttributesMapperTest {
+public class DefaultIncrementalAttributesMapperTests {
 
 	private DefaultIncrementalAttributesMapper tested;
 

core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java

@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Mattias Hellborg Arthursson
  * @author Ulrik Sandberg
  */
-public class LdapContextSourceTest {
+public class LdapContextSourceTests {
 
 	private LdapContextSource tested;
 

core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java

@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.fail;
  *
  * @author Marius Scurtescu
  */
-public class RangeOptionTest {
+public class RangeOptionTests {
 
 	@Test
 	public void testConstructorInvalid() {

core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java

@@ -23,7 +23,7 @@ import java.util.Hashtable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleDirContextAuthenticationStrategyTest {
+public class SimpleDirContextAuthenticationStrategyTests {
 
 	private SimpleDirContextAuthenticationStrategy tested;
 

core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class SingleContextSourceTest {
+public class SingleContextSourceTests {
 
 	private ContextSource contextSourceMock;
 
@@ -61,7 +61,7 @@ public class SingleContextSourceTest {
 					@Override
 					public Object executeWithContext(DirContext ctx) throws NamingException {
 						Object targetContex = getInternalState(Proxy.getInvocationHandler(ctx), "target");
-						assertThat(targetContex).isSameAs(SingleContextSourceTest.this.dirContextMock);
+						assertThat(targetContex).isSameAs(SingleContextSourceTests.this.dirContextMock);
 						return false;
 					}
 				});
@@ -73,7 +73,7 @@ public class SingleContextSourceTest {
 					@Override
 					public Object executeWithContext(DirContext ctx) throws NamingException {
 						Object targetContex = getInternalState(Proxy.getInvocationHandler(ctx), "target");
-						assertThat(targetContex).isSameAs(SingleContextSourceTest.this.dirContextMock);
+						assertThat(targetContex).isSameAs(SingleContextSourceTests.this.dirContextMock);
 						return false;
 					}
 				});

core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java

@@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Adam Skogman
  */
-public class AbstractFilterTest {
+public class AbstractFilterTests {
 
 	/*
 	 * Test for String encode()

core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Adam Skogman
  */
-public class AndFilterTest {
+public class AndFilterTests {
 
 	@Test
 	public void testZero() {

core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Adam Skogman
  */
-public class EqualsFilterTest {
+public class EqualsFilterTests {
 
 	@Test
 	public void testEncode() {

core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class GreaterThanOrEqualsFilterTest {
+public class GreaterThanOrEqualsFilterTests {
 
 	@Test
 	public void testEncode() {

core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Ulrik Sandberg
  */
-public class HardcodedFilterTest {
+public class HardcodedFilterTests {
 
 	@Test
 	public void testHardcodedFilter() {

core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class LessThanOrEqualsFilterTest {
+public class LessThanOrEqualsFilterTests {
 
 	@Test
 	public void testEncode() {

core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Anders Henja
  */
-public class LikeFilterTest {
+public class LikeFilterTests {
 
 	@Test
 	public void testEncodeValue_blank() {

core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java

@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Mattias Hellborg Arthursson
  */
-public class NotFilterTest {
+public class NotFilterTests {
 
 	@Test
 	public void testConstructor() {

core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Ulrik Sandberg
  */
-public class NotPresentFilterTest {
+public class NotPresentFilterTests {
 
 	@Test
 	public void testNotPresentFilter() {

core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Adam Skogman
  */
-public class OrFilterTest {
+public class OrFilterTests {
 
 	@Test
 	public void testZero() {

core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Ulrik Sandberg
  */
-public class PresentFilterTest {
+public class PresentFilterTests {
 
 	@Test
 	public void testPresentFilter() {

core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Adam Skogman
  */
-public class WhitespaceWildcardsFilterTest {
+public class WhitespaceWildcardsFilterTests {
 
 	@Test
 	public void testEncodeValue_blank() {

core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java

@@ -23,7 +23,7 @@ import org.springframework.util.StringUtils;
  * @author Mattias Hellborg Arthursson
  */
 @RunWith(MockitoJUnitRunner.class)
-public class DefaultObjectDirectoryMapperTest {
+public class DefaultObjectDirectoryMapperTests {
 
 	private DefaultObjectDirectoryMapper tested;
 

core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DelegatingContextTest extends AbstractPoolTestCase {
+public class DelegatingContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testConstructorAssertions() {

core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java

@@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DelegatingDirContextTest extends AbstractPoolTestCase {
+public class DelegatingDirContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testConstructorAssertions() {

core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DelegatingLdapContextTest extends AbstractPoolTestCase {
+public class DelegatingLdapContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testConstructorAssertions() {

core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java

@@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Ulrik Sandberg
  */
-public class MutableDelegatingLdapContextTest extends AbstractPoolTestCase {
+public class MutableDelegatingLdapContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testSupportedMethodsAllowedToCall() throws Exception {

core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java

@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
 /**
  * @author Eric Dalquist
  */
-public class DirContextPoolableObjectFactoryTest extends AbstractPoolTestCase {
+public class DirContextPoolableObjectFactoryTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testProperties() throws Exception {

core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java

@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
  *
  * @author Ulrik Sandberg
  */
-public class MutablePoolingContextSourceTest extends AbstractPoolTestCase {
+public class MutablePoolingContextSourceTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testGetReadOnlyLdapContext() throws Exception {

core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
 /**
  * @author Eric Dalquist
  */
-public class PoolingContextSourceTest extends AbstractPoolTestCase {
+public class PoolingContextSourceTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testProperties() throws Exception {

core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DefaultDirContextValidatorTest {
+public class DefaultDirContextValidatorTests {
 
 	private NamingEnumeration namingEnumerationMock;
 

core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DelegatingContextTest extends AbstractPoolTestCase {
+public class DelegatingContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testConstructorAssertions() {

core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java

@@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DelegatingDirContextTest extends AbstractPoolTestCase {
+public class DelegatingDirContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testConstructorAssertions() {

core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
  * @author Eric Dalquist
  * <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
  */
-public class DelegatingLdapContextTest extends AbstractPoolTestCase {
+public class DelegatingLdapContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testConstructorAssertions() {

core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java

@@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Ulrik Sandberg
  */
-public class MutableDelegatingLdapContextTest extends AbstractPoolTestCase {
+public class MutableDelegatingLdapContextTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testSupportedMethodsAllowedToCall() throws Exception {

core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java

@@ -41,7 +41,7 @@ import static org.mockito.Mockito.when;
  * @author Eric Dalquist
  * @author Anindya Chatterjee
  */
-public class DirContextPooledObjectFactoryTest extends AbstractPoolTestCase {
+public class DirContextPooledObjectFactoryTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testProperties() throws Exception {

core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java

@@ -30,7 +30,7 @@ import static org.mockito.Mockito.when;
  * @author Ulrik Sandberg
  * @author Anindya Chatterjee
  */
-public class MutablePooledContextSourceTest extends AbstractPoolTestCase {
+public class MutablePooledContextSourceTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testGetReadOnlyLdapContext() throws Exception {

core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java

@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Anindya Chatterjee
  */
-public class PoolConfigTest extends AbstractPoolTestCase {
+public class PoolConfigTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testProperties() {

core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
  * @author Eric Dalquist
  * @author Anindya Chatterjee
  */
-public class PooledContextSourceTest extends AbstractPoolTestCase {
+public class PooledContextSourceTests extends AbstractPoolTestCase {
 
 	@Test
 	public void testProperties() throws Exception {

core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java

@@ -9,7 +9,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class LdapQueryBuilderTest {
+public class LdapQueryBuilderTests {
 
 	@Test
 	public void buildSimpleWithDefaults() {

core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java

@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Adam Skogman
  */
-public class LdapEncoderTest {
+public class LdapEncoderTests {
 
 	@Test
 	public void testFilterEncode() {

core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java

@@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class LdapNameBuilderTest {
+public class LdapNameBuilderTests {
 
 	@Test
 	public void testAddComponentToEmpty() {

core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class LdapUtilsTest {
+public class LdapUtilsTests {
 
 	private static final String EXPECTED_DN_STRING = "cn=john.doe, OU=Users,OU=SE,OU=G,OU=I,OU=M";
 

core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-public class BindOperationExecutorTest {
+public class BindOperationExecutorTests {
 
 	private LdapOperations ldapOperationsMock;
 

core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java

@@ -29,7 +29,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
-public class BindOperationRecorderTest {
+public class BindOperationRecorderTests {
 
 	private LdapOperations ldapOperationsMock;
 

core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java

@@ -25,7 +25,7 @@ import javax.naming.directory.DirContext;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-public class LdapCompensatingTransactionOperationFactoryTest {
+public class LdapCompensatingTransactionOperationFactoryTests {
 
 	private LdapOperations ldapOperationsMock;
 
@@ -44,8 +44,8 @@ public class LdapCompensatingTransactionOperationFactoryTest {
 		this.tested = new LdapCompensatingTransactionOperationFactory(this.renamingStrategyMock) {
 
 			LdapOperations createLdapOperationsInstance(DirContext ctx) {
-				assertThat(ctx).isEqualTo(LdapCompensatingTransactionOperationFactoryTest.this.dirContextMock);
-				return LdapCompensatingTransactionOperationFactoryTest.this.ldapOperationsMock;
+				assertThat(ctx).isEqualTo(LdapCompensatingTransactionOperationFactoryTests.this.dirContextMock);
+				return LdapCompensatingTransactionOperationFactoryTests.this.ldapOperationsMock;
 			}
 		};
 	}

core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java

@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class LdapTransactionUtilsTest {
+public class LdapTransactionUtilsTests {
 
 	private DirContext dirContextMock;
 

core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-public class ModifyAttributesOperationExecutorTest {
+public class ModifyAttributesOperationExecutorTests {
 
 	private LdapOperations ldapOperationsMock;
 

core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java

@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ModifyAttributesOperationRecorderTest {
+public class ModifyAttributesOperationRecorderTests {
 
 	private LdapOperations ldapOperationsMock;
 
@@ -64,7 +64,7 @@ public class ModifyAttributesOperationRecorderTest {
 
 		this.tested = new ModifyAttributesOperationRecorder(this.ldapOperationsMock) {
 			IncrementalAttributesMapper getAttributesMapper(String[] attributeNames) {
-				return ModifyAttributesOperationRecorderTest.this.attributesMapperMock;
+				return ModifyAttributesOperationRecorderTests.this.attributesMapperMock;
 			}
 
 			protected ModificationItem getCompensatingModificationItem(Attributes originalAttributes,

core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java

@@ -26,7 +26,7 @@ import javax.naming.ldap.LdapName;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class RebindOperationExecutorTest {
+public class RebindOperationExecutorTests {
 
 	private LdapOperations ldapOperationsMock;
 

core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java

@@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class RebindOperationRecorderTest {
+public class RebindOperationRecorderTests {
 
 	private LdapOperations ldapOperationsMock;