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

Made the test more reliable.

This commit is contained in:
Simone Bordet 2013-01-23 12:18:01 +01:00
parent de0d5acdb9
commit 2ba64a59e6
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/PingTest.java
View File

@ -61,10 +61,11 @@ public class PingTest extends AbstractTest
@Test @Test
public void testServerPingPong() throws Exception public void testServerPingPong() throws Exception
{ {
final CountDownLatch pingLatch = new CountDownLatch(1); final CountDownLatch pingReceived = new CountDownLatch(1);
ServerSessionFrameListener serverSessionFrameListener = new ServerSessionFrameListener.Adapter() ServerSessionFrameListener serverSessionFrameListener = new ServerSessionFrameListener.Adapter()
{ {
public volatile int pingId; private final CountDownLatch pingSent = new CountDownLatch(1);
private int pingId;
@Override @Override
public void onConnect(Session session) public void onConnect(Session session)
@ -75,6 +76,7 @@ public class PingTest extends AbstractTest
public void succeeded(PingResultInfo pingInfo) public void succeeded(PingResultInfo pingInfo)
{ {
pingId = pingInfo.getPingId(); pingId = pingInfo.getPingId();
pingSent.countDown();
} }
}); });
} }
@ -82,13 +84,23 @@ public class PingTest extends AbstractTest
@Override @Override
public void onPing(Session session, PingResultInfo pingInfo) public void onPing(Session session, PingResultInfo pingInfo)
{ {
Assert.assertEquals(0, pingInfo.getPingId() % 2); try
Assert.assertEquals(pingId, pingInfo.getPingId()); {
pingLatch.countDown(); // This callback may be notified before the promise above,
// so make sure we wait here to know the pingId
Assert.assertTrue(pingSent.await(5, TimeUnit.SECONDS));
Assert.assertEquals(0, pingInfo.getPingId() % 2);
Assert.assertEquals(pingId, pingInfo.getPingId());
pingReceived.countDown();
}
catch (InterruptedException x)
{
Assert.fail();
}
} }
}; };
startClient(startServer(serverSessionFrameListener), null); startClient(startServer(serverSessionFrameListener), null);
Assert.assertTrue(pingLatch.await(5, TimeUnit.SECONDS)); Assert.assertTrue(pingReceived.await(5, TimeUnit.SECONDS));
} }
} }