Drop AbstractJettyServletWebServerFactoryTests

Drop `AbstractJettyServletWebServerFactoryTests` and merge the existing
code into `JettyServletWebServerFactoryTests`.

Author: philwebb

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/AbstractJettyServletWebServerFactoryTests.java

@@ -18,11 +18,14 @@
 
 import java.lang.reflect.Method;
 import java.net.InetAddress;
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EventListener;
+import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicReference;
@@ -38,6 +41,7 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.jasper.servlet.JspServlet;
 import org.awaitility.Awaitility;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
@@ -48,6 +52,7 @@
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ThreadPool;
@@ -57,11 +62,15 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 
+import org.springframework.boot.testsupport.system.CapturedOutput;
+import org.springframework.boot.web.server.Compression;
 import org.springframework.boot.web.server.GracefulShutdownResult;
+import org.springframework.boot.web.server.PortInUseException;
 import org.springframework.boot.web.server.Shutdown;
 import org.springframework.boot.web.server.Ssl;
 import org.springframework.boot.web.server.WebServerException;
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
+import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactoryTests;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -78,7 +87,69 @@
  * @author Andy Wilkinson
  * @author Henri Kerola
  */
-class JettyServletWebServerFactoryTests extends AbstractJettyServletWebServerFactoryTests {
+class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryTests {
+
+	@Override
+	protected JettyServletWebServerFactory getFactory() {
+		return new JettyServletWebServerFactory(0);
+	}
+
+	@Override
+	protected void addConnector(int port, AbstractServletWebServerFactory factory) {
+		((JettyServletWebServerFactory) factory).addServerCustomizers((server) -> {
+			ServerConnector connector = new ServerConnector(server);
+			connector.setPort(port);
+			server.addConnector(connector);
+		});
+	}
+
+	@Override
+	protected JspServlet getJspServlet() throws Exception {
+		WebAppContext context = findWebAppContext((JettyWebServer) this.webServer);
+		ServletHolder holder = context.getServletHandler().getServlet("jsp");
+		if (holder == null) {
+			return null;
+		}
+		holder.start();
+		holder.initialize();
+		return (JspServlet) holder.getServlet();
+	}
+
+	@Override
+	protected Map<String, String> getActualMimeMappings() {
+		WebAppContext context = findWebAppContext((JettyWebServer) this.webServer);
+		return context.getMimeTypes().getMimeMap();
+	}
+
+	@Override
+	protected Charset getCharset(Locale locale) {
+		WebAppContext context = findWebAppContext((JettyWebServer) this.webServer);
+		String charsetName = context.getLocaleEncoding(locale);
+		return (charsetName != null) ? Charset.forName(charsetName) : null;
+	}
+
+	@Override
+	protected void handleExceptionCausedByBlockedPortOnPrimaryConnector(RuntimeException ex, int blockedPort) {
+		assertThat(ex).isInstanceOf(PortInUseException.class);
+		assertThat(((PortInUseException) ex).getPort()).isEqualTo(blockedPort);
+	}
+
+	@Override
+	protected void handleExceptionCausedByBlockedPortOnSecondaryConnector(RuntimeException ex, int blockedPort) {
+		handleExceptionCausedByBlockedPortOnPrimaryConnector(ex, blockedPort);
+	}
+
+	@Test
+	void contextPathIsLoggedOnStartupWhenCompressionIsEnabled(CapturedOutput output) {
+		AbstractServletWebServerFactory factory = getFactory();
+		factory.setContextPath("/custom");
+		Compression compression = new Compression();
+		compression.setEnabled(true);
+		factory.setCompression(compression);
+		this.webServer = factory.getWebServer(exampleServletRegistration());
+		this.webServer.start();
+		assertThat(output).containsOnlyOnce("with context path '/custom'");
+	}
 
 	@Test
 	protected void correctVersionOfJettyUsed() {
@@ -438,6 +509,20 @@ public void configure(WebAppContext context) throws Exception {
 		assertThat(context.getErrorHandler()).isInstanceOf(CustomErrorHandler.class);
 	}
 
+	private WebAppContext findWebAppContext(JettyWebServer webServer) {
+		return findWebAppContext(webServer.getServer().getHandler());
+	}
+
+	private WebAppContext findWebAppContext(Handler handler) {
+		if (handler instanceof WebAppContext) {
+			return (WebAppContext) handler;
+		}
+		if (handler instanceof HandlerWrapper) {
+			return findWebAppContext(((HandlerWrapper) handler).getHandler());
+		}
+		throw new IllegalStateException("No WebAppContext found");
+	}
+
 	private static class CustomErrorHandler extends ErrorPageErrorHandler {
 
 	}