Enabled previously disabled tests

poutsma · Aug 15, 2023 · 07f55e2 · 07f55e2
1 parent 3afd52b
commit 07f55e2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/...va/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java b/...va/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java
@@ -49,7 +49,6 @@
 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.JettyHttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -164,7 +163,6 @@ void partData(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void proxy(HttpServer httpServer) throws Exception {
-		assumeFalse(httpServer instanceof JettyHttpServer, "Jetty 12 TODO: Jetty 12 fails proxying requests");
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
 
 		startServer(httpServer);

diff --git a/...eb/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/...eb/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
@@ -57,11 +57,9 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.config.EnableWebFlux;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
-import org.springframework.web.testfixture.http.server.reactive.bootstrap.JettyHttpServer;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.springframework.http.MediaType.APPLICATION_XML;
 
 /**
@@ -364,8 +362,6 @@ void personCreateWithPublisherJson(HttpServer httpServer) throws Exception {
 	@ParameterizedHttpServerTest
 	void personCreateWithPublisherXml(HttpServer httpServer) throws Exception {
 		startServer(httpServer);
-		assumeFalse(httpServer instanceof JettyHttpServer, "Jetty 12 TODO: flaky test");
-
 
 		People people = new People(new Person("Robert"), new Person("Marie"));
 		ResponseEntity<Void> response = performPost("/person-create/publisher", APPLICATION_XML, people, null, Void.class);
@@ -409,7 +405,6 @@ void personCreateWithFluxJson(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void personCreateWithFluxXml(HttpServer httpServer) throws Exception {
-		assumeFalse(httpServer instanceof JettyHttpServer, "Jetty 12 TODO: flaky test");
 		startServer(httpServer);
 
 		People people = new People(new Person("Robert"), new Person("Marie"));
@@ -432,7 +427,6 @@ void personCreateWithObservableJson(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void personCreateWithObservableXml(HttpServer httpServer) throws Exception {
-		assumeFalse(httpServer instanceof JettyHttpServer, "Jetty 12 TODO: flaky test");
 		startServer(httpServer);
 
 		People people = new People(new Person("Robert"), new Person("Marie"));