root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Reinstate failing tests after Tomcat upgrade
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 

Closes gh-33917
This commit is contained in:
Brian Clozel 2025-04-02 11:05:56 +02:00
parent c35aac0c52
commit 0b92a51650
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<ResponseEntity<Void>> 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<ResponseEntity<Void>> 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<ResponseEntity<Void>> 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);

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

@ -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<ResponseEntity<Void>> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> result = webClient