reduce jetty dependencies

Author: rbri

src/test/java/org/htmlunit/archunit/Architecture2Test.java

@@ -231,4 +231,21 @@ public void check(final JavaMethod method, final ConditionEvents events) {
     @ArchTest
     public static final ArchRule googleCommonPackageRule = noClasses()
             .should().dependOnClassesThat().resideInAnyPackage("com.google.common..");
-}
+
+    /**
+     * Do not use jetty.
+     */
+    @ArchTest
+    public static final ArchRule jettyPackageRule = noClasses()
+        .that()
+            .resideOutsideOfPackage("org.htmlunit.archunit..")
+            .and().doNotHaveFullyQualifiedName("org.htmlunit.util.JettyServerUtils")
+            .and().doNotHaveFullyQualifiedName("org.htmlunit.util.JettyServerUtils$AsciiEncodingFilter")
+
+            .and().doNotHaveFullyQualifiedName("org.htmlunit.WebServerTestCase")
+            .and().doNotHaveFullyQualifiedName("org.htmlunit.WebDriverTestCase")
+
+            .and().doNotHaveFullyQualifiedName("org.htmlunit.HttpWebConnectionProxyTest")
+        .should()
+            .dependOnClassesThat().resideInAnyPackage("org.eclipse.jetty..");
+    }

src/test/java/org/htmlunit/libraries/jquery/JQuery1x11x3Test.java

@@ -14,8 +14,14 @@
  */
 package org.htmlunit.libraries.jquery;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Servlet;
+
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.junit.annotation.HtmlUnitNYI;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -32,6 +38,16 @@
  */
 public class JQuery1x11x3Test extends JQueryTestBase {
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @BeforeAll
+    public static void startServer() throws Exception {
+        final Map<String, Class<? extends Servlet>> servlets = new HashMap<>();
+        servlets.put("*.php", com.caucho.quercus.servlet.QuercusServlet.class);
+        startWebServer("src/test/resources/libraries/jQuery/1.11.3", null, servlets);
+    }
+
     /**
      * {@inheritDoc}
      */

src/test/java/org/htmlunit/libraries/jquery/JQuery1x12x4Test.java

@@ -16,9 +16,14 @@
 
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Servlet;
 
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.junit.annotation.HtmlUnitNYI;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -37,6 +42,16 @@ public class JQuery1x12x4Test extends JQueryTestBase {
 
     private String[] testResultLines_ = null;
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @BeforeAll
+    public static void startServer() throws Exception {
+        final Map<String, Class<? extends Servlet>> servlets = new HashMap<>();
+        servlets.put("*.php", com.caucho.quercus.servlet.QuercusServlet.class);
+        startWebServer("src/test/resources/libraries/jQuery/1.12.4", null, servlets);
+    }
+
     /**
      * {@inheritDoc}
      */

src/test/java/org/htmlunit/libraries/jquery/JQuery1x8x2Test.java

@@ -14,8 +14,14 @@
  */
 package org.htmlunit.libraries.jquery;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Servlet;
+
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.junit.annotation.HtmlUnitNYI;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -32,6 +38,16 @@
  */
 public class JQuery1x8x2Test extends JQueryTestBase {
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @BeforeAll
+    public static void startServer() throws Exception {
+        final Map<String, Class<? extends Servlet>> servlets = new HashMap<>();
+        servlets.put("*.php", com.caucho.quercus.servlet.QuercusServlet.class);
+        startWebServer("src/test/resources/libraries/jQuery/1.8.2", null, servlets);
+    }
+
     /**
      * {@inheritDoc}
      */

src/test/java/org/htmlunit/libraries/jquery/JQuery3x3x1Test.java

@@ -16,9 +16,14 @@
 
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Servlet;
 
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.junit.annotation.HtmlUnitNYI;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -35,6 +40,16 @@
  */
 public class JQuery3x3x1Test extends JQueryTestBase {
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @BeforeAll
+    public static void startServer() throws Exception {
+        final Map<String, Class<? extends Servlet>> servlets = new HashMap<>();
+        servlets.put("*.php", com.caucho.quercus.servlet.QuercusServlet.class);
+        startWebServer("src/test/resources/libraries/jQuery/3.3.1", null, servlets);
+    }
+
     /**
      * {@inheritDoc}
      */

src/test/java/org/htmlunit/libraries/jquery/JQueryTestBase.java

@@ -19,19 +19,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.jetty.server.Server;
 import org.htmlunit.WebClient;
 import org.htmlunit.WebDriverTestCase;
 import org.htmlunit.WebRequest;
 import org.htmlunit.WebResponse;
 import org.htmlunit.WebResponseData;
-import org.htmlunit.WebServerTestCase;
 import org.htmlunit.http.HttpStatus;
 import org.htmlunit.junit.SetExpectedAlertsBeforeTestExecutionCallback;
 import org.htmlunit.util.WebConnectionWrapper;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.StaleElementReferenceException;
@@ -70,8 +66,6 @@ public WebResponse getResponse(final WebRequest request) throws IOException {
         }
     }
 
-    private static Server SERVER_;
-
     /**
      * Returns the jQuery version being tested.
      * @return the jQuery version being tested
@@ -200,26 +194,4 @@ protected String getResultDetailElementText(final WebDriver webdriver, final Str
         result = result.substring(0, result.indexOf("Rerun")).trim();
         return result;
     }
-
-    /**
-     * @throws Exception if an error occurs
-     */
-    @BeforeEach
-    public void aaa_startSesrver() throws Exception {
-        if (SERVER_ == null) {
-            SERVER_ = WebServerTestCase.createWebServer("src/test/resources/libraries/jQuery/" + getVersion(), null);
-        }
-    }
-
-    /**
-     * @throws Exception if an error occurs
-     */
-    @AfterAll
-    public static void zzz_stopServer() throws Exception {
-        if (SERVER_ != null) {
-            SERVER_.stop();
-            SERVER_.destroy();
-            SERVER_ = null;
-        }
-    }
 }