root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Update integration tests for reactor-netty 

Now that reactor/reactor-netty#12 is fixed, we can restore the
previously ignored integration tests.
New tests are hanging, so this commit is converting the `StepVerifier`
`verify()` calls to using actual timeouts.

Issue: SPR-14975
This commit is contained in:
Brian Clozel 2016-12-13 21:34:13 +01:00
parent 2802926c1d
commit ba47d06cbb
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
View File

@ -52,7 +52,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.codec.json.Jackson2JsonEncoder; import org.springframework.http.codec.json.Jackson2JsonEncoder;
import org.springframework.http.server.reactive.ZeroCopyIntegrationTests; 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -63,7 +62,6 @@ import org.springframework.web.reactive.config.EnableWebReactive;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.springframework.http.MediaType.APPLICATION_XML; import static org.springframework.http.MediaType.APPLICATION_XML;
/** /**

2
spring-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java
View File

@ -73,7 +73,7 @@ public class FlushingIntegrationTests extends AbstractHttpHandlerIntegrationTest
StepVerifier.create(result) StepVerifier.create(result)
.consumeNextWith(value -> Assert.isTrue(value.length() == 200000)) .consumeNextWith(value -> Assert.isTrue(value.length() == 200000))
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(5L));
} }
@Override @Override

5
spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java
View File

@ -19,7 +19,6 @@ package org.springframework.http.server.reactive;
import java.io.File; import java.io.File;
import java.net.URI; import java.net.URI;
import org.junit.Assume;
import org.junit.Test; import org.junit.Test;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -35,7 +34,6 @@ import org.springframework.web.client.RestTemplate;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
/** /**
@ -53,9 +51,6 @@ public class ZeroCopyIntegrationTests extends AbstractHttpHandlerIntegrationTest
@Test @Test
public void zeroCopy() throws Exception { public void zeroCopy() throws Exception {
// SPR-14975
assumeFalse(server instanceof ReactorHttpServer);
// Zero-copy only does not support servlet // Zero-copy only does not support servlet
assumeTrue(server instanceof ReactorHttpServer || server instanceof UndertowHttpServer); assumeTrue(server instanceof ReactorHttpServer || server instanceof UndertowHttpServer);

18
spring-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java
View File

@ -77,7 +77,7 @@ public class WebClientIntegrationTests {
assertEquals(13L, httpHeaders.getContentLength()); assertEquals(13L, httpHeaders.getContentLength());
}) })
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -101,7 +101,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.expectNext("Hello Spring!") .expectNext("Hello Spring!")
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -128,7 +128,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.expectNext(content) .expectNext(content)
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -153,7 +153,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.consumeNextWith(p -> assertEquals("barbar", p.getBar())) .consumeNextWith(p -> assertEquals("barbar", p.getBar()))
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -179,7 +179,7 @@ public class WebClientIntegrationTests {
.consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar1"))) .consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar1")))
.consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar2"))) .consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar2")))
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -207,7 +207,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.consumeNextWith(p -> assertEquals("BARBAR", p.getBar())) .consumeNextWith(p -> assertEquals("BARBAR", p.getBar()))
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -235,7 +235,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.expectNext("test") .expectNext("test")
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -288,7 +288,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.expectNext("Hello Spring!") .expectNext("Hello Spring!")
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());
@ -317,7 +317,7 @@ public class WebClientIntegrationTests {
StepVerifier.create(result) StepVerifier.create(result)
.expectNext("Hello Spring!") .expectNext("Hello Spring!")
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest(); RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount()); assertEquals(1, server.getRequestCount());