From 707d730efd78da1333e5359d72b1ea7181158df3 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Mon, 7 Jun 2021 14:40:32 -0400
Subject: [PATCH] GH-171: Fix WebSocket tests for upstream changes

Related to: https://github.com/spring-cloud/stream-applications/issues/171
---
 .../source/websocket/WebsocketSourceTests.java  |  8 +++-----
 .../websocket/WebsocketSupplierTests.java       | 17 ++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/applications/source/websocket-source/src/test/java/org/springframework/cloud/stream/app/source/websocket/WebsocketSourceTests.java b/applications/source/websocket-source/src/test/java/org/springframework/cloud/stream/app/source/websocket/WebsocketSourceTests.java
index 054eb895..ae913f61 100644
--- a/applications/source/websocket-source/src/test/java/org/springframework/cloud/stream/app/source/websocket/WebsocketSourceTests.java
+++ b/applications/source/websocket-source/src/test/java/org/springframework/cloud/stream/app/source/websocket/WebsocketSourceTests.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 
@@ -46,7 +45,7 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = "websocket.supplier.path=/some_websocket_path")
+		properties = "websocket.supplier.path=some_websocket_path")
 @DirtiesContext
 public class WebsocketSourceTests {
 
@@ -66,11 +65,10 @@ public class WebsocketSourceTests {
 	private SecurityProperties securityProperties;
 
 	@Test
-	@Disabled
 	public void testWebsocketSource() throws IOException {
 		StandardWebSocketClient webSocketClient = new StandardWebSocketClient();
 		ClientWebSocketContainer clientWebSocketContainer =
-				new ClientWebSocketContainer(webSocketClient, "ws://localhost:{port}{path}",
+				new ClientWebSocketContainer(webSocketClient, "ws://localhost:{port}/{path}",
 						this.port,
 						this.properties.getPath());
 
@@ -85,7 +83,7 @@ public class WebsocketSourceTests {
 		session.sendMessage(new TextMessage("foo"));
 		session.close();
 
-		Message<byte[]> sourceMessage = output.receive(10000);
+		Message<byte[]> sourceMessage = output.receive(10000, "websocketSupplier-out-0");
 		final String actual = new String(sourceMessage.getPayload());
 		assertThat(actual).isEqualTo("foo");
 
diff --git a/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java b/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java
index 8f5af0ab..6cc6321d 100644
--- a/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java
+++ b/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java
@@ -16,11 +16,12 @@
 
 package org.springframework.cloud.fn.supplier.websocket;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
@@ -39,8 +40,6 @@ import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = "websocket.supplier.path=some_websocket_path")
 @DirtiesContext
@@ -62,19 +61,17 @@ public class WebsocketSupplierTests {
 
 	@Test
 	public void checkCmdlineArgs() {
-		assertThat(this.properties.getPath()).isEqualTo("/some_websocket_path");
+		assertThat(this.properties.getPath()).isEqualTo("some_websocket_path");
 		assertThat(this.properties.getAllowedOrigins()).isEqualTo("*");
 	}
 
 	@Test
-	@Disabled
 	public void testBasicFlow() throws IOException {
 		final Flux<Message<?>> messageFlux = websocketSupplier.get();
 		final StepVerifier stepVerifier = StepVerifier.create(messageFlux)
-				.assertNext((message) -> {
-							assertThat(message.getPayload())
-									.isEqualTo(messageString);
-						}
+				.assertNext((message) ->
+						assertThat(message.getPayload())
+								.isEqualTo(messageString)
 				)
 				.thenCancel()
 				.verifyLater();
@@ -100,5 +97,7 @@ public class WebsocketSupplierTests {
 
 	@SpringBootApplication
 	static class WebsocketSupplierTestApplication {
+
 	}
+
 }