Properly use Reactor Netty 2 in AbstractHttpHandlerIntegrationTests

Closes gh-31095

Author: sdeleuze

spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/AbstractHttpHandlerIntegrationTests.java

@@ -127,7 +127,7 @@ static Stream<Named<HttpServer>> httpServers() {
 		return Stream.of(
 				named("Jetty", new JettyHttpServer()),
 				named("Reactor Netty", new ReactorHttpServer()),
-				named("Reactor Netty 2", new ReactorHttpServer()),
+				named("Reactor Netty 2", new ReactorNetty2HttpServer()),
 				named("Tomcat", new TomcatHttpServer()),
 				named("Undertow", new UndertowHttpServer())
 		);

spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java

@@ -49,6 +49,7 @@
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
+import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -68,6 +69,9 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
 
 	@ParameterizedHttpServerTest
 	void multipartData(HttpServer httpServer) throws Exception {
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
+
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -86,6 +90,9 @@ void multipartData(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void parts(HttpServer httpServer) throws Exception {
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
+
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -106,6 +113,8 @@ void parts(HttpServer httpServer) throws Exception {
 	void transferTo(HttpServer httpServer) throws Exception {
 		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
 
 		verifyTransferTo(httpServer);
 	}
@@ -145,6 +154,9 @@ private void verifyTransferTo(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void partData(HttpServer httpServer) throws Exception {
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
+
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -164,6 +176,8 @@ void partData(HttpServer httpServer) throws Exception {
 	@ParameterizedHttpServerTest
 	void proxy(HttpServer httpServer) throws Exception {
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
 
 		startServer(httpServer);
 

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java

@@ -60,6 +60,7 @@
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
+import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -87,6 +88,9 @@ protected void startServer(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void requestPart(HttpServer httpServer) throws Exception {
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
+
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -170,6 +174,8 @@ void filePartsMono(HttpServer httpServer) throws Exception {
 	void transferTo(HttpServer httpServer) throws Exception {
 		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
 
 		startServer(httpServer);
 
@@ -189,6 +195,9 @@ void transferTo(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void modelAttribute(HttpServer httpServer) throws Exception {
+		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
+		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
+
 		startServer(httpServer);
 
 		Mono<String> result = webClient