Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

377550 set charset when content type is set

This commit is contained in:
Greg Wilkins 2012-04-25 16:01:42 +10:00
parent b5d377ab26
commit 0524e2d47a
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
View File

@ -444,7 +444,19 @@ public class HttpTester
*/ */
public void setHeader(String name, String value) public void setHeader(String name, String value)
{ {
if (HttpHeaders.CONTENT_TYPE.equalsIgnoreCase(name))
setContentType(value);
else
_fields.put(name,value); _fields.put(name,value);
}
/* ------------------------------------------------------------ */
public void setContentType(String value)
{
_contentType = MimeTypes.CACHE.lookup(value);
_charset = MimeTypes.getCharsetFromContentType(_contentType);
_fields.put(HttpHeaders.CONTENT_TYPE_BUFFER,_contentType);
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */

20
test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
View File

@ -50,7 +50,25 @@ public class HttpTesterTest extends TestCase
assertEquals(200, tester.getStatus()); assertEquals(200, tester.getStatus());
assertEquals("22", tester.getHeader("Content-Length")); assertEquals("22", tester.getHeader("Content-Length"));
assertEquals("text/html",tester.getContentType()); assertEquals("text/html",tester.getContentType());
System.err.println(tester.getContent());
} }
public void testSetCharset() throws Exception
{
String content = "123456789\uA74A";
HttpTester tester = new HttpTester();
tester.setVersion("HTTP/1.0");
tester.setMethod("POST");
tester.setHeader("Content-type", "application/json; charset=iso-8859-1");
tester.setURI("/1/batch");
tester.setContent(content);
assertEquals("123456789?",tester.getContent());
tester.setHeader("Content-type", "application/json; charset=UTF-8");
tester.setContent(content);
assertEquals("123456789\uA74A",tester.getContent());
String request=tester.generate();
assertTrue(request.startsWith("POST "));
assertTrue(request.trim().endsWith(content));
}
} }