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

474634 - AsyncListener.onError() handling. 

Fixed more tests in jetty-servlets
This commit is contained in:
Greg Wilkins 2015-08-13 18:44:25 +10:00
parent 8c0e4f53d3
commit 108821aacb
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextListenersTest.java
View File

@ -24,7 +24,10 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.AsyncContext;
import javax.servlet.AsyncEvent;
@ -68,7 +71,7 @@ public class AsyncContextListenersTest
@Test
public void testListenerClearedOnSecondRequest() throws Exception
{
final AtomicInteger completes = new AtomicInteger();
final AtomicReference<CountDownLatch> completes = new AtomicReference<>(new CountDownLatch(1));
String path = "/path";
prepare(path, new HttpServlet()
{
@ -86,7 +89,7 @@ public class AsyncContextListenersTest
@Override
public void onComplete(AsyncEvent event) throws IOException
{
completes.incrementAndGet();
completes.get().countDown();
}
@Override
@ -118,23 +121,23 @@ public class AsyncContextListenersTest
SimpleHttpParser parser = new SimpleHttpParser();
SimpleHttpResponse response = parser.readResponse(reader);
Assert.assertEquals("200", response.getCode());
Assert.assertEquals(1, completes.get());
completes.get().await(10,TimeUnit.SECONDS);
// Send a second request
completes.set(0);
completes.set(new CountDownLatch(1));
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = parser.readResponse(reader);
Assert.assertEquals("200", response.getCode());
Assert.assertEquals(1, completes.get());
completes.get().await(10,TimeUnit.SECONDS);
}
}
@Test
public void testListenerAddedFromListener() throws Exception
{
final AtomicInteger completes = new AtomicInteger();
final AtomicReference<CountDownLatch> completes = new AtomicReference<>(new CountDownLatch(1));
String path = "/path";
prepare(path, new HttpServlet()
{
@ -157,7 +160,7 @@ public class AsyncContextListenersTest
@Override
public void onComplete(AsyncEvent event) throws IOException
{
completes.incrementAndGet();
completes.get().countDown();
}
@Override
@ -189,22 +192,22 @@ public class AsyncContextListenersTest
SimpleHttpParser parser = new SimpleHttpParser();
SimpleHttpResponse response = parser.readResponse(reader);
Assert.assertEquals("200", response.getCode());
Assert.assertEquals(1, completes.get());
completes.get().await(10,TimeUnit.SECONDS);
// Send a second request
completes.set(0);
completes.set(new CountDownLatch(1));
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = parser.readResponse(reader);
Assert.assertEquals("200", response.getCode());
Assert.assertEquals(1, completes.get());
completes.get().await(10,TimeUnit.SECONDS);
}
}
@Test
public void testAsyncDispatchAsyncCompletePreservesListener() throws Exception
{
final AtomicInteger completes = new AtomicInteger();
final AtomicReference<CountDownLatch> completes = new AtomicReference<>(new CountDownLatch(1));
final String path = "/path";
prepare(path + "/*", new HttpServlet()
{
@ -226,7 +229,7 @@ public class AsyncContextListenersTest
@Override
public void onComplete(AsyncEvent event) throws IOException
{
completes.incrementAndGet();
completes.get().countDown();
}
@Override
@ -267,16 +270,16 @@ public class AsyncContextListenersTest
SimpleHttpParser parser = new SimpleHttpParser();
SimpleHttpResponse response = parser.readResponse(reader);
Assert.assertEquals("200", response.getCode());
Assert.assertEquals(1, completes.get());
completes.get().await(10,TimeUnit.SECONDS);
// Send a second request
completes.set(0);
completes.set(new CountDownLatch(1));
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = parser.readResponse(reader);
Assert.assertEquals("200", response.getCode());
Assert.assertEquals(1, completes.get());
completes.get().await(10,TimeUnit.SECONDS);
}
}
}

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

@ -245,6 +245,12 @@ public class AsyncIOServletTest
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
if (request.getDispatcherType()==DispatcherType.ERROR)
{
response.flushBuffer();
return;
}
final AsyncContext asyncContext = request.startAsync(request, response);
request.getInputStream().setReadListener(new ReadListener()
{