Browse Source

Enable reactive web integration tests

pull/1288/merge
Rossen Stoyanchev 9 years ago
parent
commit
9faaa22fd4
  1. 6
      spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java
  2. 4
      spring-web/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java

6
spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java

@ -19,6 +19,7 @@ package org.springframework.web.reactive; @@ -19,6 +19,7 @@ package org.springframework.web.reactive;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.reactivestreams.Publisher;
@ -33,6 +34,7 @@ import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTe @@ -33,6 +34,7 @@ import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTe
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.http.server.reactive.bootstrap.RxNettyHttpServer;
import org.springframework.util.Assert;
import org.springframework.web.reactive.function.BodyExtractors;
import org.springframework.web.reactive.function.client.ClientRequest;
@ -48,6 +50,10 @@ public class FlushingIntegrationTests extends AbstractHttpHandlerIntegrationTest @@ -48,6 +50,10 @@ public class FlushingIntegrationTests extends AbstractHttpHandlerIntegrationTest
@Before
public void setup() throws Exception {
// TODO: fix failing tests
Assume.assumeFalse(this.server instanceof RxNettyHttpServer);
super.setup();
this.webClient = WebClient.create(new ReactorClientHttpConnector());
}

4
spring-web/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java

@ -29,8 +29,6 @@ import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer; @@ -29,8 +29,6 @@ import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer;
import org.springframework.http.server.reactive.bootstrap.RxNettyHttpServer;
import org.springframework.http.server.reactive.bootstrap.TomcatHttpServer;
import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.util.SocketUtils;
@RunWith(Parameterized.class)
@ -57,8 +55,6 @@ public abstract class AbstractHttpHandlerIntegrationTests { @@ -57,8 +55,6 @@ public abstract class AbstractHttpHandlerIntegrationTests {
@Before
public void setup() throws Exception {
Assume.group(TestGroup.PERFORMANCE);
this.port = SocketUtils.findAvailableTcpPort();
this.server.setPort(this.port);
this.server.setHandler(createHttpHandler());

Loading…
Cancel
Save