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

Fix standard multipart binding + Polish

Browse Source 
Fixing standard multipart binding when multiple parts share
the same name.

Uncomment previously @Ignored tests now that Jetty supports
Servlet 3.0 spec.

Issue: SPR-10591
This commit is contained in:
Brian Clozel
2013-11-19 20:48:41 +01:00
committed by Phillip Webb
parent 6f2004f4f8
commit cc4faa5990
3 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import javax.servlet.MultipartConfigElement;
import javax.servlet.ServletException;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +37,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.http.MediaType;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.mock.web.test.MockMultipartFile;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.SocketUtils;
@@ -109,7 +107,7 @@ public class WebRequestDataBinderIntegrationTests {
partsServlet.setBean(bean);
MultiValueMap<String, Object> parts = new LinkedMultiValueMap<String, Object>();
MockMultipartFile firstPart = new MockMultipartFile("fileName", "aValue".getBytes());
Resource firstPart = new ClassPathResource("/org/springframework/http/converter/logo.jpg");
parts.add("firstPart", firstPart);
parts.add("secondPart", "secondValue");
@@ -134,7 +132,7 @@ public class WebRequestDataBinderIntegrationTests {
template.postForLocation(baseUrl + "/partlist", parts);
assertNotNull(bean.getPartList());
assertEquals(parts.size(), bean.getPartList().size());
assertEquals(parts.get("partList").size(), bean.getPartList().size());
}