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

SEC-1012: Minor improvements to SecurityContextHolderAwareRequestFilter and conversion to use jmock for test.

Browse Source
This commit is contained in:
Luke Taylor
2008-12-06 17:31:53 +00:00
parent 953a4ab9ea
commit c3d216e7bb
2 changed files with 47 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java
View File

@@ -15,19 +15,17 @@
package org.springframework.security.wrapper;
import junit.framework.TestCase;
import org.springframework.security.MockFilterConfig;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.http.HttpServletResponse;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.springframework.security.util.PortResolverImpl;
/**
@@ -36,51 +34,30 @@ import javax.servlet.ServletResponse;
* @author Ben Alex
* @version $Id$
*/
public class SecurityContextHolderAwareRequestFilterTests extends TestCase {
//~ Constructors ===================================================================================================
public SecurityContextHolderAwareRequestFilterTests() {
}
public SecurityContextHolderAwareRequestFilterTests(String arg0) {
super(arg0);
}
public class SecurityContextHolderAwareRequestFilterTests {
Mockery jmock = new JUnit4Mockery();
//~ Methods ========================================================================================================
public final void setUp() throws Exception {
super.setUp();
}
public void testCorrectOperation() throws Exception {
@Test
public void expectedRequestWrapperClassIsUsed() throws Exception {
SecurityContextHolderAwareRequestFilter filter = new SecurityContextHolderAwareRequestFilter();
filter.init(new MockFilterConfig());
filter.doFilter(new MockHttpServletRequest(null, null), new MockHttpServletResponse(),
new MockFilterChain(SavedRequestAwareWrapper.class));
filter.setPortResolver(new PortResolverImpl());
filter.setWrapperClass(SavedRequestAwareWrapper.class);
filter.setRolePrefix("ROLE_");
filter.init(jmock.mock(FilterConfig.class));
final FilterChain filterChain = jmock.mock(FilterChain.class);
jmock.checking(new Expectations() {{
exactly(2).of(filterChain).doFilter(
with(aNonNull(SavedRequestAwareWrapper.class)), with(aNonNull(HttpServletResponse.class)));
}});
filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), filterChain);
// Now re-execute the filter, ensuring our replacement wrapper is still used
filter.doFilter(new MockHttpServletRequest(null, null), new MockHttpServletResponse(),
new MockFilterChain(SavedRequestAwareWrapper.class));
filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), filterChain);
filter.destroy();
}
//~ Inner Classes ==================================================================================================
private class MockFilterChain implements FilterChain {
private Class expectedServletRequest;
public MockFilterChain(Class expectedServletRequest) {
this.expectedServletRequest = expectedServletRequest;
}
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
if (request.getClass().isAssignableFrom(expectedServletRequest)) {
assertTrue(true);
} else {
fail("Expected class to be of type " + expectedServletRequest + " but was: " + request.getClass());
}
}
}
}