Use Jetty/Tomcat dynamic port allocation instead of TestUtils.findFreePort, close AsyncHttpClient#1183

Author: slandelle

client/src/test/java/org/asynchttpclient/AbstractBasicHttpsTest.java

@@ -15,19 +15,21 @@
  */
 package org.asynchttpclient;
 
-import static org.asynchttpclient.test.TestUtils.findFreePort;
-import static org.asynchttpclient.test.TestUtils.newJettyHttpsServer;
+import static org.asynchttpclient.test.TestUtils.*;
 
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.testng.annotations.BeforeClass;
 
 public abstract class AbstractBasicHttpsTest extends AbstractBasicTest {
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        server = newJettyHttpsServer(port1);
+        server = new Server();
+        ServerConnector connector = addHttpConnector(server);
         server.setHandler(configureHandler());
         server.start();
+        port1 = connector.getLocalPort();
         logger.info("Local HTTP server started successfully");
     }
 }

client/src/test/java/org/asynchttpclient/AbstractBasicTest.java

@@ -16,12 +16,11 @@
 package org.asynchttpclient;
 
 import static org.asynchttpclient.test.TestUtils.addHttpConnector;
-import static org.asynchttpclient.test.TestUtils.findFreePort;
-import static org.asynchttpclient.test.TestUtils.newJettyHttpServer;
 import static org.testng.Assert.fail;
 
 import org.asynchttpclient.test.EchoHandler;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,19 +34,20 @@ public abstract class AbstractBasicTest {
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     protected Server server;
-    protected int port1;
-    protected int port2;
+    protected int port1 = -1;
+    protected int port2  =-1;
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
 
-        port1 = findFreePort();
-        port2 = findFreePort();
-
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector1 = addHttpConnector(server);
         server.setHandler(configureHandler());
-        addHttpConnector(server, port2);
+        ServerConnector connector2 = addHttpConnector(server);
         server.start();
+        
+        port1 = connector1.getLocalPort();
+        port2 = connector2.getLocalPort();
 
         logger.info("Local HTTP server started successfully");
     }

client/src/test/java/org/asynchttpclient/AuthTimeoutTest.java

@@ -30,6 +30,7 @@
 import org.asynchttpclient.exception.RemotelyClosedException;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -42,16 +43,18 @@ public class AuthTimeoutTest extends AbstractBasicTest {
     @BeforeClass(alwaysRun = true)
     @Override
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        port2 = findFreePort();
 
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector1 = addHttpConnector(server);
         addBasicAuthHandler(server, configureHandler());
         server.start();
+        port1 = connector1.getLocalPort();
 
-        server2 = newJettyHttpServer(port2);
+        server2 = new Server();
+        ServerConnector connector2 = addHttpConnector(server2);
         addDigestAuthHandler(server2, configureHandler());
         server2.start();
+        port2 = connector2.getLocalPort();
 
         logger.info("Local HTTP server started successfully");
     }

client/src/test/java/org/asynchttpclient/BasicAuthTest.java

@@ -34,6 +34,7 @@
 
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,23 +53,25 @@ public class BasicAuthTest extends AbstractBasicTest {
     @BeforeClass(alwaysRun = true)
     @Override
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        port2 = findFreePort();
-        portNoAuth = findFreePort();
 
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector1 = addHttpConnector(server);
         addBasicAuthHandler(server, configureHandler());
         server.start();
+        port1 = connector1.getLocalPort();
 
-        server2 = newJettyHttpServer(port2);
+        server2 = new Server();
+        ServerConnector connector2 = addHttpConnector(server2);
         addBasicAuthHandler(server2, new RedirectHandler());
         server2.start();
+        port2 = connector2.getLocalPort();
 
-        // need noAuth server to verify the preemptive auth mode (see
-        // basicAuthTestPreemtiveTest)
-        serverNoAuth = newJettyHttpServer(portNoAuth);
+        // need noAuth server to verify the preemptive auth mode (see basicAuthTestPreemtiveTest)
+        serverNoAuth = new Server();
+        ServerConnector connectorNoAuth = addHttpConnector(serverNoAuth);
         serverNoAuth.setHandler(new SimpleHandler());
         serverNoAuth.start();
+        portNoAuth = connectorNoAuth.getLocalPort();
 
         logger.info("Local HTTP server started successfully");
     }

client/src/test/java/org/asynchttpclient/BasicHttpProxyToHttpTest.java

@@ -29,6 +29,7 @@
 import org.asynchttpclient.test.EchoHandler;
 import org.eclipse.jetty.proxy.ProxyServlet;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
@@ -77,19 +78,20 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
     @BeforeClass
     public void setUpGlobal() throws Exception {
 
-        httpPort = findFreePort();
-        proxyPort = findFreePort();
-
-        httpServer = newJettyHttpServer(httpPort);
+        httpServer = new Server();
+        ServerConnector connector1 = addHttpConnector(httpServer);
         httpServer.setHandler(new EchoHandler());
         httpServer.start();
+        httpPort = connector1.getLocalPort();
 
-        proxy = new Server(proxyPort);
+        proxy = new Server();
+        ServerConnector connector2 = addHttpConnector(proxy);
         ServletHandler servletHandler = new ServletHandler();
         ServletHolder servletHolder = servletHandler.addServletWithMapping(BasicAuthProxyServlet.class, "/*");
         servletHolder.setInitParameter("maxThreads", "20");
         proxy.setHandler(servletHandler);
         proxy.start();
+        proxyPort = connector2.getLocalPort();
 
         LOGGER.info("Local HTTP Server (" + httpPort + "), Proxy (" + proxyPort + ") started successfully");
     }

