Test JettyReactiveWebServerFactory against Jetty 10

Closes gh-26039

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.web.embedded.jetty;
+
+import org.eclipse.jetty.server.handler.ErrorHandler;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@JettyReactiveWebServerFactory} with Jetty 10.
+ *
+ * @author Andy Wilkinson
+ */
+@TestWithJetty10
+class Jetty10ReactiveWebServerFactoryTests extends JettyReactiveWebServerFactoryTests {
+
+	@Test
+	void correctVersionOfJettyUsed() {
+		String jettyVersion = ErrorHandler.class.getPackage().getImplementationVersion();
+		assertThat(jettyVersion).startsWith("10.0");
+	}
+
+	@Test
+	@Override
+	@Disabled("Jetty 10 does not support User-Agent-based compression")
+	protected void noCompressionForUserAgent() {
+
+	}
+
+	@Test
+	@Override
+	@Disabled("https://github.com/eclipse/jetty.project/issues/6164")
+	protected void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed() {
+
+	}
+
+}

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

@@ -19,41 +19,38 @@ package org.springframework.boot.web.embedded.jetty;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
-
-import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
-import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@EnabledForJreRange(min = JRE.JAVA_11)
-@ClassPathExclusions({ "jetty-*.jar", "tomcat-embed*.jar" })
-@ClassPathOverrides({ "org.slf4j:slf4j-api:1.7.25", "org.eclipse.jetty:jetty-io:10.0.0",
-		"org.eclipse.jetty:jetty-server:10.0.0", "org.eclipse.jetty:jetty-servlet:10.0.0",
-		"org.eclipse.jetty:jetty-util:10.0.0", "org.eclipse.jetty:jetty-webapp:10.0.0",
-		"org.eclipse.jetty.http2:http2-common:10.0.0", "org.eclipse.jetty.http2:http2-hpack:10.0.0",
-		"org.eclipse.jetty.http2:http2-server:10.0.0", "org.mortbay.jasper:apache-jsp:8.5.40" })
+/**
+ * Tests for {@JettyServletWebServerFactory} with Jetty 10.
+ *
+ * @author Andy Wilkinson
+ */
+@TestWithJetty10
 public class Jetty10ServletWebServerFactoryTests extends JettyServletWebServerFactoryTests {
 
-	@Override
 	@Test
+	@Override
 	protected void correctVersionOfJettyUsed() {
 		String jettyVersion = ErrorHandler.class.getPackage().getImplementationVersion();
 		assertThat(jettyVersion).startsWith("10.0");
 	}
 
+	@Test
 	@Override
 	@Disabled("Jetty 10 does not support User-Agent-based compression")
 	protected void noCompressionForUserAgent() {
 
 	}
 
+	@Test
 	@Override
 	@Disabled("Jetty 10 adds methods to Configuration that we can't mock while compiling against 9")
 	protected void jettyConfigurations() throws Exception {
 	}
 
+	@Test
 	@Override
 	@Disabled("https://github.com/eclipse/jetty.project/issues/6164")
 	protected void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed() {

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.web.embedded.jetty;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+
+import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
+
+/**
+ * Configure a test class to run its tests with Jetty 10 on the classpath.
+ *
+ * @author Andy Wilkinson
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@EnabledForJreRange(min = JRE.JAVA_11)
+@ClassPathExclusions({ "jetty-*.jar", "tomcat-embed*.jar" })
+@ClassPathOverrides({ "org.slf4j:slf4j-api:1.7.25", "org.eclipse.jetty:jetty-io:10.0.2",
+		"org.eclipse.jetty:jetty-server:10.0.2", "org.eclipse.jetty:jetty-servlet:10.0.2",
+		"org.eclipse.jetty:jetty-util:10.0.2", "org.eclipse.jetty:jetty-webapp:10.0.2",
+		"org.eclipse.jetty.http2:http2-common:10.0.2", "org.eclipse.jetty.http2:http2-hpack:10.0.2",
+		"org.eclipse.jetty.http2:http2-server:10.0.2", "org.mortbay.jasper:apache-jsp:8.5.40" })
+@interface TestWithJetty10 {
+
+}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

@@ -340,7 +340,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
 	}
 
 	@Test
-	void noCompressionForUserAgent() {
+	protected void noCompressionForUserAgent() {
 		Compression compression = new Compression();
 		compression.setEnabled(true);
 		compression.setExcludedUserAgents(new String[] { "testUserAgent" });
@@ -459,7 +459,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
 	}
 
 	@Test
-	void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed()
+	protected void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed()
 			throws InterruptedException, ExecutionException, IOException {
 		AbstractReactiveWebServerFactory factory = getFactory();
 		Http2 http2 = new Http2();