cleanup

Author: rbri

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

@@ -43,7 +43,9 @@ public void setup() throws Exception {
         WebDriverTestCase.stopWebServers();
         startWebServer("src/test/resources/testfiles/noproxyroot/");
 
-        proxyWebServer_ = createWebServer(PORT_PROXY_SERVER, "src/test/resources/testfiles/proxyroot/", null);
+        proxyWebServer_ = JettyServerUtils.startWebServer(PORT_PROXY_SERVER,
+                                            "src/test/resources/testfiles/proxyroot/", null,
+                                            null, false, SSLVariant.NONE);
 
         final WebClient webClient = getWebClient();
 

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

@@ -695,7 +695,7 @@ protected static void startWebServer(final String resourceBase, final Map<String
         LAST_TEST_UsesMockWebConnection_ = Boolean.FALSE;
 
         STATIC_SERVER_STARTER_ = ExceptionUtils.getStackTrace(new Throwable("StaticServerStarter"));
-        STATIC_SERVER_ = WebServerTestCase.createWebServer(PORT, resourceBase, servlets);
+        STATIC_SERVER_ = JettyServerUtils.startWebServer(PORT, resourceBase, servlets, null, false, SSLVariant.NONE);
     }
 
     /**
@@ -712,7 +712,7 @@ protected static void startWebServer2(final String resourceBase, final Map<Strin
             JettyServerUtils.stopServer(STATIC_SERVER2_);
         }
         STATIC_SERVER2_STARTER_ = ExceptionUtils.getStackTrace(new Throwable("StaticServer2Starter"));
-        STATIC_SERVER2_ = WebServerTestCase.createWebServer(PORT2, resourceBase, servlets);
+        STATIC_SERVER2_ = JettyServerUtils.startWebServer(PORT2, resourceBase, servlets, null, false, SSLVariant.NONE);
     }
 
     /**

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

@@ -74,40 +74,6 @@ protected void startWebServer(final String resourceBase) throws Exception {
         server_ =  JettyServerUtils.startWebServer(PORT, resourceBase, null, null, isBasicAuthentication(), getSSLVariant());
     }
 
-    /**
-     * 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>
-     *
-     * @param resourceBase the base of resources for the default context
-     * @return the newly created server
-     * @throws Exception if an error occurs
-     */
-    public static Server createWebServer(final String resourceBase) throws Exception {
-        return createWebServer(PORT, resourceBase, 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>
-     *
-     * @param port the port to which the server is bound
-     * @param resourceBase the base of resources for the default context
-     * @param servlets map of {String, Class} pairs: String is the path spec, while class is the class
-     * @return the newly created server
-     * @throws Exception if an error occurs
-     */
-    public static Server createWebServer(final int port, final String resourceBase,
-            final Map<String, Class<? extends Servlet>> servlets) throws Exception {
-
-        return JettyServerUtils.startWebServer(port, resourceBase, servlets, null, false, SSLVariant.NONE);
-    }
-
     /**
      * Starts the web server on the default {@link #PORT}.
      * The given resourceBase is used to be the ROOT directory that serves the default context.
@@ -123,7 +89,7 @@ protected void startWebServer(final String resourceBase,
             throw new IllegalStateException("startWebServer() can not be called twice");
         }
 
-        server_ = createWebServer(PORT, resourceBase, servlets);
+        server_ = JettyServerUtils.startWebServer(PORT, resourceBase, servlets, null, false, SSLVariant.NONE);
     }
 
     /**