simplify

Author: rbri

src/test/java/org/htmlunit/HttpWebConnectionProxyTest.java

@@ -43,7 +43,7 @@ public void setup() throws Exception {
         startWebServer("src/test/resources/testfiles/noproxyroot/");
 
         final Server proxyWebServer = createWebServer(PORT_PROXY_SERVER,
-                                            "src/test/resources/testfiles/proxyroot/", null, null, null);
+                                            "src/test/resources/testfiles/proxyroot/", null, null);
         WebServerTestCase.tryStart(PORT_PROXY_SERVER, proxyWebServer);
         proxyWebServer_ = proxyWebServer;
 

src/test/java/org/htmlunit/WebDriverTestCase.java

@@ -753,7 +753,11 @@ protected boolean isBasicAuthentication() {
      */
     protected static void startWebServer(final String resourceBase, final String[] classpath,
             final Map<String, Class<? extends Servlet>> servlets) throws Exception {
-        startWebServer(resourceBase, classpath, servlets, null);
+        stopWebServers();
+        LAST_TEST_UsesMockWebConnection_ = Boolean.FALSE;
+
+        STATIC_SERVER_STARTER_ = ExceptionUtils.getStackTrace(new Throwable("StaticServerStarter"));
+        STATIC_SERVER_ = WebServerTestCase.createWebServer(PORT, resourceBase, classpath, servlets);
     }
 
     /**
@@ -773,27 +777,7 @@ protected static void startWebServer2(final String resourceBase, final String[]
             STATIC_SERVER2_.stop();
         }
         STATIC_SERVER2_STARTER_ = ExceptionUtils.getStackTrace(new Throwable("StaticServer2Starter"));
-        STATIC_SERVER2_ = WebServerTestCase.createWebServer(PORT2, resourceBase, classpath, servlets, null);
-    }
-
-    /**
-     * Starts the web server on the default {@link #PORT}.
-     * The given resourceBase is used to be the ROOT directory that serves the default context.
-     * <p><b>Don't forget to stop the returned Server after the test</b>
-     *
-     * @param resourceBase the base of resources for the default context
-     * @param classpath additional classpath entries to add (may be null)
-     * @param servlets map of {String, Class} pairs: String is the path spec, while class is the class
-     * @param handler wrapper for handler (can be null)
-     * @throws Exception if the test fails
-     */
-    protected static void startWebServer(final String resourceBase, final String[] classpath,
-            final Map<String, Class<? extends Servlet>> servlets, final HandlerWrapper handler) throws Exception {
-        stopWebServers();
-        LAST_TEST_UsesMockWebConnection_ = Boolean.FALSE;
-
-        STATIC_SERVER_STARTER_ = ExceptionUtils.getStackTrace(new Throwable("StaticServerStarter"));
-        STATIC_SERVER_ = WebServerTestCase.createWebServer(PORT, resourceBase, classpath, servlets, handler);
+        STATIC_SERVER2_ = WebServerTestCase.createWebServer(PORT2, resourceBase, classpath, servlets);
     }
 
     /**

src/test/java/org/htmlunit/WebServerTestCase.java

@@ -39,7 +39,6 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.util.security.Constraint;
@@ -52,8 +51,8 @@
 import org.junit.jupiter.api.AfterEach;
 
 /**
- * A WebTestCase which starts a local server, and doens't use WebDriver.
- *
+ * A WebTestCase which starts a local server, and doesn't use WebDriver.
+ * <p>
  * <b>Note that {@link WebDriverTestCase} should be used unless HtmlUnit-specific feature
  * is needed and Selenium does not support it.</b>
  *
@@ -122,7 +121,7 @@ protected void startWebServer(final String resourceBase, final String[] classpat
 
     /**
      * This is usually needed if you want to have a running server during many tests invocation.
-     *
+     * <p>
      * Creates and starts a web server on the default {@link #PORT}.
      * The given resourceBase is used to be the ROOT directory that serves the default context.
      * <p><b>Don't forget to stop the returned Server after the test</b>
@@ -133,12 +132,12 @@ protected void startWebServer(final String resourceBase, final String[] classpat
      * @throws Exception if an error occurs
      */
     public static Server createWebServer(final String resourceBase, final String[] classpath) throws Exception {
-        return createWebServer(PORT, resourceBase, classpath, null, null);
+        return createWebServer(PORT, resourceBase, classpath, null);
     }
 
     /**
      * This is usually needed if you want to have a running server during many tests invocation.
-     *
+     * <p>
      * Creates and starts a web server on the default {@link #PORT}.
      * The given resourceBase is used to be the ROOT directory that serves the default context.
      * <p><b>Don't forget to stop the returned Server after the test</b>
@@ -147,12 +146,11 @@ public static Server createWebServer(final String resourceBase, final String[] c
      * @param resourceBase the base of resources for the default context
      * @param classpath additional classpath entries to add (may be null)
      * @param servlets map of {String, Class} pairs: String is the path spec, while class is the class
-     * @param handler wrapper for handler (can be null)
      * @return the newly created server
      * @throws Exception if an error occurs
      */
     public static Server createWebServer(final int port, final String resourceBase, final String[] classpath,
-            final Map<String, Class<? extends Servlet>> servlets, final HandlerWrapper handler) throws Exception {
+            final Map<String, Class<? extends Servlet>> servlets) throws Exception {
 
         final Server server = buildServer(port);
 
@@ -181,13 +179,7 @@ public static Server createWebServer(final int port, final String resourceBase,
             }
         }
         context.setClassLoader(loader);
-        if (handler != null) {
-            handler.setHandler(context);
-            server.setHandler(handler);
-        }
-        else {
-            server.setHandler(context);
-        }
+        server.setHandler(context);
 
         tryStart(port, server);
         return server;
@@ -407,8 +399,7 @@ public static void tryStart(final int port, final Server server) throws Exceptio
             }
             catch (final IOException e) {
                 // looks like newer jetty already catches the bind exception
-                final Throwable cause = e.getCause();
-                if (cause != null && cause instanceof BindException) {
+                if (e.getCause() instanceof BindException) {
                     if (System.currentTimeMillis() > maxWait) {
                         // destroy the server to free all associated resources
                         server.stop();