Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed class names to match new context classes.

Browse Source
This commit is contained in:
Luke Taylor
2005-11-06 22:00:27 +00:00
parent 8b88700079
commit e02dbd5c34
10 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java
View File

@@ -181,7 +181,7 @@ public class HttpSessionContextIntegrationFilterTests extends TestCase {
executeFilterInContainerSimulator(new MockFilterConfig(), filter,
request, response, chain);
// Obtain new/update Authentication from HttpSession
// Obtain new/updated Authentication from HttpSession
SecurityContext context = (SecurityContext) request.getSession(false)
.getAttribute(HttpSessionContextIntegrationFilter.ACEGI_SECURITY_CONTEXT_KEY);
assertEquals(updatedPrincipal,
@@ -204,7 +204,7 @@ public class HttpSessionContextIntegrationFilterTests extends TestCase {
executeFilterInContainerSimulator(new MockFilterConfig(), filter,
request, response, chain);
// Obtain new/update Authentication from HttpSession
// Check the session is null
assertNull(request.getSession(false));
}

14
core/src/test/java/org/acegisecurity/providers/jaas/SecureContextLoginModuleTests.java → core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java
View File

@@ -30,14 +30,14 @@ import javax.security.auth.login.LoginException;
/**
* Testst SecureContextLoginModule
* Tests SecurityContextLoginModule
*
* @author Ray Krueger
*/
public class SecureContextLoginModuleTests extends TestCase {
public class SecurityContextLoginModuleTests extends TestCase {
//~ Instance fields ========================================================
private SecureContextLoginModule module = null;
private SecurityContextLoginModule module = null;
private Subject subject = new Subject(false, new HashSet(), new HashSet(),
new HashSet());
private UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("principal",
@@ -82,7 +82,7 @@ public class SecureContextLoginModuleTests extends TestCase {
subject.getPrincipals().contains(auth));
}
public void testNullAuthenticationInSecureContext()
public void testNullAuthenticationInSecurityContext()
throws Exception {
try {
SecurityContextHolder.getContext().setAuthentication(null);
@@ -92,9 +92,9 @@ public class SecureContextLoginModuleTests extends TestCase {
}
}
public void testNullAuthenticationInSecureContextIgnored()
public void testNullAuthenticationInSecurityContextIgnored()
throws Exception {
module = new SecureContextLoginModule();
module = new SecurityContextLoginModule();
Map options = new HashMap();
options.put("ignoreMissingAuthentication", "true");
@@ -109,7 +109,7 @@ public class SecureContextLoginModuleTests extends TestCase {
}
protected void setUp() throws Exception {
module = new SecureContextLoginModule();
module = new SecurityContextLoginModule();
module.initialize(subject, null, null, null);
SecurityContextHolder.setContext(new SecurityContextImpl());
}

2
core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
View File

@@ -79,7 +79,7 @@ public class AuthorizeTagTests extends TestCase {
Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
}
public void testPreventsBodyOutputIfNoSecureContext()
public void testPreventsBodyOutputIfNoSecurityContext()
throws JspException {
SecurityContextHolder.getContext().setAuthentication(null);
authorizeTag.setIfAnyGranted("ROLE_BANKER");

20
core/src/test/java/org/acegisecurity/wrapper/ContextHolderAwareRequestFilterTests.java → core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java
View File

@@ -19,8 +19,8 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.MockFilterConfig;
import net.sf.acegisecurity.wrapper.ContextHolderAwareRequestFilter;
import net.sf.acegisecurity.wrapper.ContextHolderAwareRequestWrapper;
import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter;
import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
import java.io.IOException;
@@ -33,19 +33,19 @@ import org.springframework.mock.web.MockHttpServletRequest;
/**
* Tests {@link ContextHolderAwareRequestFilter}.
* Tests {@link SecurityContextHolderAwareRequestFilter}.
*
* @author Ben Alex
* @version $Id$
*/
public class ContextHolderAwareRequestFilterTests extends TestCase {
public class SecurityContextHolderAwareRequestFilterTests extends TestCase {
//~ Constructors ===========================================================
public ContextHolderAwareRequestFilterTests() {
public SecurityContextHolderAwareRequestFilterTests() {
super();
}
public ContextHolderAwareRequestFilterTests(String arg0) {
public SecurityContextHolderAwareRequestFilterTests(String arg0) {
super(arg0);
}
@@ -56,18 +56,18 @@ public class ContextHolderAwareRequestFilterTests extends TestCase {
}
public static void main(String[] args) {
junit.textui.TestRunner.run(ContextHolderAwareRequestFilterTests.class);
junit.textui.TestRunner.run(SecurityContextHolderAwareRequestFilterTests.class);
}
public void testCorrectOperation() throws Exception {
ContextHolderAwareRequestFilter filter = new ContextHolderAwareRequestFilter();
SecurityContextHolderAwareRequestFilter filter = new SecurityContextHolderAwareRequestFilter();
filter.init(new MockFilterConfig());
filter.doFilter(new MockHttpServletRequest(null, null), null,
new MockFilterChain(ContextHolderAwareRequestWrapper.class));
new MockFilterChain(SecurityContextHolderAwareRequestWrapper.class));
// Now re-execute the filter, ensuring our replacement wrapper is still used
filter.doFilter(new MockHttpServletRequest(null, null), null,
new MockFilterChain(ContextHolderAwareRequestWrapper.class));
new MockFilterChain(SecurityContextHolderAwareRequestWrapper.class));
filter.destroy();
}

20
core/src/test/java/org/acegisecurity/wrapper/ContextHolderAwareRequestWrapperTests.java → core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
View File

@@ -23,25 +23,25 @@ import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.context.SecurityContextHolder;
import net.sf.acegisecurity.providers.TestingAuthenticationToken;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.wrapper.ContextHolderAwareRequestWrapper;
import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
import org.springframework.mock.web.MockHttpServletRequest;
/**
* Tests {@link ContextHolderAwareRequestWrapper}.
* Tests {@link SecurityContextHolderAwareRequestWrapper}.
*
* @author Ben Alex
* @version $Id$
*/
public class ContextHolderAwareRequestWrapperTests extends TestCase {
public class SecurityContextHolderAwareRequestWrapperTests extends TestCase {
//~ Constructors ===========================================================
public ContextHolderAwareRequestWrapperTests() {
public SecurityContextHolderAwareRequestWrapperTests() {
super();
}
public ContextHolderAwareRequestWrapperTests(String arg0) {
public SecurityContextHolderAwareRequestWrapperTests(String arg0) {
super(arg0);
}
@@ -52,7 +52,7 @@ public class ContextHolderAwareRequestWrapperTests extends TestCase {
}
public static void main(String[] args) {
junit.textui.TestRunner.run(ContextHolderAwareRequestWrapperTests.class);
junit.textui.TestRunner.run(SecurityContextHolderAwareRequestWrapperTests.class);
}
public void testCorrectOperationWithStringBasedPrincipal()
@@ -65,7 +65,7 @@ public class ContextHolderAwareRequestWrapperTests extends TestCase {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setRequestURI("/");
ContextHolderAwareRequestWrapper wrapper = new ContextHolderAwareRequestWrapper(request);
SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
assertEquals("marissa", wrapper.getRemoteUser());
assertTrue(wrapper.isUserInRole("ROLE_FOO"));
@@ -87,7 +87,7 @@ public class ContextHolderAwareRequestWrapperTests extends TestCase {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setRequestURI("/");
ContextHolderAwareRequestWrapper wrapper = new ContextHolderAwareRequestWrapper(request);
SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
assertEquals("marissaAsUserDetails", wrapper.getRemoteUser());
assertFalse(wrapper.isUserInRole("ROLE_FOO"));
@@ -105,7 +105,7 @@ public class ContextHolderAwareRequestWrapperTests extends TestCase {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setRequestURI("/");
ContextHolderAwareRequestWrapper wrapper = new ContextHolderAwareRequestWrapper(request);
SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
assertNull(wrapper.getRemoteUser());
assertFalse(wrapper.isUserInRole("ROLE_ANY"));
assertNull(wrapper.getUserPrincipal());
@@ -122,7 +122,7 @@ public class ContextHolderAwareRequestWrapperTests extends TestCase {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setRequestURI("/");
ContextHolderAwareRequestWrapper wrapper = new ContextHolderAwareRequestWrapper(request);
SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
assertNull(wrapper.getRemoteUser());
assertFalse(wrapper.isUserInRole("ROLE_HELLO")); // principal is null, so reject