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

jetty9 - fix WriteFlusherTest.testConcurrentAccessToIncompleteWriteAndOnFail()

This commit is contained in:
Thomas Becker 2012-08-03 19:56:00 +02:00
parent 3187fe00fe
commit d4d41fb877
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
View File

@ -330,7 +330,7 @@ public class WriteFlusherTest
} }
@Test @Test
public void testConcurrentAccessToWriteAndFailed() throws IOException, InterruptedException, ExecutionException public void testConcurrentAccessToWriteAndOnFail() throws IOException, InterruptedException, ExecutionException
{ {
final CountDownLatch failedCalledLatch = new CountDownLatch(1); final CountDownLatch failedCalledLatch = new CountDownLatch(1);
final CountDownLatch writeCalledLatch = new CountDownLatch(1); final CountDownLatch writeCalledLatch = new CountDownLatch(1);
@ -458,7 +458,8 @@ public class WriteFlusherTest
} }
@Test @Test
public void testConcurrentAccessToIncompleteWriteAndFailed() throws IOException, InterruptedException, ExecutionException, TimeoutException public void testConcurrentAccessToIncompleteWriteAndOnFail() throws IOException, InterruptedException,
ExecutionException, TimeoutException
{ {
final CountDownLatch failedCalledLatch = new CountDownLatch(1); final CountDownLatch failedCalledLatch = new CountDownLatch(1);
final CountDownLatch onIncompleteFlushedCalledLatch = new CountDownLatch(1); final CountDownLatch onIncompleteFlushedCalledLatch = new CountDownLatch(1);
@ -470,6 +471,14 @@ public class WriteFlusherTest
protected void onIncompleteFlushed() protected void onIncompleteFlushed()
{ {
onIncompleteFlushedCalledLatch.countDown(); onIncompleteFlushedCalledLatch.countDown();
try
{
failedCalledLatch.await(5, TimeUnit.SECONDS);
}
catch (InterruptedException e)
{
e.printStackTrace();
}
completeWrite(); completeWrite();
completeWrite.countDown(); completeWrite.countDown();
} }
@ -478,13 +487,15 @@ public class WriteFlusherTest
ExposingStateCallback callback = new ExposingStateCallback(); ExposingStateCallback callback = new ExposingStateCallback();
executor.submit(new Writer(writeFlusher, callback)); executor.submit(new Writer(writeFlusher, callback));
assertThat("Write has been called.", writeCalledLatch.await(5, TimeUnit.SECONDS), is(true)); assertThat("Write has been called.", writeCalledLatch.await(5, TimeUnit.SECONDS), is(true));
// make sure we're in pending state when calling onFail
assertThat("onIncompleteFlushed has been called.", onIncompleteFlushedCalledLatch.await(5,
TimeUnit.SECONDS), is(true));
executor.submit(new FailedCaller(writeFlusher, failedCalledLatch)); executor.submit(new FailedCaller(writeFlusher, failedCalledLatch));
assertThat("Failed has been called.", failedCalledLatch.await(5, TimeUnit.SECONDS), is(true)); assertThat("Failed has been called.", failedCalledLatch.await(5, TimeUnit.SECONDS), is(true));
writeFlusher.write(_context, new FutureCallback<String>(), BufferUtil.toBuffer("foobar"));
assertThat("completeWrite done", completeWrite.await(5, TimeUnit.SECONDS), is(true)); assertThat("completeWrite done", completeWrite.await(5, TimeUnit.SECONDS), is(true));
callback.get(5, TimeUnit.SECONDS); // when we fail in PENDING state, we should have called callback.failed()
assertThat("callback failed has not been called", callback.isFailed(), is(false)); assertThat("callback failed has been called", callback.isFailed(), is(true));
assertThat("callback complete has been called", callback.isCompleted(), is(true)); assertThat("callback complete has not been called", callback.isCompleted(), is(false));
} }
private static class EndPointMock extends ByteArrayEndPoint private static class EndPointMock extends ByteArrayEndPoint
@ -530,7 +541,6 @@ public class WriteFlusherTest
} }
} }
private static class FailedCaller implements Callable private static class FailedCaller implements Callable
{ {
private final WriteFlusher writeFlusher; private final WriteFlusher writeFlusher;