diff --git a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java index a4a153e5d3..8db69de0a9 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java @@ -36,6 +36,7 @@ import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.util.DummyHandler; +import org.jboss.netty.util.TimeBasedUuidGenerator; import org.junit.Test; @@ -48,18 +49,24 @@ import org.junit.Test; */ public class NioClientSocketShutdownTimeTest { + static { + // Initialize the MD5 algorithm before testing - it takes too long + // on some JDK. + TimeBasedUuidGenerator.generate(); + } + @Test public void testShutdownTime() throws Throwable { ServerSocketChannel serverSocket = ServerSocketChannel.open(); serverSocket.socket().bind(new InetSocketAddress(0)); - long startTime = System.currentTimeMillis(); - ExecutorService e1 = Executors.newCachedThreadPool(); ExecutorService e2 = Executors.newCachedThreadPool(); ClientBootstrap b = new ClientBootstrap(new NioClientSocketChannelFactory(e1, e2)); b.getPipeline().addLast("handler", new DummyHandler()); + long startTime = System.currentTimeMillis(); + try { serverSocket.configureBlocking(false); diff --git a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java index 7a359f7d3e..e29d0e44a2 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java @@ -39,6 +39,7 @@ import org.jboss.netty.channel.ChannelPipelineCoverage; import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.SimpleChannelHandler; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; +import org.jboss.netty.util.TimeBasedUuidGenerator; import org.junit.Test; @@ -51,10 +52,14 @@ import org.junit.Test; */ public class NioServerSocketShutdownTimeTest { + static { + // Initialize the MD5 algorithm before testing - it takes too long + // on some JDK. + TimeBasedUuidGenerator.generate(); + } + @Test(timeout = 10000) public void testSuccessfulBindAttempt() throws Exception { - long startTime = System.currentTimeMillis(); - ExecutorService e1 = Executors.newCachedThreadPool(); ExecutorService e2 = Executors.newCachedThreadPool(); @@ -68,6 +73,8 @@ public class NioServerSocketShutdownTimeTest { DummyHandler handler = new DummyHandler(); bootstrap.getPipeline().addLast("dummy", handler); + long startTime = System.currentTimeMillis(); + Channel channel = bootstrap.bind(); Socket socket = null;