diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java index 364ab268b9d..32631b27876 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java @@ -52,6 +52,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.codec.json.Jackson2JsonEncoder; import org.springframework.http.server.reactive.ZeroCopyIntegrationTests; +import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -62,6 +63,7 @@ import org.springframework.web.reactive.config.EnableWebReactive; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import static org.springframework.http.MediaType.APPLICATION_XML; /** @@ -175,6 +177,10 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq @Test public void resource() throws Exception { + + // SPR-14975 + assumeFalse(server instanceof ReactorHttpServer); + ResponseEntity response = performGet("/resource", new HttpHeaders(), byte[].class); assertEquals(HttpStatus.OK, response.getStatusCode()); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java index 3006cb9763b..28f67d196cc 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java @@ -19,6 +19,7 @@ package org.springframework.http.server.reactive; import java.io.File; import java.net.URI; +import org.junit.Assume; import org.junit.Test; import reactor.core.publisher.Mono; @@ -34,6 +35,7 @@ import org.springframework.web.client.RestTemplate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; /** @@ -50,9 +52,12 @@ public class ZeroCopyIntegrationTests extends AbstractHttpHandlerIntegrationTest @Test public void zeroCopy() throws Exception { + + // SPR-14975 + assumeFalse(server instanceof ReactorHttpServer); + // Zero-copy only does not support servlet - assumeTrue(server instanceof ReactorHttpServer || - server instanceof UndertowHttpServer); + assumeTrue(server instanceof ReactorHttpServer || server instanceof UndertowHttpServer); RestTemplate restTemplate = new RestTemplate();