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

Fixing encoding tests (that actually didn't validate results)

This commit is contained in:
Joakim Erdfelt 2014-10-02 15:12:32 -07:00
parent 43d2c59394
commit 61dd2c9620
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
View File

@ -590,8 +590,11 @@ public class RequestTest
@Override @Override
public boolean check(HttpServletRequest request,HttpServletResponse response) throws IOException public boolean check(HttpServletRequest request,HttpServletResponse response) throws IOException
{ {
// Should be "testä"
// "test" followed by a LATIN SMALL LETTER A WITH DIAERESIS
request.setCharacterEncoding(StringUtil.__ISO_8859_1); request.setCharacterEncoding(StringUtil.__ISO_8859_1);
return "test\u00e4".equals(request.getParameter("name2")); String actual = request.getParameter("name2");
return "test\u00e4".equals(actual);
} }
}; };
@ -604,7 +607,8 @@ public class RequestTest
"Connection: close\r\n"+ "Connection: close\r\n"+
"\r\n"+ "\r\n"+
content; content;
_connector.getResponses(request); String response = _connector.getResponses(request);
assertThat(response,Matchers.containsString(" 200 OK"));
} }
@Test @Test
@ -615,11 +619,15 @@ public class RequestTest
@Override @Override
public boolean check(HttpServletRequest request,HttpServletResponse response) throws IOException public boolean check(HttpServletRequest request,HttpServletResponse response) throws IOException
{ {
return "test\u00e4".equals(request.getParameter("name2")); // http://www.ltg.ed.ac.uk/~richard/utf-8.cgi?input=00e4&mode=hex
// Should be "testä"
// "test" followed by a LATIN SMALL LETTER A WITH DIAERESIS
String actual = request.getParameter("name2");
return "test\u00e4".equals(actual);
} }
}; };
String content="name1=test&name2=test%C4%A4&name3=&name4=test"; String content="name1=test&name2=test%C3%A4&name3=&name4=test";
String request="POST / HTTP/1.1\r\n"+ String request="POST / HTTP/1.1\r\n"+
"Host: whatever\r\n"+ "Host: whatever\r\n"+
"Content-Type: "+MimeTypes.Type.FORM_ENCODED.asString()+"\r\n" + "Content-Type: "+MimeTypes.Type.FORM_ENCODED.asString()+"\r\n" +
@ -627,7 +635,8 @@ public class RequestTest
"Connection: close\r\n"+ "Connection: close\r\n"+
"\r\n"+ "\r\n"+
content; content;
_connector.getResponses(request); String response = _connector.getResponses(request);
assertThat(response,Matchers.containsString(" 200 OK"));
} }
@ -748,6 +757,8 @@ public class RequestTest
"Host: myhost\n"+ "Host: myhost\n"+
"Connection: close\n"+ "Connection: close\n"+
"\n"); "\n");
assertThat(response,Matchers.containsString(" 302 Found"));
assertThat(response,Matchers.containsString("Location: http://myhost/foo"));
} }
@Test @Test
@ -1213,6 +1224,7 @@ public class RequestTest
private class RequestHandler extends AbstractHandler private class RequestHandler extends AbstractHandler
{ {
private RequestTester _checker; private RequestTester _checker;
@SuppressWarnings("unused")
private String _content; private String _content;
@Override @Override