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

SPR-6291 - UrlPathHelper is too aggressive decoding URLs

Browse Source
This commit is contained in:
Arjen Poutsma
2009-11-09 12:15:17 +00:00
parent 24a9ecd4a3
commit 077055c8f2
7 changed files with 252 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
View File

@@ -26,11 +26,15 @@ import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.HandlerMapping;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Alef Arendsen
* @author Juergen Hoeller
*/
public class PathMatchingUrlHandlerMappingTests extends TestCase {
public class PathMatchingUrlHandlerMappingTests {
public static final String CONF = "/org/springframework/web/servlet/handler/map3.xml";
@@ -38,6 +42,7 @@ public class PathMatchingUrlHandlerMappingTests extends TestCase {
private ConfigurableWebApplicationContext wac;
@Before
public void setUp() throws Exception {
MockServletContext sc = new MockServletContext("");
wac = new XmlWebApplicationContext();
@@ -47,7 +52,8 @@ public class PathMatchingUrlHandlerMappingTests extends TestCase {
hm = (HandlerMapping) wac.getBean("urlMapping");
}
public void testRequestsWithHandlers() throws Exception {
@Test
public void requestsWithHandlers() throws Exception {
Object bean = wac.getBean("mainController");
MockHttpServletRequest req = new MockHttpServletRequest("GET", "/welcome.html");
@@ -63,7 +69,8 @@ public class PathMatchingUrlHandlerMappingTests extends TestCase {
assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
}
public void testActualPathMatching() throws Exception {
@Test
public void actualPathMatching() throws Exception {
// there a couple of mappings defined with which we can test the
// path matching, let's do that...
@@ -222,14 +229,16 @@ public class PathMatchingUrlHandlerMappingTests extends TestCase {
assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
}
public void testDefaultMapping() throws Exception {
@Test
public void defaultMapping() throws Exception {
Object bean = wac.getBean("starController");
MockHttpServletRequest req = new MockHttpServletRequest("GET", "/goggog.html");
HandlerExecutionChain hec = getHandler(req);
assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
}
public void testMappingExposedInRequest() throws Exception {
@Test
public void mappingExposedInRequest() throws Exception {
Object bean = wac.getBean("mainController");
MockHttpServletRequest req = new MockHttpServletRequest("GET", "/show.html");
HandlerExecutionChain hec = getHandler(req);
@@ -241,8 +250,8 @@ public class PathMatchingUrlHandlerMappingTests extends TestCase {
HandlerExecutionChain hec = hm.getHandler(req);
HandlerInterceptor[] interceptors = hec.getInterceptors();
if (interceptors != null) {
for (int i = 0; i < interceptors.length; i++) {
interceptors[i].preHandle(req, null, hec.getHandler());
for (HandlerInterceptor interceptor : interceptors) {
interceptor.preHandle(req, null, hec.getHandler());
}
}
return hec;

7
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
View File

@@ -554,13 +554,6 @@ public class UrlTagTests extends AbstractTagTests {
assertEquals("my%20name%2Bis", tag.urlEncode("my name+is"));
}
public void testUrlEncode_character() throws UnsupportedEncodingException {
assertEquals("%20", tag.urlEncode(' ', "UTF-8"));
assertEquals(" ", URLDecoder.decode("%20", "UTF-8"));
assertEquals("%FE%FF%00%20", tag.urlEncode(' ', "UTF-16"));
assertEquals("%40", tag.urlEncode(' ', "IBM-Thai"));
}
public void testUrlEncodeNull() throws JspException {
assertNull(tag.urlEncode(null));
}