Merge remote-tracking branch 'origin/jetty-9.2.x'

This commit is contained in:
Greg Wilkins 2015-02-04 12:35:34 +11:00
commit 40ffac3339
1 changed files with 2 additions and 3 deletions

View File

@ -417,7 +417,7 @@ public class AsyncIOServletTest
@Test
public void testIsNotReadyAtEOF() throws Exception
{
String text = "Now is the winter of our discontent. How Now Brown Cow. The quick brown fox jumped over the lazy dog.\n";
String text = "Test\n";
final byte[] data = text.getBytes(StandardCharsets.ISO_8859_1);
startServer(new HttpServlet()
@ -474,6 +474,7 @@ public class AsyncIOServletTest
"Host: localhost:" + connector.getLocalPort() + "\r\n" +
"Content-Type: text/plain\r\n"+
"Content-Length: "+data.length+"\r\n" +
"Connection: close\r\n" +
"\r\n";
try (Socket client = new Socket("localhost", connector.getLocalPort()))
@ -489,8 +490,6 @@ public class AsyncIOServletTest
while (line.length()>0)
line=in.readLine();
line=in.readLine();
assertThat(line, not(containsString(" ")));
line=in.readLine();
assertThat(line, containsString("i="+data.length+" eof=false finished=true"));
}
}