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

Made test more reliable.

This commit is contained in:
Simone Bordet 2014-03-28 19:34:03 +01:00
parent f36700092c
commit a7f9e5a674
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
jetty-io/src/test/java/org/eclipse/jetty/io/SelectorManagerTest.java
View File

@ -26,7 +26,7 @@ import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong;
import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.toolchain.test.annotation.Slow;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -64,11 +64,7 @@ public class SelectorManagerTest
server.bind(new InetSocketAddress("localhost", 0)); server.bind(new InetSocketAddress("localhost", 0));
SocketAddress address = server.getLocalAddress(); SocketAddress address = server.getLocalAddress();
SocketChannel client = SocketChannel.open(); final AtomicLong timeoutConnection = new AtomicLong();
client.configureBlocking(false);
client.connect(address);
final AtomicBoolean timeoutConnection = new AtomicBoolean();
final long connectTimeout = 1000; final long connectTimeout = 1000;
SelectorManager selectorManager = new SelectorManager(executor, scheduler) SelectorManager selectorManager = new SelectorManager(executor, scheduler)
{ {
@ -83,8 +79,9 @@ public class SelectorManagerTest
{ {
try try
{ {
if (timeoutConnection.get()) long timeout = timeoutConnection.get();
TimeUnit.MILLISECONDS.sleep(connectTimeout * 2); if (timeout > 0)
TimeUnit.MILLISECONDS.sleep(timeout);
return super.finishConnect(channel); return super.finishConnect(channel);
} }
catch (InterruptedException e) catch (InterruptedException e)
@ -96,6 +93,7 @@ public class SelectorManagerTest
@Override @Override
public Connection newConnection(SocketChannel channel, EndPoint endpoint, Object attachment) throws IOException public Connection newConnection(SocketChannel channel, EndPoint endpoint, Object attachment) throws IOException
{ {
((Callback)attachment).succeeded();
return new AbstractConnection(endpoint, executor) return new AbstractConnection(endpoint, executor)
{ {
@Override @Override
@ -116,9 +114,13 @@ public class SelectorManagerTest
try try
{ {
timeoutConnection.set(true); SocketChannel client1 = SocketChannel.open();
client1.configureBlocking(false);
client1.connect(address);
long timeout = connectTimeout * 2;
timeoutConnection.set(timeout);
final CountDownLatch latch1 = new CountDownLatch(1); final CountDownLatch latch1 = new CountDownLatch(1);
selectorManager.connect(client, new Callback.Adapter() selectorManager.connect(client1, new Callback.Adapter()
{ {
@Override @Override
public void failed(Throwable x) public void failed(Throwable x)
@ -127,19 +129,29 @@ public class SelectorManagerTest
} }
}); });
Assert.assertTrue(latch1.await(connectTimeout * 3, TimeUnit.MILLISECONDS)); Assert.assertTrue(latch1.await(connectTimeout * 3, TimeUnit.MILLISECONDS));
Assert.assertFalse(client1.isOpen());
// Verify that after the failure we can connect successfully // Wait for the first connect to finish, as the selector thread is waiting in finishConnect().
timeoutConnection.set(false); Thread.sleep(timeout);
final CountDownLatch latch2 = new CountDownLatch(1);
selectorManager.connect(client, new Callback.Adapter() // Verify that after the failure we can connect successfully.
try (SocketChannel client2 = SocketChannel.open())
{ {
@Override client2.configureBlocking(false);
public void failed(Throwable x) client2.connect(address);
timeoutConnection.set(0);
final CountDownLatch latch2 = new CountDownLatch(1);
selectorManager.connect(client2, new Callback.Adapter()
{ {
latch2.countDown(); @Override
} public void succeeded()
}); {
Assert.assertTrue(latch2.await(connectTimeout, TimeUnit.MILLISECONDS)); latch2.countDown();
}
});
Assert.assertTrue(latch2.await(connectTimeout * 5, TimeUnit.MILLISECONDS));
Assert.assertTrue(client2.isOpen());
}
} }
finally finally
{ {