Skip to content

Commit 0b92a51

Browse files
bclozelbclozel
committed
Reinstate failing tests after Tomcat upgrade
Closes gh-33917
1 parent c35aac0 commit 0b92a51

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

Diff for: ‎spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java

-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.springframework.web.reactive.function.server.ServerRequest;
5050
import org.springframework.web.reactive.function.server.ServerResponse;
5151
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
52-
import org.springframework.web.testfixture.http.server.reactive.bootstrap.TomcatHttpServer;
5352
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
5453

5554
import static org.assertj.core.api.Assertions.assertThat;
@@ -69,8 +68,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
6968

7069
@ParameterizedHttpServerTest
7170
void multipartData(HttpServer httpServer) throws Exception {
72-
assumeFalse(httpServer instanceof TomcatHttpServer,
73-
"TomcatHttpServer fails with invalid request body chunk");
7471
startServer(httpServer);
7572

7673
Mono<ResponseEntity<Void>> result = webClient
@@ -89,8 +86,6 @@ void multipartData(HttpServer httpServer) throws Exception {
8986

9087
@ParameterizedHttpServerTest
9188
void parts(HttpServer httpServer) throws Exception {
92-
assumeFalse(httpServer instanceof TomcatHttpServer,
93-
"TomcatHttpServer fails with invalid request body chunk");
9489
startServer(httpServer);
9590

9691
Mono<ResponseEntity<Void>> result = webClient
@@ -109,8 +104,6 @@ void parts(HttpServer httpServer) throws Exception {
109104

110105
@ParameterizedHttpServerTest
111106
void transferTo(HttpServer httpServer) throws Exception {
112-
assumeFalse(httpServer instanceof TomcatHttpServer,
113-
"TomcatHttpServer fails with invalid request body chunk");
114107
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
115108
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
116109
verifyTransferTo(httpServer);
@@ -151,8 +144,6 @@ private void verifyTransferTo(HttpServer httpServer) throws Exception {
151144

152145
@ParameterizedHttpServerTest
153146
void partData(HttpServer httpServer) throws Exception {
154-
assumeFalse(httpServer instanceof TomcatHttpServer,
155-
"TomcatHttpServer fails with invalid request body chunk");
156147
startServer(httpServer);
157148

158149
Mono<ResponseEntity<Void>> result = webClient
@@ -171,8 +162,6 @@ void partData(HttpServer httpServer) throws Exception {
171162

172163
@ParameterizedHttpServerTest
173164
void proxy(HttpServer httpServer) throws Exception {
174-
assumeFalse(httpServer instanceof TomcatHttpServer,
175-
"TomcatHttpServer fails with invalid request body chunk");
176165
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
177166
startServer(httpServer);
178167

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

-17
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
6161
import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
6262
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
63-
import org.springframework.web.testfixture.http.server.reactive.bootstrap.TomcatHttpServer;
6463
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
6564

6665
import static org.assertj.core.api.Assertions.assertThat;
@@ -88,8 +87,6 @@ protected void startServer(HttpServer httpServer) throws Exception {
8887

8988
@ParameterizedHttpServerTest
9089
void requestPart(HttpServer httpServer) throws Exception {
91-
assumeFalse(httpServer instanceof TomcatHttpServer,
92-
"TomcatHttpServer fails with invalid request body chunk");
9390
startServer(httpServer);
9491

9592
Mono<ResponseEntity<Void>> result = webClient
@@ -107,8 +104,6 @@ void requestPart(HttpServer httpServer) throws Exception {
107104

108105
@ParameterizedHttpServerTest
109106
void requestBodyMap(HttpServer httpServer) throws Exception {
110-
assumeFalse(httpServer instanceof TomcatHttpServer,
111-
"TomcatHttpServer fails with invalid request body chunk");
112107
startServer(httpServer);
113108

114109
Mono<String> result = webClient
@@ -125,8 +120,6 @@ void requestBodyMap(HttpServer httpServer) throws Exception {
125120

126121
@ParameterizedHttpServerTest
127122
void requestBodyFlux(HttpServer httpServer) throws Exception {
128-
assumeFalse(httpServer instanceof TomcatHttpServer,
129-
"TomcatHttpServer fails with invalid request body chunk");
130123
startServer(httpServer);
131124

132125
Mono<String> result = webClient
@@ -143,8 +136,6 @@ void requestBodyFlux(HttpServer httpServer) throws Exception {
143136

144137
@ParameterizedHttpServerTest
145138
void filePartsFlux(HttpServer httpServer) throws Exception {
146-
assumeFalse(httpServer instanceof TomcatHttpServer,
147-
"TomcatHttpServer fails with invalid request body chunk");
148139
startServer(httpServer);
149140

150141
Mono<String> result = webClient
@@ -161,8 +152,6 @@ void filePartsFlux(HttpServer httpServer) throws Exception {
161152

162153
@ParameterizedHttpServerTest
163154
void filePartsMono(HttpServer httpServer) throws Exception {
164-
assumeFalse(httpServer instanceof TomcatHttpServer,
165-
"TomcatHttpServer fails with invalid request body chunk");
166155
startServer(httpServer);
167156

168157
Mono<String> result = webClient
@@ -179,8 +168,6 @@ void filePartsMono(HttpServer httpServer) throws Exception {
179168

180169
@ParameterizedHttpServerTest
181170
void transferTo(HttpServer httpServer) throws Exception {
182-
assumeFalse(httpServer instanceof TomcatHttpServer,
183-
"TomcatHttpServer fails with invalid request body chunk");
184171
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
185172
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
186173
startServer(httpServer);
@@ -201,8 +188,6 @@ void transferTo(HttpServer httpServer) throws Exception {
201188

202189
@ParameterizedHttpServerTest
203190
void modelAttribute(HttpServer httpServer) throws Exception {
204-
assumeFalse(httpServer instanceof TomcatHttpServer,
205-
"TomcatHttpServer fails with invalid request body chunk");
206191
startServer(httpServer);
207192

208193
Mono<String> result = webClient
@@ -219,8 +204,6 @@ void modelAttribute(HttpServer httpServer) throws Exception {
219204

220205
@ParameterizedHttpServerTest
221206
void partData(HttpServer httpServer) throws Exception {
222-
assumeFalse(httpServer instanceof TomcatHttpServer,
223-
"TomcatHttpServer fails with invalid request body chunk");
224207
startServer(httpServer);
225208

226209
Mono<String> result = webClient

0 commit comments

Comments
 (0)