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

Merge branch 'jetty-9.1' into release-9.1

This commit is contained in:
Jesse McConnell 2013-10-31 16:10:32 -05:00
parent 6db55c3863 37ea88d299
commit a365e9ae11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
View File

@ -135,7 +135,7 @@ public class AsyncContextTest
Assert.assertEquals("error servlet","ERROR: /error",br.readLine()); Assert.assertEquals("error servlet","ERROR: /error",br.readLine());
Assert.assertEquals("error servlet","PathInfo= /IOE",br.readLine()); Assert.assertEquals("error servlet","PathInfo= /IOE",br.readLine());
Assert.assertEquals("error servlet","EXCEPTION: java.io.IOException: Test",br.readLine()); Assert.assertEquals("error servlet","EXCEPTION: org.eclipse.jetty.server.QuietServletException: java.io.IOException: Test",br.readLine());
} }
@Test @Test
@ -350,7 +350,7 @@ public class AsyncContextTest
Assert.assertEquals("error servlet","ERROR: /error",br.readLine()); Assert.assertEquals("error servlet","ERROR: /error",br.readLine());
Assert.assertEquals("error servlet","PathInfo= /500",br.readLine()); Assert.assertEquals("error servlet","PathInfo= /500",br.readLine());
Assert.assertEquals("error servlet","EXCEPTION: java.io.IOException: TEST",br.readLine()); Assert.assertEquals("error servlet","EXCEPTION: java.lang.RuntimeException: TEST",br.readLine());
} }
private class DispatchingRunnable implements Runnable private class DispatchingRunnable implements Runnable
@ -424,7 +424,7 @@ public class AsyncContextTest
@Override @Override
public void onTimeout(AsyncEvent event) throws IOException public void onTimeout(AsyncEvent event) throws IOException
{ {
throw new IOException("TEST"); throw new RuntimeException("TEST");
} }
@Override @Override