diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java similarity index 99% rename from core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java rename to core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java index 450a638106..bd394fd32a 100755 --- a/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java @@ -13,7 +13,7 @@ import java.util.*; * @author Ruud Senden */ @SuppressWarnings("unchecked") -public class MapBasedAttributes2GrantedAuthoritiesMapperTest { +public class MapBasedAttributes2GrantedAuthoritiesMapperTests { @Test(expected=IllegalArgumentException.class) public void testAfterPropertiesSetNoMap() throws Exception { diff --git a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java similarity index 99% rename from remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java rename to remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java index 679f838006..0a24da297a 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java +++ b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java @@ -34,7 +34,7 @@ import org.junit.Test; * @author Mike Wiesner * @since 3.0 */ -public class JndiDnsResolverTest { +public class JndiDnsResolverTests { private JndiDnsResolver dnsResolver; private InitialContextFactory contextFactory; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTests.java similarity index 98% rename from taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java rename to taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTests.java index 97a42e3f63..00868f873e 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTests.java @@ -22,7 +22,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import javax.servlet.jsp.JspException; -public class AuthzImplAttributeTest extends TestCase { +public class AuthzImplAttributeTests extends TestCase { //~ Instance fields ================================================================================================ private final Authz authz = new AuthzImpl(); diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTests.java similarity index 98% rename from taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java rename to taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTests.java index 760b8a8495..53bf646769 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTests.java @@ -19,7 +19,7 @@ import junit.framework.TestCase; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; -public class AuthzImplAuthorizeTagTest extends TestCase { +public class AuthzImplAuthorizeTagTests extends TestCase { //~ Instance fields ================================================================================================ private Authz authz = new AuthzImpl(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTest.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTest.java rename to web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java index f8302167de..6dd4870a7a 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTest.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java @@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml") -public class DelegatingAuthenticationEntryPointContextTest { +public class DelegatingAuthenticationEntryPointContextTests { @Autowired private DelegatingAuthenticationEntryPoint daep; diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest.java rename to web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java index 86d3a6fda5..3cb8fb26de 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java @@ -29,18 +29,18 @@ import org.springframework.security.web.util.RequestMatcher; /** * Test class for {@link DelegatingAuthenticationEntryPoint} - * + * * @author Mike Wiesner * @since 3.0.2 * @version $Id:$ */ -public class DelegatingAuthenticationEntryPointTest { - +public class DelegatingAuthenticationEntryPointTests { + private DelegatingAuthenticationEntryPoint daep; private LinkedHashMap entryPoints; private AuthenticationEntryPoint defaultEntryPoint; private HttpServletRequest request = new MockHttpServletRequest(); - + @Before public void before() { defaultEntryPoint = mock(AuthenticationEntryPoint.class); @@ -48,20 +48,20 @@ public class DelegatingAuthenticationEntryPointTest { daep = new DelegatingAuthenticationEntryPoint(entryPoints); daep.setDefaultEntryPoint(defaultEntryPoint); } - + @Test public void testDefaultEntryPoint() throws Exception { AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class); RequestMatcher firstRM = mock(RequestMatcher.class); when(firstRM.matches(request)).thenReturn(false); entryPoints.put(firstRM, firstAEP); - + daep.commence(request, null, null); - + verify(defaultEntryPoint).commence(request, null, null); verify(firstAEP, never()).commence(request, null, null); } - + @Test public void testFirstEntryPoint() throws Exception { AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class); @@ -71,15 +71,15 @@ public class DelegatingAuthenticationEntryPointTest { when(firstRM.matches(request)).thenReturn(true); entryPoints.put(firstRM, firstAEP); entryPoints.put(secondRM, secondAEP); - + daep.commence(request, null, null); - + verify(firstAEP).commence(request, null, null); verify(secondAEP, never()).commence(request, null, null); verify(defaultEntryPoint, never()).commence(request, null, null); verify(secondRM, never()).matches(request); } - + @Test public void testSecondEntryPoint() throws Exception { AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class); @@ -90,9 +90,9 @@ public class DelegatingAuthenticationEntryPointTest { when(secondRM.matches(request)).thenReturn(true); entryPoints.put(firstRM, firstAEP); entryPoints.put(secondRM, secondAEP); - + daep.commence(request, null, null); - + verify(secondAEP).commence(request, null, null); verify(firstAEP, never()).commence(request, null, null); verify(defaultEntryPoint, never()).commence(request, null, null); diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java similarity index 99% rename from web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java rename to web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java index cf60ee94b8..dbef315e1a 100644 --- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java +++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java @@ -57,7 +57,7 @@ import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter; * * @author Rob Winch */ -public class JaasApiIntegrationFilterTest { +public class JaasApiIntegrationFilterTests { //~ Instance fields ================================================================================================ private JaasApiIntegrationFilter filter; private MockHttpServletRequest request;