* Fix WebFluxRequestExecutingMessageHandlerTests

Author: artembilan

spring-integration-webflux/src/test/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandlerTests.java

@@ -18,10 +18,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
+import java.time.Duration;
 
-import org.junit.Test;
-import org.reactivestreams.Subscriber;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
@@ -33,7 +32,6 @@
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.http.HttpHeaders;
 import org.springframework.integration.support.MessageBuilder;
-import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.webflux.support.ClientHttpResponseBodyExtractor;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandlingException;
@@ -52,10 +50,10 @@
  *
  * @since 5.0
  */
-public class WebFluxRequestExecutingMessageHandlerTests {
+class WebFluxRequestExecutingMessageHandlerTests {
 
 	@Test
-	public void testReactiveReturn() {
+	void testReactiveReturn() {
 		ClientHttpConnector httpConnector =
 				new HttpHandlerConnector((request, response) -> {
 					response.setStatusCode(HttpStatus.OK);
@@ -78,14 +76,13 @@ public void testReactiveReturn() {
 		StepVerifier.create(ackChannel, 2)
 				.assertNext(m -> assertThat(m.getHeaders()).containsEntry(HttpHeaders.STATUS_CODE, HttpStatus.OK))
 				.assertNext(m -> assertThat(m.getHeaders()).containsEntry(HttpHeaders.STATUS_CODE, HttpStatus.OK))
-				.then(() ->
-						((Subscriber<?>) TestUtils.getPropertyValue(ackChannel, "subscribers", List.class).get(0))
-								.onComplete())
-				.verifyComplete();
+				.expectNoEvent(Duration.ofMillis(100))
+				.thenCancel()
+				.verify(Duration.ofSeconds(1));
 	}
 
 	@Test
-	public void testReactiveErrorOneWay() {
+	void testReactiveErrorOneWay() {
 		ClientHttpConnector httpConnector =
 				new HttpHandlerConnector((request, response) -> {
 					response.setStatusCode(HttpStatus.UNAUTHORIZED);
@@ -115,7 +112,7 @@ public void testReactiveErrorOneWay() {
 	}
 
 	@Test
-	public void testReactiveConnectErrorOneWay() {
+	void testReactiveConnectErrorOneWay() {
 		ClientHttpConnector httpConnector =
 				new HttpHandlerConnector((request, response) -> {
 					throw new RuntimeException("Intentional connection error");
@@ -144,7 +141,7 @@ public void testReactiveConnectErrorOneWay() {
 	}
 
 	@Test
-	public void testServiceUnavailableWithoutBody() {
+	void testServiceUnavailableWithoutBody() {
 		ClientHttpConnector httpConnector =
 				new HttpHandlerConnector((request, response) -> {
 					response.setStatusCode(HttpStatus.SERVICE_UNAVAILABLE);
@@ -185,7 +182,7 @@ public void testServiceUnavailableWithoutBody() {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void testFluxReply() {
+	void testFluxReply() {
 		ClientHttpConnector httpConnector = new HttpHandlerConnector((request, response) -> {
 			response.setStatusCode(HttpStatus.OK);
 			response.getHeaders().setContentType(MediaType.TEXT_PLAIN);
@@ -227,7 +224,7 @@ public void testFluxReply() {
 	}
 
 	@Test
-	public void testClientHttpResponseAsReply() {
+	void testClientHttpResponseAsReply() {
 		ClientHttpConnector httpConnector = new HttpHandlerConnector((request, response) -> {
 			response.setStatusCode(HttpStatus.OK);
 			response.getHeaders().setContentType(MediaType.TEXT_PLAIN);
@@ -276,5 +273,4 @@ public void testClientHttpResponseAsReply() {
 				.verifyComplete();
 	}
 
-
 }