Browse Source

Renamed **/Test.java to **/Tests.java to better follow conventions

pull/1/head
Rob Winch 14 years ago
parent
commit
8ca2927761
  1. 2
      core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java
  2. 2
      remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java
  3. 2
      taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTests.java
  4. 2
      taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTests.java
  5. 2
      web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java
  6. 26
      web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java
  7. 2
      web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java

2
core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java → core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java

@ -13,7 +13,7 @@ import java.util.*; @@ -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 {

2
remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java → remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java

@ -34,7 +34,7 @@ import org.junit.Test; @@ -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;

2
taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java → taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTests.java

@ -22,7 +22,7 @@ import org.springframework.security.core.context.SecurityContextHolder; @@ -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();

2
taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java → taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTests.java

@ -19,7 +19,7 @@ import junit.framework.TestCase; @@ -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();

2
web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTest.java → web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java

@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -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;

26
web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest.java → web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java

@ -29,18 +29,18 @@ import org.springframework.security.web.util.RequestMatcher; @@ -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<RequestMatcher, AuthenticationEntryPoint> entryPoints;
private AuthenticationEntryPoint defaultEntryPoint;
private HttpServletRequest request = new MockHttpServletRequest();
@Before
public void before() {
defaultEntryPoint = mock(AuthenticationEntryPoint.class);
@ -48,20 +48,20 @@ public class DelegatingAuthenticationEntryPointTest { @@ -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 { @@ -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 { @@ -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);

2
web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTest.java → web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java

@ -57,7 +57,7 @@ import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter; @@ -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;
Loading…
Cancel
Save