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

SPR-6247 - Multipart Content-Type charset is ignored in CommonsFileUploadSupport.

Browse Source
This commit is contained in:
Arjen Poutsma
2009-10-27 11:42:36 +00:00
parent d54a975af4
commit d0893c425e
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.web/src/test/java/org/springframework/http/MediaTypeTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.http;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.nio.charset.Charset;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -55,6 +56,15 @@ public class MediaTypeTests {
assertEquals("Invalid quality factor", 0.2D, mediaType.getQualityValue(), 0D);
}
@Test
public void parseCharset() throws Exception {
String s = "text/html; charset=iso-8859-1";
MediaType mediaType = MediaType.parseMediaType(s);
assertEquals("Invalid type", "text", mediaType.getType());
assertEquals("Invalid subtype", "html", mediaType.getSubtype());
assertEquals("Invalid charset", Charset.forName("ISO-8859-1"), mediaType.getCharSet());
}
@Test
public void parseURLConnectionMediaType() throws Exception {
String s = "*; q=.2";

2
org.springframework.web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
View File

@@ -375,7 +375,7 @@ public class CommonsMultipartResolverTests {
MockFileItem fileItem2x = new MockFileItem(
"field2x", "type2", empty ? "" : "C:\\field2x.txt", empty ? "" : "text2");
MockFileItem fileItem3 = new MockFileItem("field3", null, null, "value3");
MockFileItem fileItem4 = new MockFileItem("field4", null, null, "value4");
MockFileItem fileItem4 = new MockFileItem("field4", "text/html; charset=iso-8859-1", null, "value4");
MockFileItem fileItem5 = new MockFileItem("field4", null, null, "value5");
fileItems.add(fileItem1);
fileItems.add(fileItem1x);