reduce jetty dependencies

Author: rbri

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

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

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

@@ -37,13 +37,8 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,7 +49,6 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.htmlunit.MockWebConnection.RawResponseData;
 import org.htmlunit.WebServerTestCase.SSLVariant;
@@ -1684,38 +1678,4 @@ protected Page getEnclosedPage() {
     protected WebClient getWebClient() {
         return webDriver_.getWebClient();
     }
-
-    /**
-     * Needed as Jetty starting from 9.4.4 expects UTF-8 encoding by default.
-     */
-    public static class AsciiEncodingFilter implements Filter {
-
-        private static Charset CHARSET_;
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void init(final FilterConfig filterConfig) throws ServletException {
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
-                throws IOException, ServletException {
-            if (request instanceof Request) {
-                ((Request) request).setQueryEncoding(CHARSET_.name());
-            }
-            chain.doFilter(request, response);
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void destroy() {
-        }
-    }
 }

src/test/java/org/htmlunit/libraries/prototype/Prototype150rc1Test.java

@@ -16,7 +16,6 @@
 
 import java.util.List;
 
-import org.htmlunit.WebServerTestCase;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
@@ -38,8 +37,8 @@ public class Prototype150rc1Test extends PrototypeTestBase {
      * @throws Exception if an error occurs
      */
     @BeforeAll
-    public static void startSesrver() throws Exception {
-        SERVER_ = WebServerTestCase.createWebServer("src/test/resources/libraries/prototype/1.5.0-rc1/", null);
+    public static void startServer() throws Exception {
+        startWebServer("src/test/resources/libraries/prototype/1.5.0-rc1/", null, null);
     }
 
     /**

src/test/java/org/htmlunit/libraries/prototype/Prototype160Test.java

@@ -16,7 +16,6 @@
 
 import java.util.List;
 
-import org.htmlunit.WebServerTestCase;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
@@ -37,8 +36,8 @@ public class Prototype160Test extends PrototypeTestBase {
      * @throws Exception if an error occurs
      */
     @BeforeAll
-    public static void aaa_startSesrver() throws Exception {
-        SERVER_ = WebServerTestCase.createWebServer("src/test/resources/libraries/prototype/1.6.0/", null);
+    public static void startServer() throws Exception {
+        startWebServer("src/test/resources/libraries/prototype/1.6.0/", null, null);
     }
 
     /**

src/test/java/org/htmlunit/libraries/prototype/Prototype161Test.java

@@ -14,7 +14,6 @@
  */
 package org.htmlunit.libraries.prototype;
 
-import org.htmlunit.WebServerTestCase;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -30,8 +29,8 @@ public class Prototype161Test extends PrototypeTestBase {
      * @throws Exception if an error occurs
      */
     @BeforeAll
-    public static void aaa_startSesrver() throws Exception {
-        SERVER_ = WebServerTestCase.createWebServer("src/test/resources/libraries/prototype/1.6.1/test/unit/", null);
+    public static void startServer() throws Exception {
+        startWebServer("src/test/resources/libraries/prototype/1.6.1/test/unit/", null, null);
     }
 
     /**

src/test/java/org/htmlunit/libraries/prototype/Prototype171Test.java

@@ -14,7 +14,6 @@
  */
 package org.htmlunit.libraries.prototype;
 
-import org.htmlunit.WebServerTestCase;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -30,8 +29,8 @@ public class Prototype171Test extends PrototypeTestBase {
      * @throws Exception if an error occurs
      */
     @BeforeAll
-    public static void aaa_startSesrver() throws Exception {
-        SERVER_ = WebServerTestCase.createWebServer("src/test/resources/libraries/prototype/1.7.1/test/unit/", null);
+    public static void startServer() throws Exception {
+        startWebServer("src/test/resources/libraries/prototype/1.7.1/test/unit/", null, null);
     }
 
     /**

src/test/java/org/htmlunit/libraries/prototype/PrototypeTestBase.java

@@ -23,9 +23,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.jetty.server.Server;
 import org.htmlunit.WebDriverTestCase;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
@@ -44,8 +42,6 @@
 public abstract class PrototypeTestBase extends WebDriverTestCase {
 
     private static final Log LOG = LogFactory.getLog(PrototypeTestBase.class);
-    /** The server. */
-    protected static Server SERVER_;
 
     /**
      * Gets the prototype tested version.
@@ -127,18 +123,6 @@ protected void test(final String filename) throws Exception {
         assertEquals(expected, actual);
     }
 
-    /**
-     * @throws Exception if an error occurs
-     */
-    @AfterAll
-    public static void stopServer() throws Exception {
-        if (SERVER_ != null) {
-            SERVER_.stop();
-            SERVER_.destroy();
-            SERVER_ = null;
-        }
-    }
-
     /**
      * @return the resource base URL
      */