diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTest.java b/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java similarity index 99% rename from buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java index e8ad6211..e679be6e 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTest.java +++ b/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; diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTest.java b/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java similarity index 97% rename from buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java index cfb7d3ff..2aa26a8a 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTest.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java similarity index 97% rename from buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java index 05119254..186fc1b2 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITest.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java similarity index 96% rename from buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java index f487b994..59ec16ea 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITest.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java similarity index 97% rename from buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java index b8d991e8..cb75429a 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTest.java b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java similarity index 97% rename from buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java index 26d8b4e2..0c33e1a6 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTest.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java similarity index 99% rename from buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java index dc5526ae..c7c24821 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java similarity index 98% rename from buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java index cc8df27f..967661ca 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITest.java +++ b/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; diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java similarity index 94% rename from buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java index 5f8cf6cf..0fb82f2b 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITest.java +++ b/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; diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/UtilsTest.java b/buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java similarity index 99% rename from buildSrc/src/test/java/io/spring/gradle/convention/UtilsTest.java rename to buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java index 0bed12b4..d3092c88 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/UtilsTest.java +++ b/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 diff --git a/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTest.java b/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java similarity index 94% rename from buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTest.java rename to buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTests.java index cc6a821f..8b0637d6 100644 --- a/buildSrc/src/test/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtilsTest.java +++ b/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() { diff --git a/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java b/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java similarity index 89% rename from buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java rename to buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java index dc82588c..8dadf377 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java +++ b/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 { } }; } -} \ No newline at end of file +} diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java similarity index 86% rename from buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java rename to buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java index 8bd9ea43..1eff489f 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java +++ b/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; } -} \ No newline at end of file +} diff --git a/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java b/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java similarity index 90% rename from buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java rename to buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java index 5e1c64bb..c387dd40 100644 --- a/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java +++ b/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)); } -} \ No newline at end of file +} diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTests.java similarity index 77% rename from buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java rename to buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTests.java index b6c952f9..91f36db7 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java +++ b/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() {} diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTests.java similarity index 78% rename from buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java rename to buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTests.java index 629721cc..03fe15ad 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java +++ b/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() { diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTests.java similarity index 80% rename from buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java rename to buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTests.java index ce8dcc17..20b4b336 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java +++ b/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() { diff --git a/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java b/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java similarity index 77% rename from buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java rename to buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java index 8c378643..9d5ef882 100644 --- a/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java +++ b/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(); } -} \ No newline at end of file +} diff --git a/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java b/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java similarity index 99% rename from core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java rename to core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITests.java index 30ab617b..0cf73f95 100644 --- a/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java +++ b/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; diff --git a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java similarity index 99% rename from core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java rename to core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITests.java index 3d5279d1..38c106bc 100644 --- a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java +++ b/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; diff --git a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java similarity index 98% rename from core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java rename to core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITests.java index 75db4128..ec072f81 100644 --- a/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/NamingExceptionTest.java b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/NamingExceptionTest.java rename to core/src/test/java/org/springframework/ldap/NamingExceptionTests.java index 92edd256..8fc70795 100644 --- a/core/src/test/java/org/springframework/ldap/NamingExceptionTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java rename to core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java index 8e2c847f..db6662d8 100644 --- a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java +++ b/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"; diff --git a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTest.java b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTest.java rename to core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java index c880ea71..ebad5ec4 100644 --- a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/control/PagedResultTest.java rename to core/src/test/java/org/springframework/ldap/control/PagedResultTests.java index 998ec233..c0276884 100644 --- a/core/src/test/java/org/springframework/ldap/control/PagedResultTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java rename to core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTests.java index b969f39c..ef9b19cd 100644 --- a/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java rename to core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java index c8af605b..85231e9b 100644 --- a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java similarity index 96% rename from core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java rename to core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java index cda46df0..0d42b9bb 100644 --- a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java rename to core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java index cb619839..3c3a30b0 100644 --- a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java similarity index 88% rename from core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java rename to core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java index 7bc412ea..624dc1f2 100644 --- a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java +++ b/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; } }; } diff --git a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java rename to core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java index 7d354cb1..470d4bc5 100644 --- a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTest.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTest.java rename to core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTests.java index e9299d6d..583234aa 100644 --- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientListTest.java +++ b/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"; diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTest.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTest.java rename to core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTests.java index e520a0a3..2ea428c9 100644 --- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientLookupTest.java +++ b/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"); diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTest.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTest.java rename to core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTests.java index 97f25f69..8a47acc1 100644 --- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientRenameTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTest.java b/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTest.java rename to core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTests.java index 629a2bd3..6dd384dc 100644 --- a/core/src/test/java/org/springframework/ldap/core/DefaultLdapClientTest.java +++ b/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"); diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java rename to core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java index 7132f844..2f4c38bc 100644 --- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java rename to core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java index e4da5770..7e6893f8 100644 --- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java +++ b/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"); diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java rename to core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java index f7041d41..6645c330 100644 --- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java rename to core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java index 659b7302..72de452b 100644 --- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java index 8ad21545..e68a46ce 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java index ccff7c74..5be3893a 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java index 71ac8a39..cf287383 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java +++ b/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"; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java index 3959ce89..5b73911a 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java +++ b/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"; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java similarity index 95% rename from core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java index a753bbf3..d50422ed 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java index 758823e0..8ff3c30d 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateTests.java index f29c1d7f..c4538df9 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java +++ b/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"; diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTest.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTest.java rename to core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java index 44840031..04e2191d 100644 --- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTest.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java similarity index 94% rename from core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTest.java rename to core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTests.java index 7f8cb3cc..0d524a75 100644 --- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributesTest.java +++ b/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 diff --git a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTest.java b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java index dc00e2d9..400a037c 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java rename to core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java index 1f23633d..92af7dcf 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java rename to core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java index 6e6b5f7d..1e813c77 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTest.java b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTest.java rename to core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java index 045e843a..b77b7c40 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java similarity index 95% rename from core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java rename to core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java index b4149292..514d4186 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java rename to core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java index ad147f8c..4de4334a 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTest.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTest.java rename to core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java index 94178094..9b2991a1 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java index 06e9b3b4..ac8962fb 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTest.java b/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/core/support/RangeOptionTest.java rename to core/src/test/java/org/springframework/ldap/core/support/RangeOptionTests.java index fede4a7c..35295f3f 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/RangeOptionTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java similarity index 96% rename from core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java rename to core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java index b1299395..5f1ac8f7 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTest.java b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java similarity index 93% rename from core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java index 13c0a2e4..0085d22a 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTest.java +++ b/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; } }); diff --git a/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/AbstractFilterTests.java index 1fa5294f..2c074d21 100644 --- a/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java +++ b/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() diff --git a/core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/AndFilterTests.java index 5a2491d1..2997e839 100644 --- a/core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/EqualsFilterTests.java index b18c322a..41283a11 100644 --- a/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTests.java index 7313def0..d84d7f14 100644 --- a/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java index cee8aab8..b2dca65c 100644 --- a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTests.java index 816e3f9e..2273f304 100644 --- a/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/LikeFilterTests.java index ac630586..caf82f63 100644 --- a/core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/NotFilterTests.java index f3035a0c..e1af3b17 100644 --- a/core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java index 491f4e33..a8208214 100644 --- a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/OrFilterTests.java index 2734e0bf..35eb145a 100644 --- a/core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/filter/PresentFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java index 6230d913..79947889 100644 --- a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java rename to core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTests.java index 6c14c5ff..8f7ec813 100644 --- a/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java rename to core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java index 89c1342e..1346c643 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java rename to core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java index 95572590..ce27a8c2 100644 --- a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java +++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DelegatingContextTest extends AbstractPoolTestCase { +public class DelegatingContextTests extends AbstractPoolTestCase { @Test public void testConstructorAssertions() { diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java rename to core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java index 8995622e..ebe00ad3 100644 --- a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java +++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DelegatingDirContextTest extends AbstractPoolTestCase { +public class DelegatingDirContextTests extends AbstractPoolTestCase { @Test public void testConstructorAssertions() { diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java rename to core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java index 7337580f..2b65338c 100644 --- a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java +++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DelegatingLdapContextTest extends AbstractPoolTestCase { +public class DelegatingLdapContextTests extends AbstractPoolTestCase { @Test public void testConstructorAssertions() { diff --git a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTest.java b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java similarity index 93% rename from core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTest.java rename to core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java index c38a2fbd..775bbdb5 100644 --- a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java rename to core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java index 521f337d..68735ab2 100644 --- a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTest.java b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java similarity index 95% rename from core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java index 30d50d6a..6714e5bb 100644 --- a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java index 7b0b5be5..56113956 100644 --- a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java rename to core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java index ac1868b1..53c4fbbc 100644 --- a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java +++ b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DefaultDirContextValidatorTest { +public class DefaultDirContextValidatorTests { private NamingEnumeration namingEnumerationMock; diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTest.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTest.java rename to core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java index 63a63a66..aef1f014 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTest.java +++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DelegatingContextTest extends AbstractPoolTestCase { +public class DelegatingContextTests extends AbstractPoolTestCase { @Test public void testConstructorAssertions() { diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTest.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTest.java rename to core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java index a1bffd62..751fc064 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTest.java +++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DelegatingDirContextTest extends AbstractPoolTestCase { +public class DelegatingDirContextTests extends AbstractPoolTestCase { @Test public void testConstructorAssertions() { diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTest.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTest.java rename to core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java index 43846a29..d5414bab 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTest.java +++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify; * @author Eric Dalquist * eric.dalquist@doit.wisc.edu */ -public class DelegatingLdapContextTest extends AbstractPoolTestCase { +public class DelegatingLdapContextTests extends AbstractPoolTestCase { @Test public void testConstructorAssertions() { diff --git a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTest.java b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java similarity index 93% rename from core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTest.java rename to core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java index 05c7bdd2..4f14c8e1 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTest.java b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTest.java rename to core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java index 2a3b248a..a131adac 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTest.java b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java similarity index 95% rename from core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java index 3fd63384..b504c65b 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTest.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTest.java rename to core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java index 6673dc64..ee692c99 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTest.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTest.java rename to core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java index f92f18d3..255ed20c 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTest.java +++ b/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 { diff --git a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTest.java b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTest.java rename to core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java index 45b9a596..86e7f799 100644 --- a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java rename to core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java index f1f8a2b5..a31f133f 100644 --- a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTest.java b/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTest.java rename to core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTests.java index 4b9505f8..430a44d5 100644 --- a/core/src/test/java/org/springframework/ldap/support/LdapNameBuilderTest.java +++ b/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() { diff --git a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java rename to core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java index 6977d361..616d3ee3 100644 --- a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java +++ b/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"; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java index b4a597d3..f73a266a 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java index 21459c95..3f33074d 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java similarity index 95% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java index f070d4d9..8398143d 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java +++ b/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; } }; } diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java index 6a025cbc..233e31b0 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java index 025a7d81..9f3c7d29 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java index 57c7d9b3..c9ad8965 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java +++ b/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, diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java index 428ab6a9..987eb056 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java index 0ea459fe..d4fcf7b0 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java +++ b/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; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java index 94a3f771..db805610 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.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 RenameOperationExecutorTest { +public class RenameOperationExecutorTests { private LdapOperations ldapOperationsMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java index 6f526f05..2b356450 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java @@ -23,7 +23,7 @@ import org.springframework.transaction.compensating.CompensatingTransactionOpera import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -public class RenameOperationRecorderTest { +public class RenameOperationRecorderTests { private LdapOperations ldapOperationsMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java index fabe0596..42b9e982 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java @@ -25,7 +25,7 @@ import javax.naming.ldap.LdapName; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class UnbindOperationExecutorTest { +public class UnbindOperationExecutorTests { private LdapOperations ldapOperationsMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java index 22fc8df6..b0fb0d28 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class UnbindOperationRecorderTest { +public class UnbindOperationRecorderTests { private LdapOperations ldapOperationsMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java index 874cdd82..bc1c1d43 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java @@ -29,7 +29,7 @@ import java.lang.reflect.Method; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class CompensatingTransactionUtilsTest { +public class CompensatingTransactionUtilsTests { private DirContext dirContextMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java similarity index 99% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java index c59822dc..bf8fabfd 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class ContextSourceTransactionManagerTest { +public class ContextSourceTransactionManagerTests { private ContextSource contextSourceMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java index 865bda5a..4ba18ab5 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; * * @author Mattias Hellborg Arthursson */ -public class TransactionAwareContextSourceProxyTest { +public class TransactionAwareContextSourceProxyTests { private ContextSource contextSourceMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java index 58b39bc7..aa9e00ec 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.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 TransactionAwareDirContextInvocationHandlerTest { +public class TransactionAwareDirContextInvocationHandlerTests { private ContextSource contextSourceMock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java similarity index 97% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java index 654f8587..a22e3262 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java @@ -23,7 +23,7 @@ import javax.naming.ldap.LdapName; import static org.assertj.core.api.Assertions.assertThat; -public class DefaultTempEntryRenamingStrategyTest { +public class DefaultTempEntryRenamingStrategyTests { @Test public void testGetTemporaryName() { diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java similarity index 95% rename from core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java rename to core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java index 1de94a89..7c3b5cd6 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java @@ -23,7 +23,7 @@ import javax.naming.ldap.LdapName; import static org.assertj.core.api.Assertions.assertThat; -public class DifferentSubtreeTempEntryRenamingStrategyTest { +public class DifferentSubtreeTempEntryRenamingStrategyTests { @Test public void testGetTemporaryName() { diff --git a/core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java similarity index 98% rename from core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java rename to core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java index 8341e47c..60da0247 100644 --- a/core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java +++ b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Mattias Hellborg Arthursson */ -public class ListComparatorTest { +public class ListComparatorTests { private ListComparator tested; diff --git a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java similarity index 98% rename from core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java rename to core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java index 596144c8..b91b892a 100644 --- a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java +++ b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class DefaultCompensatingTransactionOperationManagerTest { +public class DefaultCompensatingTransactionOperationManagerTests { private CompensatingTransactionOperationExecutor operationExecutorMock; diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java similarity index 97% rename from ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java rename to ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java index 57dd18f0..0ada312a 100644 --- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java +++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java @@ -44,9 +44,9 @@ import static org.assertj.core.api.Assertions.fail; * */ @RunWith(Parameterized.class) -public class DefaultAttributeValidationPolicyTest { +public class DefaultAttributeValidationPolicyTests { - private static Logger log = LoggerFactory.getLogger(DefaultAttributeValidationPolicyTest.class); + private static Logger log = LoggerFactory.getLogger(DefaultAttributeValidationPolicyTests.class); private static DefaultAttributeValidationPolicy policy = new DefaultAttributeValidationPolicy(); @@ -138,14 +138,14 @@ public class DefaultAttributeValidationPolicyTest { } /** - * DefaultAttributeValidationPolicyTest: Parameterized constructor. + * DefaultAttributeValidationPolicyTests: Parameterized constructor. * @param line The attribute to parse. * @param id The ID portion of the attribute expected on successful parsing. * @param options The Options expected on successful parsing. * @param value The value expected from successful parsing. * @param type The attribute type: one of enum AttributeType. */ - public DefaultAttributeValidationPolicyTest(String line, String id, String options, String value, + public DefaultAttributeValidationPolicyTests(String line, String id, String options, String value, AttributeType type) { this.line = line; this.id = id; diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTest.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java similarity index 97% rename from ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTest.java rename to ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java index dfb64a3f..acfcf8f5 100644 --- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTest.java +++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Mattias Hellborg Arthursson */ -public class Ldap233LdifParserTest { +public class Ldap233LdifParserTests { /** * This previously went into endless loop. diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTest.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java similarity index 97% rename from ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTest.java rename to ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java index 3ae7abb1..7dd87747 100644 --- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTest.java +++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java @@ -46,9 +46,9 @@ import static org.assertj.core.api.Assertions.fail; * @author Keith Barlow * */ -public class LdifParserTest { +public class LdifParserTests { - private static Logger log = LoggerFactory.getLogger(LdifParserTest.class); + private static Logger log = LoggerFactory.getLogger(LdifParserTests.class); private LdifParser parser; @@ -57,7 +57,7 @@ public class LdifParserTest { * entry is parsed and checked for a DN and objectclass. Output is printed for visual * verification of LDIF correctness. */ - public LdifParserTest() { + public LdifParserTests() { parser = new LdifParser(new ClassPathResource("test.ldif")); parser.setRecordSpecification(new BasicSchemaSpecification()); } diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestManagerConverterFactory.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java similarity index 96% rename from odm/src/test/java/org/springframework/ldap/odm/test/TestManagerConverterFactory.java rename to odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java index 844ff2ef..4ea1bedf 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestManagerConverterFactory.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java @@ -1,19 +1,20 @@ package org.springframework.ldap.odm.test; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.HashSet; import java.util.Set; import org.junit.Test; + import org.springframework.ldap.odm.test.utils.ExecuteRunnable; -import org.springframework.ldap.odm.test.utils.RunnableTest; +import org.springframework.ldap.odm.test.utils.RunnableTests; import org.springframework.ldap.odm.typeconversion.ConverterManager; import org.springframework.ldap.odm.typeconversion.impl.Converter; import org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean; -public class TestManagerConverterFactory { +import static org.junit.Assert.assertEquals; + +public class ConverterFactoryTests { private static class NullConverter implements Converter { @@ -90,7 +91,7 @@ public class TestManagerConverterFactory { converterManagerFactory.setConverterConfig(configList); final ConverterManager converterManager = (ConverterManager) converterManagerFactory.getObject(); - new ExecuteRunnable().runTests(new RunnableTest() { + new ExecuteRunnable().runTests(new RunnableTests() { public void runTest(ConverterTestData testData) { assertEquals(testData.canConvert, converterManager.canConvert(testData.fromClass, testData.syntax, testData.toClass)); diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java similarity index 97% rename from odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java rename to odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java index b7cf31d2..78655690 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java @@ -9,14 +9,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.ldap.odm.test.utils.ExecuteRunnable; -import org.springframework.ldap.odm.test.utils.RunnableTest; +import org.springframework.ldap.odm.test.utils.RunnableTests; import org.springframework.ldap.odm.typeconversion.ConverterException; import org.springframework.ldap.odm.typeconversion.impl.Converter; import org.springframework.ldap.odm.typeconversion.impl.ConverterManagerImpl; import org.springframework.ldap.odm.typeconversion.impl.converters.FromStringConverter; import org.springframework.ldap.odm.typeconversion.impl.converters.ToStringConverter; -public final class TestConverterManager { +public final class ConverterManagerTests { private ConverterManagerImpl converterManager; @@ -111,7 +111,7 @@ public final class TestConverterManager { new ConverterTestData(new URI("https://apache.org/index.html"), String.class, "https://apache.org/index.html") }; - new ExecuteRunnable>().runTests(new RunnableTest>() { + new ExecuteRunnable>().runTests(new RunnableTests>() { public void runTest(ConverterTestData testData) { assertEquals(testData.expectedValue, converterManager.convert(testData.sourceData, "", testData.destClass)); @@ -191,7 +191,7 @@ public final class TestConverterManager { new ConverterTestData(5, "3", Integer.class, Integer.valueOf(125)), new ConverterTestData(6, "3", Integer.class, Integer.valueOf(216)), }; - new ExecuteRunnable>().runTests(new RunnableTest>() { + new ExecuteRunnable>().runTests(new RunnableTests>() { public void runTest(ConverterTestData testData) { assertEquals(testData.expectedValue, converterManager.convert(testData.sourceData, testData.syntax, testData.destClass)); diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java similarity index 97% rename from odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java rename to odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java index d8e614f2..a1280a1d 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java @@ -24,7 +24,7 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; -public class TestsWithJdepend { +public class JDependTests { private JDepend jdepend; diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestLdap.java b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java similarity index 97% rename from odm/src/test/java/org/springframework/ldap/odm/test/TestLdap.java rename to odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java index 52fa5f2f..1060f807 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestLdap.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java @@ -16,21 +16,33 @@ package org.springframework.ldap.odm.test; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Base64; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.naming.Name; +import javax.naming.directory.SearchControls; +import javax.naming.ldap.LdapName; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; -import java.util.Base64; -import org.junit.Ignore; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.core.io.ClassPathResource; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.ContextSource; @@ -45,7 +57,7 @@ import org.springframework.ldap.odm.core.impl.MetaDataException; import org.springframework.ldap.odm.core.impl.OdmManagerImpl; import org.springframework.ldap.odm.test.utils.ExecuteRunnable; import org.springframework.ldap.odm.test.utils.GetFreePort; -import org.springframework.ldap.odm.test.utils.RunnableTest; +import org.springframework.ldap.odm.test.utils.RunnableTests; import org.springframework.ldap.odm.typeconversion.impl.Converter; import org.springframework.ldap.odm.typeconversion.impl.ConverterManagerImpl; import org.springframework.ldap.odm.typeconversion.impl.converters.FromStringConverter; @@ -54,27 +66,14 @@ import org.springframework.ldap.support.LdapUtils; import org.springframework.ldap.test.LdapTestUtils; import org.springframework.util.CollectionUtils; -import javax.naming.Name; -import javax.naming.directory.SearchControls; -import javax.naming.ldap.LdapName; -import javax.naming.spi.NamingManager; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.springframework.ldap.query.LdapQueryBuilder.query; // Tests all OdmManager functions -public final class TestLdap { +public final class LdapTests { - private static final Logger LOG = LoggerFactory.getLogger(TestLdap.class); + private static final Logger LOG = LoggerFactory.getLogger(LdapTests.class); // Base DN for test data private static final LdapName baseName = LdapUtils.newLdapName("o=Whoniverse"); @@ -245,7 +244,7 @@ public final class TestLdap { // Read various entries from the sample data set and check they are what we'd expect. @Test public void read() throws Exception { - new ExecuteRunnable().runTests(new RunnableTest() { + new ExecuteRunnable().runTests(new RunnableTests() { public void runTest(Person testData) { Name dn = testData.getDn(); LOG.debug(String.format("reading - %1$s", dn)); @@ -286,7 +285,7 @@ public final class TestLdap { // we'd expect. @Test public void search() throws Exception { - new ExecuteRunnable().runTests(new RunnableTest() { + new ExecuteRunnable().runTests(new RunnableTests() { public void runTest(SearchTestData testData) { String search = testData.search; LOG.debug(String.format("searching - %1$s", search)); @@ -407,7 +406,7 @@ public final class TestLdap { odmManager.create(person); } LOG.debug("Created all, reading back"); - new ExecuteRunnable().runTests(new RunnableTest() { + new ExecuteRunnable().runTests(new RunnableTests() { public void runTest(Person testData) { Name dn = testData.getDn(); LOG.debug(String.format("reading - %1$s", dn)); @@ -665,15 +664,15 @@ public final class TestLdap { LOG.debug(String.format("Starting ldap test case %1$s", testCase)); // Set up - TestLdap testLdap = new TestLdap(); - testLdap.setUp(url, username, password); + LdapTests ldapTests = new LdapTests(); + ldapTests.setUp(url, username, password); // Run the test - Method testMethod = testLdap.getClass().getMethod(testCase); - testMethod.invoke(testLdap); + Method testMethod = ldapTests.getClass().getMethod(testCase); + testMethod.invoke(ldapTests); // Tear down - testLdap.tearDown(); + ldapTests.tearDown(); LOG.debug(String.format("Test case %1$s completed", testCase)); } @@ -705,7 +704,7 @@ public final class TestLdap { if (cmd.hasOption(Flag.HELP.getShort())) { HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(120, TestLdap.class.getSimpleName(), null, options, null, true); + formatter.printHelp(120, LdapTests.class.getSimpleName(), null, options, null, true); System.exit(0); } diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestSchemaToJava.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java similarity index 98% rename from odm/src/test/java/org/springframework/ldap/odm/test/TestSchemaToJava.java rename to odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java index 6431f1ac..b70b5602 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestSchemaToJava.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java @@ -49,9 +49,9 @@ import java.util.regex.Pattern; import static org.junit.Assert.assertEquals; // Tests the generation of entry Java classes from LDAP schema -public final class TestSchemaToJava { +public final class SchemaToJavaTests { - private static final Logger LOG = LoggerFactory.getLogger(TestLdap.class); + private static final Logger LOG = LoggerFactory.getLogger(LdapTests.class); private static final LdapName baseName = LdapUtils.newLdapName("o=Whoniverse"); diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestSchemaViewer.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java similarity index 96% rename from odm/src/test/java/org/springframework/ldap/odm/test/TestSchemaViewer.java rename to odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java index dcdf84e1..fdd696a0 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestSchemaViewer.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaViewerTests.java @@ -16,28 +16,30 @@ package org.springframework.ldap.odm.test; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.ldap.odm.test.utils.ExecuteRunnable; -import org.springframework.ldap.odm.test.utils.GetFreePort; -import org.springframework.ldap.odm.test.utils.RunnableTest; -import org.springframework.ldap.odm.tools.SchemaViewer; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.ldap.test.LdapTestUtils; - -import javax.naming.ldap.LdapName; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javax.naming.ldap.LdapName; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import org.springframework.ldap.odm.test.utils.ExecuteRunnable; +import org.springframework.ldap.odm.test.utils.GetFreePort; +import org.springframework.ldap.odm.test.utils.RunnableTests; +import org.springframework.ldap.odm.tools.SchemaViewer; +import org.springframework.ldap.support.LdapUtils; +import org.springframework.ldap.test.LdapTestUtils; + import static org.junit.Assert.assertEquals; -public final class TestSchemaViewer { +public final class SchemaViewerTests { // Base DN for test data private static final LdapName baseName = LdapUtils.newLdapName("o=Whoniverse"); @@ -128,7 +130,7 @@ public final class TestSchemaViewer { // ensure we get representative test coverage @Test public void testSchemaViewer() throws Exception { - new ExecuteRunnable().runTests(new RunnableTest() { + new ExecuteRunnable().runTests(new RunnableTests() { public void runTest(TestData testData) { String result = runSchemaViewer(testData.flag, testData.value); assertEquals(testData.result, result); diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java b/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java index 780d1a15..206496ed 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/utils/ExecuteRunnable.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; // Simple utility class to run a given test over a set of test data public final class ExecuteRunnable { - public void runTests(RunnableTest runnableTest, U[] testData) throws Exception { + public void runTests(RunnableTests runnableTest, U[] testData) throws Exception { StackTraceElement ste = Thread.currentThread().getStackTrace()[2]; Logger LOG = LoggerFactory.getLogger(ste.getClassName()); for (U testDatum : testData) { diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTest.java b/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java similarity index 81% rename from odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTest.java rename to odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java index 5a76d4b2..5aa0d84d 100644 --- a/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTest.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/utils/RunnableTests.java @@ -1,7 +1,7 @@ package org.springframework.ldap.odm.test.utils; // Interface to implement for tests to be run by ExecuteRunnable -public interface RunnableTest { +public interface RunnableTests { void runTest(T testData) throws Exception; diff --git a/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTest.java b/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java similarity index 98% rename from samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTest.java rename to samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java index cd6e6eb6..70e2e59e 100644 --- a/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTest.java +++ b/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Ulrik Sandberg */ @ContextConfiguration("/config/testContext.xml") -public class PersonDaoSampleIntegrationTest extends +public class PersonDaoSampleIntegrationTests extends AbstractJUnit4SpringContextTests { protected Person person; diff --git a/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java b/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java similarity index 96% rename from samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java rename to samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java index 33c13ad4..0e40dcb3 100644 --- a/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java +++ b/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java @@ -31,7 +31,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(locations = { "/config/testContext.xml" }) -public class LdapTreeBuilderIntegrationTest extends AbstractJUnit4SpringContextTests { +public class LdapTreeBuilderIntegrationTests extends AbstractJUnit4SpringContextTests { @Autowired private LdapTreeBuilder tested; diff --git a/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTest.java b/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java similarity index 98% rename from samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTest.java rename to samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java index 7e4cf1c6..9136a12f 100644 --- a/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTest.java +++ b/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Ulrik Sandberg */ @ContextConfiguration("/config/testContext.xml") -public class PersonDaoSampleIntegrationTest extends +public class PersonDaoSampleIntegrationTests extends AbstractJUnit4SpringContextTests { protected Person person; diff --git a/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java b/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java similarity index 96% rename from samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java rename to samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java index 33c13ad4..0e40dcb3 100644 --- a/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java +++ b/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java @@ -31,7 +31,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(locations = { "/config/testContext.xml" }) -public class LdapTreeBuilderIntegrationTest extends AbstractJUnit4SpringContextTests { +public class LdapTreeBuilderIntegrationTests extends AbstractJUnit4SpringContextTests { @Autowired private LdapTreeBuilder tested; diff --git a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java similarity index 99% rename from sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java rename to sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java index 440e8bf7..5c197701 100644 --- a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java +++ b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; * * @author Ulrik Sandberg */ -public class VirtualListViewControlDirContextProcessorTest { +public class VirtualListViewControlDirContextProcessorTests { private static final String OID_REQUEST = "2.16.840.1.113730.3.4.9"; diff --git a/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTest.java b/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java similarity index 95% rename from test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTest.java rename to test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java index 314e7c24..594d861e 100644 --- a/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTest.java +++ b/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java @@ -15,7 +15,7 @@ import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.query.LdapQueryBuilder; -public class EmbeddedLdapServerFactoryBeanTest { +public class EmbeddedLdapServerFactoryBeanTests { @Test public void testServerStartup() throws Exception { diff --git a/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTest.java b/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java similarity index 97% rename from test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTest.java rename to test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java index 5417b7e0..c5501a84 100644 --- a/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTest.java +++ b/test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java @@ -31,7 +31,7 @@ import org.springframework.ldap.query.LdapQueryBuilder; import static org.assertj.core.api.Assertions.assertThat; -public class EmbeddedLdapServerFactoryBeanTest { +public class EmbeddedLdapServerFactoryBeanTests { ClassPathXmlApplicationContext ctx; diff --git a/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTest.java b/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java similarity index 97% rename from test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTest.java rename to test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java index 25d9e070..c81cc578 100644 --- a/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTest.java +++ b/test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java @@ -31,7 +31,7 @@ import org.springframework.ldap.query.LdapQueryBuilder; import static org.assertj.core.api.Assertions.assertThat; -public class TestContextSourceFactoryBeanTest { +public class TestContextSourceFactoryBeanTests { ClassPathXmlApplicationContext ctx; diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITest.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java similarity index 98% rename from test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITest.java rename to test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java index 8e94bb6c..20ce9b50 100644 --- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITest.java +++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration("classpath:/incrementalAttributeMapperTest.xml") -public class IncrementalAttributeMapperITest extends AbstractJUnit4SpringContextTests { +public class IncrementalAttributeMapperITests extends AbstractJUnit4SpringContextTests { private static final DistinguishedName BASE_DN = new DistinguishedName("ou=dummy,dc=261consulting,dc=local"); diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITest.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java similarity index 99% rename from test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITest.java rename to test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java index b546b4c5..ca3e11fa 100644 --- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITest.java +++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java @@ -45,9 +45,9 @@ import java.util.regex.Pattern; import static org.assertj.core.api.Assertions.assertThat; // Tests the generation of entry Java classes from LDAP schema -public final class SchemaToJavaAdITest { +public final class SchemaToJavaAdITests { - private static final Logger LOG = LoggerFactory.getLogger(SchemaToJavaAdITest.class); + private static final Logger LOG = LoggerFactory.getLogger(SchemaToJavaAdITests.class); private static final DistinguishedName baseName = new DistinguishedName("dc=261consulting,dc=local"); diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITest.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java similarity index 98% rename from test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITest.java rename to test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java index 9a4358e6..6b8b7412 100644 --- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITest.java +++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration("classpath:/conf/pagedSearchTestContext.xml") -public class PagedSearchITest extends AbstractJUnit4SpringContextTests { +public class PagedSearchITests extends AbstractJUnit4SpringContextTests { @Autowired private ContextSource contextSource; diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITest.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java similarity index 98% rename from test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITest.java rename to test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java index 2df4449b..cb246d26 100644 --- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITest.java +++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext-tls.xml" }) -public class LdapTemplateSearchResultITest extends AbstractJUnit4SpringContextTests { +public class LdapTemplateSearchResultITests extends AbstractJUnit4SpringContextTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITest.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java similarity index 96% rename from test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITest.java rename to test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java index 08d6290f..e96c3dea 100644 --- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITest.java +++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Marvin S. Addison */ @ContextConfiguration(locations = { "/conf/ldapTemplateDigestMd5TestContext.xml" }) -public class DigestMd5AuthenticationITest extends AbstractJUnit4SpringContextTests { +public class DigestMd5AuthenticationITests extends AbstractJUnit4SpringContextTests { @Autowired private LdapTemplate ldapTemplate; diff --git a/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java similarity index 99% rename from test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java rename to test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java index 566014b9..ac8983ee 100644 --- a/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java +++ b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITests.java @@ -90,7 +90,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateVirtualListViewSearchITest extends AbstractJUnit4SpringContextTests { +public class LdapTemplateVirtualListViewSearchITests extends AbstractJUnit4SpringContextTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTest.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java similarity index 96% rename from test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTest.java rename to test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java index 6f49c2ae..5cdb4b8f 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTest.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/NoAdTests.java @@ -19,6 +19,6 @@ package org.springframework.ldap.itest; /** * @author Mattias Hellborg Arthursson */ -public interface NoAdTest { +public interface NoAdTests { } diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java index 2d2718c2..322bb6cb 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java @@ -19,7 +19,7 @@ package org.springframework.ldap; import org.junit.experimental.categories.Categories; import org.junit.runner.manipulation.NoTestsRemainException; import org.junit.runners.model.InitializationError; -import org.springframework.ldap.itest.NoAdTest; +import org.springframework.ldap.itest.NoAdTests; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -40,7 +40,7 @@ public class LdapConditionallyFilteredTestRunner extends SpringJUnit4ClassRunner String noadtest = System.getProperty("adtest"); if (noadtest != null) { try { - filter(Categories.CategoryFilter.exclude(NoAdTest.class)); + filter(Categories.CategoryFilter.exclude(NoAdTests.class)); } catch (NoTestsRemainException e) { // Nothing to do here. diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java index 658deb49..d1bdc511 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java @@ -45,7 +45,7 @@ import java.util.List; @DirtiesContext @RunWith(LdapConditionallyFilteredTestRunner.class) @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class }) -public abstract class AbstractLdapTemplateIntegrationTest { +public abstract class AbstractLdapTemplateIntegrationTests { private final static String DEFAULT_BASE = "dc=261consulting,dc=com"; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java index 903eb024..78b2f451 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientAuthenticationITests.java @@ -46,13 +46,13 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientAuthenticationITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticate() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -61,7 +61,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQuery() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -70,7 +70,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithInvalidPassword() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -80,7 +80,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQueryAndInvalidPassword() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -90,7 +90,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLookupOperationPerformedOnAuthenticatedContext() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -111,7 +111,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQueryAndMapper() { LdapQuery query = LdapQueryBuilder.query().where("objectclass").is("person").and("uid").is("some.person3"); DirContextOperations ctx = tested.authenticate().query(query).password("password") @@ -122,7 +122,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQueryAndMapperAndInvalidPassword() { LdapQuery query = LdapQueryBuilder.query().where("objectclass").is("person").and("uid").is("some.person3"); assertThatExceptionOfType(AuthenticationException.class).isThrownBy(() -> tested.authenticate().query(query) @@ -130,7 +130,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithInvalidPasswordAndCollectedException() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -140,7 +140,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithFilterThatDoesNotMatchAnything() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")) @@ -151,7 +151,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithFilterThatMatchesSeveralEntries() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("cn", "Some Person")); @@ -161,7 +161,7 @@ public class DefaultLdapClientAuthenticationITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookupAttemptingCallback() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java index 75dca6a4..834e6f6d 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientBindUnbindITests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientBindUnbindITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientBindUnbindITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java index 19005b41..06651163 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientListITests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientListITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientListITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java index c73ef475..f91f02ee 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientLookupITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientLookupITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java index 40079e6b..45401e9a 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupMultiRdnITests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientLookupMultiRdnITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientLookupMultiRdnITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; @@ -50,7 +50,7 @@ public class DefaultLdapClientLookupMultiRdnITest extends AbstractLdapTemplateIn * than one attribute is part of the relative DN for the entry. */ @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookup_MultiValuedRdn() { AttributesMapper mapper = new PersonAttributesMapper(); Person person = tested.search().name("cn=Some Person+sn=Person, ou=company1,ou=Norway").toObject(mapper); @@ -65,7 +65,7 @@ public class DefaultLdapClientLookupMultiRdnITest extends AbstractLdapTemplateIn * */ @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookup_MultiValuedRdn_DirContextAdapter() { LdapDataEntry result = tested.search().name("cn=Some Person+sn=Person, ou=company1,ou=Norway").toEntry(); assertThat(result.getStringAttribute("cn")).isEqualTo("Some Person"); @@ -74,7 +74,7 @@ public class DefaultLdapClientLookupMultiRdnITest extends AbstractLdapTemplateIn } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookup_GetNameInNamespace_MultiRdn() { DirContextOperations result = tested.search().name("cn=Some Person+sn=Person,ou=company1,ou=Norway").toEntry(); assertThat(result.getDn().toString()).isEqualTo("cn=Some Person+sn=Person,ou=company1,ou=Norway"); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java index e6786a10..ba014203 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientModifyITests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientModifyITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientModifyITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java similarity index 96% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java index 714b8fa8..9eeab8a2 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRecursiveDeleteITests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientRecursiveDeleteITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientRecursiveDeleteITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; @@ -104,7 +104,7 @@ public class DefaultLdapClientRecursiveDeleteITest extends AbstractLdapTemplateI } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testRecursiveUnbind() { tested.unbind(DN).recursive(true).execute(); @@ -115,7 +115,7 @@ public class DefaultLdapClientRecursiveDeleteITest extends AbstractLdapTemplateI } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testRecursiveUnbindOnLeaf() { tested.unbind(leafDn).recursive(true).execute(); verifyDeleted(leafDn); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java similarity index 97% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java index 44bf1621..f57b7488 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Josh Cummings */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) -public class DefaultLdapClientRenameITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientRenameITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java index 8c83923c..214d64f3 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientSearchResultITests.java @@ -54,7 +54,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query; */ @ContextConfiguration(locations = { "/conf/ldapClientTestContext.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) -public class DefaultLdapClientSearchResultITest extends AbstractLdapTemplateIntegrationTest { +public class DefaultLdapClientSearchResultITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapClient tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java similarity index 97% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java index 4af14b51..57c1a659 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class InvalidBackslashITest extends AbstractLdapTemplateIntegrationTest { +public class InvalidBackslashITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; @@ -89,7 +89,7 @@ public class InvalidBackslashITest extends AbstractLdapTemplateIntegrationTest { * @throws InvalidNameException */ @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testSearchForDnSpoiledByCompositeName() throws InvalidNameException { List result = tested.search("", "(sn=Person6)", new AbstractContextMapper() { @Override diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java similarity index 96% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java index 4dde9f51..dcbb5831 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateAttributesMapperITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateAttributesMapperITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java index 22d0caba..c626d621 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java @@ -45,13 +45,13 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateAuthenticationITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticate() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -59,7 +59,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQuery() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -67,7 +67,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithInvalidPassword() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -75,7 +75,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test(expected = AuthenticationException.class) - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQueryAndInvalidPassword() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -83,7 +83,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLookupOperationPerformedOnAuthenticatedContext() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -102,7 +102,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQueryAndMapper() { DirContextOperations ctx = tested.authenticate( query().where("objectclass").is("person").and("uid").is("some.person3"), "password", @@ -113,7 +113,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test(expected = AuthenticationException.class) - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithLdapQueryAndMapperAndInvalidPassword() { DirContextOperations ctx = tested.authenticate( query().where("objectclass").is("person").and("uid").is("some.person3"), "invalidpassword", @@ -121,7 +121,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithInvalidPasswordAndCollectedException() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); @@ -136,7 +136,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithFilterThatDoesNotMatchAnything() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")) @@ -145,7 +145,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test(expected = IncorrectResultSizeDataAccessException.class) - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticateWithFilterThatMatchesSeveralEntries() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("cn", "Some Person")); @@ -153,7 +153,7 @@ public class LdapTemplateAuthenticationITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookupAttemptingCallback() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java index a3d2bb7b..f90d533b 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateBindUnbindITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateBindUnbindITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java index 32575213..e387f7d3 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateContextExecutorTest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateContextExecutorTests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java similarity index 96% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java index 64de4fb1..79a2affe 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateContextMapperITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateContextMapperITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java index c004eb34..c0da4c8a 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateListITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateListITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java index e3d8fa8e..512f85c4 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateLookupITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateLookupITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java index 4fcf124e..72f0fa2f 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateLookupMultiRdnITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateLookupMultiRdnITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; @@ -49,7 +49,7 @@ public class LdapTemplateLookupMultiRdnITest extends AbstractLdapTemplateIntegra * than one attribute is part of the relative DN for the entry. */ @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookup_MultiValuedRdn() { AttributesMapper mapper = new PersonAttributesMapper(); Person person = (Person) tested.lookup("cn=Some Person+sn=Person, ou=company1,ou=Norway", mapper); @@ -65,7 +65,7 @@ public class LdapTemplateLookupMultiRdnITest extends AbstractLdapTemplateIntegra * */ @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookup_MultiValuedRdn_DirContextAdapter() { DirContextAdapter result = (DirContextAdapter) tested.lookup("cn=Some Person+sn=Person, ou=company1,ou=Norway"); @@ -75,7 +75,7 @@ public class LdapTemplateLookupMultiRdnITest extends AbstractLdapTemplateIntegra } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testLookup_GetNameInNamespace_MultiRdn() { DirContextAdapter result = (DirContextAdapter) tested.lookup("cn=Some Person+sn=Person,ou=company1,ou=Norway"); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java index c60f694d..6f7c388d 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java @@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateModifyITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateModifyITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java similarity index 97% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java index 231ce016..ee0fa818 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateNoBaseSuffixTestContext.xml" }) -public class LdapTemplateNoBaseSuffixITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateNoBaseSuffixITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java similarity index 97% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java index 9a523bd0..77265d07 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.fail; * profile. */ @ContextConfiguration(locations = { "/conf/ldapTemplatePooledTestContext.xml" }) -public class LdapTemplatePooledITest extends AbstractJUnit4SpringContextTests { +public class LdapTemplatePooledITests extends AbstractJUnit4SpringContextTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java similarity index 96% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java index ee1fd28e..89ef0c9a 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java @@ -40,7 +40,7 @@ import static junit.framework.Assert.fail; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateRecursiveDeleteITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateRecursiveDeleteITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; @@ -103,7 +103,7 @@ public class LdapTemplateRecursiveDeleteITest extends AbstractLdapTemplateIntegr } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testRecursiveUnbind() { tested.unbind(DN, true); @@ -114,7 +114,7 @@ public class LdapTemplateRecursiveDeleteITest extends AbstractLdapTemplateIntegr } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testRecursiveUnbindOnLeaf() { tested.unbind(leafDn, true); verifyDeleted(leafDn); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java similarity index 97% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java index ad76a6b3..38cbbb7b 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateRenameITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateRenameITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java index 46557cd1..5c6ef3c0 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java @@ -54,7 +54,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query; */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) -public class LdapTemplateSearchResultITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateSearchResultITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java index f2384b70..72d7dc78 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java @@ -51,7 +51,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query; */ @ContextConfiguration(locations = { "/conf/ldapTemplateNamespaceTestContext.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) -public class LdapTemplateSearchResultNamespaceConfigITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateSearchResultNamespaceConfigITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java similarity index 93% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java index e856d225..10079587 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java @@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; -import org.springframework.ldap.itest.NoAdTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; +import org.springframework.ldap.itest.NoAdTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ulrik Sandberg */ @ContextConfiguration(locations = { "/conf/rootContextSourceTestContext.xml" }) -public class SupportedControlsITest extends AbstractLdapTemplateIntegrationTest { +public class SupportedControlsITests extends AbstractLdapTemplateIntegrationTests { /** must use a context source that has no base set */ @Autowired @@ -53,7 +53,7 @@ public class SupportedControlsITest extends AbstractLdapTemplateIntegrationTest } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testExpectedControlsSupported() throws Exception { /** * Maps the 'supportedcontrol' attribute to a string array. diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java index faf6b1f1..afcb8d8e 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/distinguishedNameEditorTestContext.xml" }) -public class DistinguishedNameEditorITest extends AbstractJUnit4SpringContextTests { +public class DistinguishedNameEditorITests extends AbstractJUnit4SpringContextTests { @Autowired private DummyDistinguishedNameConsumer distinguishedNameConsumer; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java index 6be241d0..78be8aaf 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java @@ -25,7 +25,7 @@ import org.springframework.util.StopWatch; * * @author Ulrik Sandberg */ -public class DnParsePerformanceITest { +public class DnParsePerformanceITests { @Test public void testCreateFromString() { @@ -76,4 +76,4 @@ public class DnParsePerformanceITest { System.out.println(stopWatch.prettyPrint()); } -} \ No newline at end of file +} diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java index 4aa0ada2..e1cb8541 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java @@ -34,8 +34,8 @@ import org.springframework.ldap.core.DirContextProcessor; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.filter.AndFilter; import org.springframework.ldap.filter.EqualsFilter; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; -import org.springframework.ldap.itest.NoAdTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; +import org.springframework.ldap.itest.NoAdTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @ContextConfiguration(locations = { "/conf/simpleLdapTemplateTestContext.xml" }) -public class SimpleLdapTemplateITest extends AbstractLdapTemplateIntegrationTest { +public class SimpleLdapTemplateITests extends AbstractLdapTemplateIntegrationTests { private static String DN_STRING = "cn=Some Person4,ou=company1,ou=Sweden"; @@ -199,7 +199,7 @@ public class SimpleLdapTemplateITest extends AbstractLdapTemplateIntegrationTest } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testAuthenticate() { AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", "person")).and(new EqualsFilter("uid", "some.person3")); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java index bf082c19..c741cde4 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.fail; * * @author Mattias Hellborg Arthursson */ -public class BaseLdapPathBeanPostprocessorITest { +public class BaseLdapPathBeanPostprocessorITests { @Test public void testPostProcessBeforeInitialization() throws Exception { diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java similarity index 97% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java index b31667a1..593570a6 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Mattias Hellborg Arthursson */ -public class BaseLdapPathBeanPostprocessorNamespaceConfigITest { +public class BaseLdapPathBeanPostprocessorNamespaceConfigITests { @Test public void testPostProcessBeforeInitializationWithNamespaceConfig() throws Exception { diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java similarity index 96% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java index a7ea6c5a..4efc0175 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java @@ -27,8 +27,8 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.AbstractContextMapper; import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.ldap.filter.EqualsFilter; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; -import org.springframework.ldap.itest.NoAdTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; +import org.springframework.ldap.itest.NoAdTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapContextSourceIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class LdapContextSourceIntegrationTests extends AbstractLdapTemplateIntegrationTests { @Autowired @Qualifier("contextSource") @@ -108,7 +108,7 @@ public class LdapContextSourceIntegrationTest extends AbstractLdapTemplateIntegr } @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void testGetContext() throws NamingException { DirContext ctx = null; try { @@ -138,7 +138,7 @@ public class LdapContextSourceIntegrationTest extends AbstractLdapTemplateIntegr @SuppressWarnings("unchecked") @Test - @Category(NoAdTest.class) + @Category(NoAdTests.class) public void verifyAuthenticate() { EqualsFilter filter = new EqualsFilter("cn", "Some Person2"); List results = ldapTemplate.search("", filter.toString(), new DnContextMapper()); diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java similarity index 93% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java index 036c500b..9e4a9efc 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapContextSourceTestContext.xml" }) -public class LdapContextSourceMultiServerIntegrationTest extends AbstractJUnit4SpringContextTests { +public class LdapContextSourceMultiServerIntegrationTests extends AbstractJUnit4SpringContextTests { @Autowired private LdapContextSource tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java similarity index 95% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java index 56ba0763..126e8fe1 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java @@ -21,7 +21,7 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.CountNameClassPairCallbackHandler; import org.springframework.ldap.filter.Filter; import org.springframework.ldap.filter.HardcodedFilter; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/hardcodedFilterTestContext.xml", "/conf/ldapTemplateTestContext.xml" }) -public class HardcodedFilterIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class HardcodedFilterIntegrationTests extends AbstractLdapTemplateIntegrationTests { @Autowired private DummyFilterConsumer dummyFilterConsumer; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java similarity index 94% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java index 13f20c98..00fba763 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java @@ -18,7 +18,7 @@ package org.springframework.ldap.itest.integration; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.LdapGroupDao; import org.springframework.test.context.ContextConfiguration; @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldap-247-testContext.xml" }) -public class JiraLdap247ITest extends AbstractLdapTemplateIntegrationTest { +public class JiraLdap247ITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapGroupDao ldapGroupDao; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Test.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Test.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java index 568ee0de..04fd24eb 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Test.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java @@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration("classpath:ldap321.xml") @Transactional @Rollback -public class Ldap321Test { +public class Ldap321Tests { @Autowired private RoleRepo roleRepo; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Test.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Test.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java index 88266c3f..7f266c5b 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Test.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Eddú Meléndez */ @RunWith(SpringJUnit4ClassRunner.class) -public class Ldap473Test { +public class Ldap473Tests { @Autowired private ContextSource contextSource; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java index 5f592885..976e47be 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java @@ -28,7 +28,7 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.test.context.ContextConfiguration; @@ -49,10 +49,10 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapAndJdbcTransactionTestContext.xml" }) -public class ContextSourceAndDataSourceTransactionManagerIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceAndDataSourceTransactionManagerIntegrationTests extends AbstractLdapTemplateIntegrationTests { private static Logger log = LoggerFactory - .getLogger(ContextSourceAndDataSourceTransactionManagerIntegrationTest.class); + .getLogger(ContextSourceAndDataSourceTransactionManagerIntegrationTests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java index 8e8e3ac6..0419d1b2 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java @@ -42,11 +42,11 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/missingLdapAndJdbcTransactionTestContext.xml" }) -public class ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTest +public class ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests extends AbstractJUnit4SpringContextTests { private static Logger log = LoggerFactory - .getLogger(ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTest.class); + .getLogger(ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java index 64b4a975..4510e20e 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java @@ -29,7 +29,7 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.test.context.ContextConfiguration; @@ -51,10 +51,10 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapAndJdbcTransactionNamespaceTestContext.xml" }) -public class ContextSourceAndDataSourceTransactionManagerNamespaceITest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceAndDataSourceTransactionManagerNamespaceITests extends AbstractLdapTemplateIntegrationTests { private static Logger log = LoggerFactory - .getLogger(ContextSourceAndDataSourceTransactionManagerNamespaceITest.class); + .getLogger(ContextSourceAndDataSourceTransactionManagerNamespaceITests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java index 8cc6c27f..7defe997 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.test.context.ContextConfiguration; @@ -43,9 +43,9 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTransactionTestContext.xml" }) -public class ContextSourceTransactionManagerIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceTransactionManagerIntegrationTests extends AbstractLdapTemplateIntegrationTests { - private static Logger log = LoggerFactory.getLogger(ContextSourceTransactionManagerIntegrationTest.class); + private static Logger log = LoggerFactory.getLogger(ContextSourceTransactionManagerIntegrationTests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java index ff90411c..e1f1d73d 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.test.context.ContextConfiguration; @@ -44,9 +44,9 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateNamespaceTransactionTestContext.xml" }) -public class ContextSourceTransactionManagerNamespaceIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceTransactionManagerNamespaceIntegrationTests extends AbstractLdapTemplateIntegrationTests { - private static Logger log = LoggerFactory.getLogger(ContextSourceTransactionManagerNamespaceIntegrationTest.class); + private static Logger log = LoggerFactory.getLogger(ContextSourceTransactionManagerNamespaceIntegrationTests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java index ebd044f7..6a0a343e 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java @@ -24,7 +24,7 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyDao; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.test.context.ContextConfiguration; @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTransactionSubtreeTestContext.xml" }) -public class ContextSourceTransactionManagerSubtreeIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceTransactionManagerSubtreeIntegrationTests extends AbstractLdapTemplateIntegrationTests { @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java index befe9bb6..51cda96c 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPerson; import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPersonDao; @@ -51,10 +51,10 @@ import static org.assertj.core.api.Assertions.fail; * @author Hans Westerbeek */ @ContextConfiguration(locations = { "/conf/ldapAndHibernateTransactionTestContext.xml" }) -public class ContextSourceAndHibernateTransactionManagerIntegrationTest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceAndHibernateTransactionManagerIntegrationTests extends AbstractLdapTemplateIntegrationTests { private static Logger log = LoggerFactory - .getLogger(ContextSourceAndHibernateTransactionManagerIntegrationTest.class); + .getLogger(ContextSourceAndHibernateTransactionManagerIntegrationTests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java index 73f9c2a9..eeec7a5a 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java @@ -39,11 +39,11 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Hans Westerbeek */ @ContextConfiguration(locations = { "/conf/missingLdapAndHibernateTransactionTestContext.xml" }) -public class ContextSourceAndHibernateTransactionManagerLdap179IntegrationTest +public class ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests extends AbstractJUnit4SpringContextTests { private static Logger log = LoggerFactory - .getLogger(ContextSourceAndHibernateTransactionManagerLdap179IntegrationTest.class); + .getLogger(ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java similarity index 99% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java index c75aabcc..705a47f6 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.transaction.compensating.manager.DummyException; import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPerson; import org.springframework.ldap.itest.transaction.compensating.manager.hibernate.OrgPersonDao; @@ -52,10 +52,10 @@ import static org.assertj.core.api.Assertions.fail; * @author Hans Westerbeek */ @ContextConfiguration(locations = { "/conf/ldapAndHibernateTransactionNamespaceTestContext.xml" }) -public class ContextSourceAndHibernateTransactionManagerNamespaceITest extends AbstractLdapTemplateIntegrationTest { +public class ContextSourceAndHibernateTransactionManagerNamespaceITests extends AbstractLdapTemplateIntegrationTests { private static Logger log = LoggerFactory - .getLogger(ContextSourceAndHibernateTransactionManagerNamespaceITest.class); + .getLogger(ContextSourceAndHibernateTransactionManagerNamespaceITests.class); @Autowired @Qualifier("dummyDao") diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java index ce7252f4..77154c27 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java @@ -19,7 +19,7 @@ package org.springframework.ldap.itest.odm; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; @@ -34,7 +34,7 @@ import static org.springframework.ldap.query.LdapQueryBuilder.query; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateOdmGroupManipulationITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateOdmGroupManipulationITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java index ac013b84..2c8e5e87 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; @@ -35,7 +35,7 @@ import org.springframework.test.context.ContextConfiguration; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateOdmWithDnAnnotationsITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateOdmWithDnAnnotationsITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java similarity index 98% rename from test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITest.java rename to test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java index 01dc5232..d72b48db 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITest.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTest; +import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.odm.core.OdmException; import org.springframework.ldap.support.LdapNameBuilder; import org.springframework.ldap.support.LdapUtils; @@ -38,7 +38,7 @@ import org.springframework.test.context.ContextConfiguration; * @author Mattias Hellborg Arthursson */ @ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" }) -public class LdapTemplateOdmWithNoDnAnnotationsITest extends AbstractLdapTemplateIntegrationTest { +public class LdapTemplateOdmWithNoDnAnnotationsITests extends AbstractLdapTemplateIntegrationTests { @Autowired private LdapTemplate tested;