Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored to remove dependency on FilterInvocationUtils.

This commit is contained in:
Luke Taylor 2009-05-01 08:57:28 +00:00
parent 4bc788828c
commit f6800fbe04
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java
View File

@ -1,14 +1,15 @@
package org.springframework.security.web.expression; package org.springframework.security.web.expression;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletResponse;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Test; import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.web.FilterInvocation; import org.springframework.security.web.FilterInvocation;
import org.springframework.security.web.util.FilterInvocationUtils;
/** /**
* Tests for {@link WebSecurityExpressionRoot}. * Tests for {@link WebSecurityExpressionRoot}.
@ -18,15 +19,15 @@ import org.springframework.security.web.util.FilterInvocationUtils;
* @since 2.5 * @since 2.5
*/ */
public class WebSecurityExpressionRootTests { public class WebSecurityExpressionRootTests {
Mockery jmock = new JUnit4Mockery();
@Test @Test
public void ipAddressMatchesForEqualIpAddresses() throws Exception { public void ipAddressMatchesForEqualIpAddresses() throws Exception {
FilterInvocation fi = FilterInvocationUtils.create("/test"); MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletRequest request = (MockHttpServletRequest) fi.getHttpRequest(); request.setRequestURI("/test");
// IPv4 // IPv4
request.setRemoteAddr("192.168.1.1"); request.setRemoteAddr("192.168.1.1");
WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(jmock.mock(Authentication.class), fi); WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(mock(Authentication.class),
new FilterInvocation(request, mock(HttpServletResponse.class), mock(FilterChain.class)));
assertTrue(root.hasIpAddress("192.168.1.1")); assertTrue(root.hasIpAddress("192.168.1.1"));
@ -37,9 +38,10 @@ public class WebSecurityExpressionRootTests {
@Test @Test
public void addressesInIpRangeMatch() throws Exception { public void addressesInIpRangeMatch() throws Exception {
FilterInvocation fi = FilterInvocationUtils.create("/test"); MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletRequest request = (MockHttpServletRequest) fi.getHttpRequest(); request.setRequestURI("/test");
WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(jmock.mock(Authentication.class), fi); WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(mock(Authentication.class),
new FilterInvocation(request, mock(HttpServletResponse.class), mock(FilterChain.class)));
for (int i=0; i < 255; i++) { for (int i=0; i < 255; i++) {
request.setRemoteAddr("192.168.1." + i); request.setRemoteAddr("192.168.1." + i);
assertTrue(root.hasIpAddress("192.168.1.0/24")); assertTrue(root.hasIpAddress("192.168.1.0/24"));