From d6f2b136ecff235296eade803e535c70ffd7d6eb Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 9 Apr 2005 23:37:18 +0000 Subject: [PATCH] Refactored to use Spring mock classes. --- .../acegisecurity/util/FilterChainProxyTests.java | 6 +++--- .../acegisecurity/util/FilterToBeanProxyTests.java | 14 +++++++------- .../acegisecurity/util/PortResolverImplTests.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java b/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java index 50baad4d41..6f26472891 100644 --- a/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java +++ b/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java @@ -21,14 +21,14 @@ import net.sf.acegisecurity.ConfigAttribute; import net.sf.acegisecurity.ConfigAttributeDefinition; import net.sf.acegisecurity.MockApplicationContext; import net.sf.acegisecurity.MockFilterConfig; -import net.sf.acegisecurity.MockHttpServletRequest; -import net.sf.acegisecurity.MockHttpServletResponse; import net.sf.acegisecurity.intercept.web.FilterInvocationDefinitionSource; import net.sf.acegisecurity.intercept.web.MockFilterInvocationDefinitionSource; import net.sf.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; /** @@ -137,7 +137,7 @@ public class FilterChainProxyTests extends TestCase { assertFalse(filter.isWasDoFiltered()); assertFalse(filter.isWasDestroyed()); - MockHttpServletRequest request = new MockHttpServletRequest(null); + MockHttpServletRequest request = new MockHttpServletRequest(); request.setServletPath("/foo/secure/super/somefile.html"); MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java b/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java index fc3173893c..eadf5c33f6 100644 --- a/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java +++ b/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java @@ -18,11 +18,11 @@ package net.sf.acegisecurity.util; import junit.framework.TestCase; import net.sf.acegisecurity.MockFilterConfig; -import net.sf.acegisecurity.MockHttpServletRequest; -import net.sf.acegisecurity.MockHttpServletResponse; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.mock.web.MockHttpServletRequest; import java.io.IOException; @@ -160,7 +160,7 @@ public class FilterToBeanProxyTests extends TestCase { MockFilterChain chain = new MockFilterChain(true); MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest("/go"); + MockHttpServletRequest request = new MockHttpServletRequest(); FilterToBeanProxy filter = new MockFilterToBeanProxy( "net/sf/acegisecurity/util/filtertest-valid.xml"); @@ -179,7 +179,7 @@ public class FilterToBeanProxyTests extends TestCase { MockFilterChain chain = new MockFilterChain(true); MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest("/go"); + MockHttpServletRequest request = new MockHttpServletRequest(); FilterToBeanProxy filter = new MockFilterToBeanProxy( "net/sf/acegisecurity/util/filtertest-valid.xml"); @@ -198,7 +198,7 @@ public class FilterToBeanProxyTests extends TestCase { MockFilterChain chain = new MockFilterChain(true); MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest("/go"); + MockHttpServletRequest request = new MockHttpServletRequest(); FilterToBeanProxy filter = new MockFilterToBeanProxy( "net/sf/acegisecurity/util/filtertest-valid.xml"); @@ -217,7 +217,7 @@ public class FilterToBeanProxyTests extends TestCase { MockFilterChain chain = new MockFilterChain(true); MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest("/go"); + MockHttpServletRequest request = new MockHttpServletRequest(); FilterToBeanProxy filter = new MockFilterToBeanProxy( "net/sf/acegisecurity/util/filtertest-valid.xml"); @@ -237,7 +237,7 @@ public class FilterToBeanProxyTests extends TestCase { MockFilterChain chain = new MockFilterChain(true); MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest("/go"); + MockHttpServletRequest request = new MockHttpServletRequest(); FilterToBeanProxy filter = new MockFilterToBeanProxy( "net/sf/acegisecurity/util/filtertest-valid.xml"); diff --git a/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java b/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java index d6d6ab1efc..9f98e15cee 100644 --- a/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java +++ b/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java @@ -16,8 +16,8 @@ package net.sf.acegisecurity.util; import junit.framework.TestCase; +import org.springframework.mock.web.MockHttpServletRequest; -import net.sf.acegisecurity.MockHttpServletRequest; /** @@ -51,7 +51,7 @@ public class PortResolverImplTests extends TestCase { PortResolverImpl pr = new PortResolverImpl(); pr.afterPropertiesSet(); - MockHttpServletRequest request = new MockHttpServletRequest("X"); + MockHttpServletRequest request = new MockHttpServletRequest(); request.setServerPort(8443); request.setScheme("HTtP"); // proves case insensitive handling assertEquals(8080, pr.getServerPort(request)); @@ -61,7 +61,7 @@ public class PortResolverImplTests extends TestCase { PortResolverImpl pr = new PortResolverImpl(); pr.afterPropertiesSet(); - MockHttpServletRequest request = new MockHttpServletRequest("X"); + MockHttpServletRequest request = new MockHttpServletRequest(); request.setServerPort(8080); request.setScheme("HTtPs"); // proves case insensitive handling assertEquals(8443, pr.getServerPort(request)); @@ -90,7 +90,7 @@ public class PortResolverImplTests extends TestCase { PortResolverImpl pr = new PortResolverImpl(); pr.afterPropertiesSet(); - MockHttpServletRequest request = new MockHttpServletRequest("X"); + MockHttpServletRequest request = new MockHttpServletRequest(); request.setScheme("http"); request.setServerPort(1021); assertEquals(1021, pr.getServerPort(request));