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

NativeWebRequest detects native MultipartRequest even when decorated (SPR-6594)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-03-30 10:24:39 +00:00
parent 81e81ce77c
commit 2c9753ad25
12 changed files with 321 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
org.springframework.web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2006 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,17 +18,27 @@ package org.springframework.web.context.request;
import java.util.Locale;
import java.util.Map;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import junit.framework.TestCase;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.multipart.MultipartRequest;
/**
* @author Juergen Hoeller
* @since 26.07.2006
*/
public class ServletWebRequestTests extends TestCase {
public class ServletWebRequestTests {
@Test
public void testParameters() {
MockHttpServletRequest servletRequest = new MockHttpServletRequest();
servletRequest.addParameter("param1", "value1");
@@ -53,6 +63,7 @@ public class ServletWebRequestTests extends TestCase {
assertEquals("value2a", ((String[]) paramMap.get("param2"))[1]);
}
@Test
public void testLocale() {
MockHttpServletRequest servletRequest = new MockHttpServletRequest();
servletRequest.addPreferredLocale(Locale.UK);
@@ -61,4 +72,40 @@ public class ServletWebRequestTests extends TestCase {
assertEquals(Locale.UK, request.getLocale());
}
@Test
public void testNativeRequest() {
MockHttpServletRequest servletRequest = new MockHttpServletRequest();
MockHttpServletResponse servletResponse = new MockHttpServletResponse();
ServletWebRequest request = new ServletWebRequest(servletRequest, servletResponse);
assertSame(servletRequest, request.getNativeRequest());
assertSame(servletRequest, request.getNativeRequest(ServletRequest.class));
assertSame(servletRequest, request.getNativeRequest(HttpServletRequest.class));
assertSame(servletRequest, request.getNativeRequest(MockHttpServletRequest.class));
assertNull(request.getNativeRequest(MultipartRequest.class));
assertSame(servletResponse, request.getNativeResponse());
assertSame(servletResponse, request.getNativeResponse(ServletResponse.class));
assertSame(servletResponse, request.getNativeResponse(HttpServletResponse.class));
assertSame(servletResponse, request.getNativeResponse(MockHttpServletResponse.class));
assertNull(request.getNativeResponse(MultipartRequest.class));
}
@Test
public void testDecoratedNativeRequest() {
MockHttpServletRequest servletRequest = new MockHttpServletRequest();
MockHttpServletResponse servletResponse = new MockHttpServletResponse();
HttpServletRequest decoratedRequest = new HttpServletRequestWrapper(servletRequest);
HttpServletResponse decoratedResponse = new HttpServletResponseWrapper(servletResponse);
ServletWebRequest request = new ServletWebRequest(decoratedRequest, decoratedResponse);
assertSame(decoratedRequest, request.getNativeRequest());
assertSame(decoratedRequest, request.getNativeRequest(ServletRequest.class));
assertSame(decoratedRequest, request.getNativeRequest(HttpServletRequest.class));
assertSame(servletRequest, request.getNativeRequest(MockHttpServletRequest.class));
assertNull(request.getNativeRequest(MultipartRequest.class));
assertSame(decoratedResponse, request.getNativeResponse());
assertSame(decoratedResponse, request.getNativeResponse(ServletResponse.class));
assertSame(decoratedResponse, request.getNativeResponse(HttpServletResponse.class));
assertSame(servletResponse, request.getNativeResponse(MockHttpServletResponse.class));
assertNull(request.getNativeResponse(MultipartRequest.class));
}
}