From 0b92a51650d5f56a2d7cbf28553d569aadb71276 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 2 Apr 2025 11:05:56 +0200 Subject: [PATCH] Reinstate failing tests after Tomcat upgrade Closes gh-33917 --- ...MultipartRouterFunctionIntegrationTests.java | 11 ----------- .../MultipartWebClientIntegrationTests.java | 17 ----------------- 2 files changed, 28 deletions(-) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java index ef5de62858b..5388b7566f9 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java @@ -49,7 +49,6 @@ import org.springframework.web.reactive.function.server.RouterFunction; 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.TomcatHttpServer; import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer; import static org.assertj.core.api.Assertions.assertThat; @@ -69,8 +68,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @ParameterizedHttpServerTest void multipartData(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono> result = webClient @@ -89,8 +86,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @ParameterizedHttpServerTest void parts(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono> result = webClient @@ -109,8 +104,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @ParameterizedHttpServerTest void transferTo(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); // TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310 assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo"); verifyTransferTo(httpServer); @@ -151,8 +144,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @ParameterizedHttpServerTest void partData(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono> result = webClient @@ -171,8 +162,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte @ParameterizedHttpServerTest void proxy(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests"); startServer(httpServer); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java index dee5bf9cde6..cc0fb65e35d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java @@ -60,7 +60,6 @@ import org.springframework.web.reactive.function.client.WebClient; 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.TomcatHttpServer; import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer; import static org.assertj.core.api.Assertions.assertThat; @@ -88,8 +87,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void requestPart(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono> result = webClient @@ -107,8 +104,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void requestBodyMap(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono result = webClient @@ -125,8 +120,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void requestBodyFlux(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono result = webClient @@ -143,8 +136,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void filePartsFlux(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono result = webClient @@ -161,8 +152,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void filePartsMono(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono result = webClient @@ -179,8 +168,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void transferTo(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); // TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310 assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo"); startServer(httpServer); @@ -201,8 +188,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void modelAttribute(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono result = webClient @@ -219,8 +204,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT @ParameterizedHttpServerTest void partData(HttpServer httpServer) throws Exception { - assumeFalse(httpServer instanceof TomcatHttpServer, - "TomcatHttpServer fails with invalid request body chunk"); startServer(httpServer); Mono result = webClient