client/src/test/java/org/asynchttpclient/BasicHttpProxyToHttpsTest.java

@@ -28,6 +28,7 @@
 import org.asynchttpclient.test.EchoHandler;
 import org.eclipse.jetty.proxy.ConnectHandler;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -51,15 +52,16 @@ public class BasicHttpProxyToHttpsTest {
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
 
-        httpPort = findFreePort();
-        proxyPort = findFreePort();
-
         // HTTP server
-        httpServer = newJettyHttpsServer(httpPort);
+        httpServer = new Server();
+        ServerConnector connector1 = addHttpsConnector(httpServer);
         httpServer.setHandler(new EchoHandler());
         httpServer.start();
+        httpPort = connector1.getLocalPort();
 
-        proxy = new Server(proxyPort);
+        // proxy
+        proxy = new Server();
+        ServerConnector connector2 = addHttpConnector(proxy);
         ConnectHandler connectHandler = new ConnectHandler() {
 
             @Override
@@ -78,6 +80,7 @@ protected boolean handleAuthentication(HttpServletRequest request, HttpServletRe
         };
         proxy.setHandler(connectHandler);
         proxy.start();
+        proxyPort = connector2.getLocalPort();
 
         LOGGER.info("Local HTTP Server (" + httpPort + "), Proxy (" + proxyPort + ") started successfully");
     }

client/src/test/java/org/asynchttpclient/DigestAuthTest.java

@@ -27,6 +27,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -36,11 +38,11 @@ public class DigestAuthTest extends AbstractBasicTest {
     @BeforeClass(alwaysRun = true)
     @Override
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector = addHttpConnector(server);
         addDigestAuthHandler(server, configureHandler());
         server.start();
+        port1 = connector.getLocalPort();
         logger.info("Local HTTP server started successfully");
     }
 

client/src/test/java/org/asynchttpclient/HttpToHttpsRedirectTest.java

@@ -28,6 +28,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -69,13 +71,13 @@ public void handle(String s, Request r, HttpServletRequest httpRequest, HttpServ
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        port2 = findFreePort();
-
-        server = newJettyHttpServer(port1);
-        addHttpsConnector(server, port2);
+        server = new Server();
+        ServerConnector connector1 = addHttpConnector(server);
+        ServerConnector connector2 = addHttpsConnector(server);
         server.setHandler(new Relative302Handler());
         server.start();
+        port1 = connector1.getLocalPort();
+        port2 = connector2.getLocalPort();
         logger.info("Local HTTP server started successfully");
     }
 

client/src/test/java/org/asynchttpclient/IdleStateHandlerTest.java

@@ -27,6 +27,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -50,10 +52,11 @@ public void handle(String s, Request r, HttpServletRequest httpRequest, HttpServ
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector = addHttpConnector(server);
         server.setHandler(new IdleStateHandler());
         server.start();
+        port1 = connector.getLocalPort();
         logger.info("Local HTTP server started successfully");
     }
 

client/src/test/java/org/asynchttpclient/MultipleHeaderTest.java

@@ -13,7 +13,6 @@
 package org.asynchttpclient;
 
 import static org.asynchttpclient.Dsl.*;
-import static org.asynchttpclient.test.TestUtils.findFreePort;
 import static org.testng.Assert.*;
 import io.netty.handler.codec.http.HttpHeaders;
 
@@ -33,6 +32,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import javax.net.ServerSocketFactory;
+
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -45,11 +46,10 @@ public class MultipleHeaderTest extends AbstractBasicTest {
     private ServerSocket serverSocket;
     private Future<?> voidFuture;
 
-    @BeforeClass(alwaysRun = true)
+    @BeforeClass
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-
-        serverSocket = new ServerSocket(port1);
+        serverSocket = ServerSocketFactory.getDefault().createServerSocket(0);
+        port1 = serverSocket.getLocalPort();
         executorService = Executors.newFixedThreadPool(1);
         voidFuture = executorService.submit(new Callable<Void>() {
             public Void call() throws Exception {

client/src/test/java/org/asynchttpclient/NonAsciiContentLengthTest.java

@@ -28,6 +28,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -36,8 +38,8 @@ public class NonAsciiContentLengthTest extends AbstractBasicTest {
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector = addHttpConnector(server);
         server.setHandler(new AbstractHandler() {
 
             public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
@@ -60,6 +62,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
             }
         });
         server.start();
+        port1 = connector.getLocalPort();
     }
 
     @Test(groups = "standalone")

client/src/test/java/org/asynchttpclient/PerRequestRelative302Test.java

@@ -31,6 +31,8 @@
 
 import org.asynchttpclient.uri.Uri;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -66,12 +68,12 @@ public void handle(String s, Request r, HttpServletRequest httpRequest, HttpServ
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        port1 = findFreePort();
-        port2 = findFreePort();
-        server = newJettyHttpServer(port1);
+        server = new Server();
+        ServerConnector connector = addHttpConnector(server);
 
         server.setHandler(new Relative302Handler());
         server.start();
+        port1 = connector.getLocalPort();
         logger.info("Local HTTP server started successfully");
     }