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
spring-projects · Dec 13, 2016 · ba47d06 · ba47d06
1 parent 2802926
commit ba47d06
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/...eb/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/...eb/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
@@ -52,7 +52,6 @@
 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;
@@ -63,7 +62,6 @@
 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;
 
 /**

diff --git a/...-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java b/...-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java
@@ -73,7 +73,7 @@ public void writeAndAutoFlushOnComplete() {
 		StepVerifier.create(result)
 				.consumeNextWith(value -> Assert.isTrue(value.length() == 200000))
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(5L));
 	}
 
 	@Override

diff --git a/...-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java b/...-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java
@@ -19,7 +19,6 @@
 import java.io.File;
 import java.net.URI;
 
-import org.junit.Assume;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
 
@@ -35,7 +34,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 /**
@@ -53,9 +51,6 @@ protected HttpHandler createHttpHandler() {
 	@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);
 

diff --git a/...-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java b/...-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java
@@ -77,7 +77,7 @@ public void headers() throws Exception {
 							assertEquals(13L, httpHeaders.getContentLength());
 						})
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -101,7 +101,7 @@ public void plainText() throws Exception {
 		StepVerifier.create(result)
 				.expectNext("Hello Spring!")
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -128,7 +128,7 @@ public void jsonString() throws Exception {
 		StepVerifier.create(result)
 				.expectNext(content)
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -153,7 +153,7 @@ public void jsonPojoMono() throws Exception {
 		StepVerifier.create(result)
 				.consumeNextWith(p -> assertEquals("barbar", p.getBar()))
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -179,7 +179,7 @@ public void jsonPojoFlux() throws Exception {
 				.consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar1")))
 				.consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar2")))
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -207,7 +207,7 @@ public void postJsonPojo() throws Exception {
 		StepVerifier.create(result)
 				.consumeNextWith(p -> assertEquals("BARBAR", p.getBar()))
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -235,7 +235,7 @@ public void cookies() throws Exception {
 		StepVerifier.create(result)
 				.expectNext("test")
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -288,7 +288,7 @@ public void buildFilter() throws Exception {
 		StepVerifier.create(result)
 				.expectNext("Hello Spring!")
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -317,7 +317,7 @@ public void filter() throws Exception {
 		StepVerifier.create(result)
 				.expectNext("Hello Spring!")
 				.expectComplete()
-				.verify();
+				.verify(Duration.ofSeconds(3));
 
 		RecordedRequest recordedRequest = server.takeRequest();
 		assertEquals(1, server.getRequestCount());