Browse Source

Filter out hanging tests realted to Reactor Netty

Issue: SPR-14975
pull/1258/head
Rossen Stoyanchev 9 years ago
parent
commit
953f7d40cf
  1. 6
      spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
  2. 9
      spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java

6
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java

@ -52,6 +52,7 @@ import org.springframework.http.MediaType; @@ -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; @@ -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 @@ -175,6 +177,10 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq
@Test
public void resource() throws Exception {
// SPR-14975
assumeFalse(server instanceof ReactorHttpServer);
ResponseEntity<byte[]> response = performGet("/resource", new HttpHeaders(), byte[].class);
assertEquals(HttpStatus.OK, response.getStatusCode());

9
spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java

@ -19,6 +19,7 @@ package org.springframework.http.server.reactive; @@ -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; @@ -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 @@ -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();

Loading…
Cancel
Save