You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/09/15 11:12:59 UTC
[camel] branch main updated (98a13d5c04f -> 09db8cb4952)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 98a13d5c04f CAMEL-18513: camel-jbang - Bind goal to support steps
new 97569a0890f CAMEL-18506: do add data as bytes on the websocket client
new 09db8cb4952 CAMEL-18506: removed usages of the Async HTTP client from the camel-websocket test code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-websocket/pom.xml | 17 +--
.../websocket/WebsocketClientCamelRouteTest.java | 68 ++---------
.../WebsocketComponentRouteExampleTest.java | 68 ++---------
.../websocket/WebsocketConsumerRouteTest.java | 103 ++--------------
.../WebsocketProducerRouteExampleTest.java | 135 +++------------------
.../WebsocketProducerRouteRestartTest.java | 67 ++--------
.../websocket/WebsocketRouteExampleTest.java | 70 ++---------
.../WebsocketSSLClientAuthRouteExampleTest.java | 94 ++------------
.../WebsocketSSLContextGlobalRouteExampleTest.java | 86 ++-----------
.../WebsocketSSLContextInUriRouteExampleTest.java | 91 ++------------
.../websocket/WebsocketSSLRouteExampleTest.java | 90 ++------------
.../component/websocket/WebsocketStaticTest.java | 85 ++++---------
.../websocket/WebsocketTwoRoutesExampleTest.java | 130 +++-----------------
...SIndividualAndBroadcastEndpointExampleTest.java | 78 ++----------
...ebsocketTwoRoutesToSameEndpointExampleTest.java | 77 ++----------
.../infra/common/http/WebsocketTestClient.java | 2 +-
16 files changed, 173 insertions(+), 1088 deletions(-)
[camel] 01/02: CAMEL-18506: do add data as bytes on the websocket client
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 97569a0890fffc4e8c04c5dafc856c6b8ee589ee
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Sep 15 10:23:23 2022 +0200
CAMEL-18506: do add data as bytes on the websocket client
---
.../org/apache/camel/test/infra/common/http/WebsocketTestClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java
index f8ae2e0e23d..8d6ee59fd63 100644
--- a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java
+++ b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java
@@ -209,7 +209,7 @@ public class WebsocketTestClient {
public CompletionStage<?> onBinary(WebSocket webSocket, ByteBuffer data, boolean last) {
final String message = readString(data);
- received.add(message);
+ received.add(message.getBytes());
LOG.info("[ws] received bytes --> {}", message);
latch.countDown();
[camel] 02/02: CAMEL-18506: removed usages of the Async HTTP client from the camel-websocket test code
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 09db8cb4952b96bed29e3ddb0745cecd6d30150c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Sep 15 10:59:58 2022 +0200
CAMEL-18506: removed usages of the Async HTTP client from the camel-websocket test code
---
components/camel-websocket/pom.xml | 17 +--
.../websocket/WebsocketClientCamelRouteTest.java | 68 ++---------
.../WebsocketComponentRouteExampleTest.java | 68 ++---------
.../websocket/WebsocketConsumerRouteTest.java | 103 ++--------------
.../WebsocketProducerRouteExampleTest.java | 135 +++------------------
.../WebsocketProducerRouteRestartTest.java | 67 ++--------
.../websocket/WebsocketRouteExampleTest.java | 70 ++---------
.../WebsocketSSLClientAuthRouteExampleTest.java | 94 ++------------
.../WebsocketSSLContextGlobalRouteExampleTest.java | 86 ++-----------
.../WebsocketSSLContextInUriRouteExampleTest.java | 91 ++------------
.../websocket/WebsocketSSLRouteExampleTest.java | 90 ++------------
.../component/websocket/WebsocketStaticTest.java | 85 ++++---------
.../websocket/WebsocketTwoRoutesExampleTest.java | 130 +++-----------------
...SIndividualAndBroadcastEndpointExampleTest.java | 78 ++----------
...ebsocketTwoRoutesToSameEndpointExampleTest.java | 77 ++----------
15 files changed, 172 insertions(+), 1087 deletions(-)
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index b57adced4f4..f5c7459247c 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -91,6 +91,16 @@
<artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- test infra -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-infra-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
@@ -101,13 +111,6 @@
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.asynchttpclient</groupId>
- <artifactId>async-http-client</artifactId>
- <!-- 2.0.17 onwards has TSL/SSL problems -->
- <version>2.11.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
index 71c24cea781..03b7711d792 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
@@ -16,34 +16,21 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketClientCamelRouteTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(10);
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -54,61 +41,22 @@ public class WebsocketClientCamelRouteTest extends CamelTestSupport {
@Test
public void testWSHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/test").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
-
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/test", 10);
+ testClient.connect();
getMockEndpoint("mock:client").expectedBodiesReceived("Hello from WS client");
- websocket.sendTextFrame("Hello from WS client");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Hello from WS client");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
- assertEquals(10, received.size());
+ assertEquals(10, testClient.getReceived().size());
for (int i = 0; i < 10; i++) {
- assertEquals(">> Welcome on board!", received.get(i));
+ assertEquals(">> Welcome on board!", testClient.getReceived().get(i));
}
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
index 55423f4f6eb..2921614f366 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
@@ -16,34 +16,20 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketComponentRouteExampleTest extends CamelTestSupport {
-
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(1);
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -54,54 +40,16 @@ public class WebsocketComponentRouteExampleTest extends CamelTestSupport {
@Test
public void testWSHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/echo").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/echo", 1);
+ testClient.connect();
- websocket.sendTextFrame("Beer");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Beer");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(1, received.size());
- assertEquals("BeerBeer", received.get(0));
+ assertEquals(1, testClient.getReceived().size());
+ assertEquals("BeerBeer", testClient.getReceived().get(0));
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
index bdf9c290c35..e38fe7cd69b 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
@@ -19,20 +19,12 @@ package org.apache.camel.component.websocket;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class WebsocketConsumerRouteTest extends CamelTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(WebsocketConsumerRouteTest.class);
-
private int port;
@Override
@@ -44,106 +36,33 @@ public class WebsocketConsumerRouteTest extends CamelTestSupport {
@Test
public void testWSHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
-
- }
-
- @Override
- public void onError(Throwable t) {
- LOG.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/echo", 1);
+ testClient.connect();
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedBodiesReceived("Test");
- websocket.sendTextFrame("Test");
+ testClient.sendTextMessage("Test");
result.assertIsSatisfied();
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Test
public void testWSBytesHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- LOG.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/echo", 1);
+ testClient.connect();
MockEndpoint result = getMockEndpoint("mock:result");
- final byte[] testmessage = "Test".getBytes("utf-8");
- result.expectedBodiesReceived(testmessage);
+ final byte[] testMessage = "Test".getBytes("utf-8");
+ result.expectedBodiesReceived(testMessage);
- websocket.sendBinaryFrame(testmessage);
+ testClient.sendBytesMessage(testMessage);
result.assertIsSatisfied();
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
index 71d5a887242..0dec23283b8 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
@@ -16,38 +16,24 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketProducerRouteExampleTest extends CamelTestSupport {
-
- private static List<Object> received = new ArrayList<>();
- private static CountDownLatch latch;
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Produce("direct:shop")
private ProducerTemplate producer;
@@ -57,128 +43,43 @@ public class WebsocketProducerRouteExampleTest extends CamelTestSupport {
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
- received.clear();
- latch = new CountDownLatch(1);
}
@Test
- public void testWSHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/shop").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ public void testWSHttpCall() throws InterruptedException {
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/shop", 1);
+ testClient.connect();
// Send message to the direct endpoint
producer.sendBodyAndHeader("Beer on stock at Apache Mall", WebsocketConstants.SEND_TO_ALL, "true");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(1, received.size());
- Object r = received.get(0);
+ assertEquals(1, testClient.getReceived().size());
+ Object r = testClient.getReceived().get(0);
assertTrue(r instanceof String);
assertEquals("Beer on stock at Apache Mall", r);
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Test
public void testWSBytesHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/shop").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
-
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
-
- }
-
- @Override
- public void onError(Throwable t) {
-
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + Arrays.toString(payload));
- latch.countDown();
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/shop", 1);
+ testClient.connect();
// Send message to the direct endpoint
- byte[] testmessage = "Beer on stock at Apache Mall".getBytes("utf-8");
- producer.sendBodyAndHeader(testmessage, WebsocketConstants.SEND_TO_ALL, "true");
+ byte[] testMessage = "Beer on stock at Apache Mall".getBytes(StandardCharsets.UTF_8);
+ producer.sendBodyAndHeader(testMessage, WebsocketConstants.SEND_TO_ALL, "true");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(1, received.size());
- Object r = received.get(0);
+ assertEquals(1, testClient.getReceived().size());
+ Object r = testClient.getReceived().get(0);
assertTrue(r instanceof byte[]);
- assertArrayEquals(testmessage, (byte[]) r);
+ assertArrayEquals(testMessage, (byte[]) r);
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
index a044e28fbe8..0b2723761eb 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
@@ -16,25 +16,16 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,11 +34,7 @@ public class WebsocketProducerRouteRestartTest extends CamelTestSupport {
private static final String ROUTE_ID = WebsocketProducerRouteRestartTest.class.getSimpleName();
- private static List<Object> received = new ArrayList<>();
- private static CountDownLatch latch;
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Produce("direct:shop")
private ProducerTemplate producer;
@@ -57,8 +44,6 @@ public class WebsocketProducerRouteRestartTest extends CamelTestSupport {
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
- received.clear();
- latch = new CountDownLatch(1);
}
@Test
@@ -84,58 +69,20 @@ public class WebsocketProducerRouteRestartTest extends CamelTestSupport {
}
private void doTestWSHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/shop").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/shop");
+ testClient.connect();
// Send message to the direct endpoint
producer.sendBodyAndHeader("Beer on stock at Apache Mall", WebsocketConstants.SEND_TO_ALL, "true");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(1, received.size());
- Object r = received.get(0);
+ assertEquals(1, testClient.getReceived().size());
+ Object r = testClient.getReceived().get(0);
assertTrue(r instanceof String);
assertEquals("Beer on stock at Apache Mall", r);
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
index a473ecc7fc7..613a70b89b3 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
@@ -16,34 +16,21 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketRouteExampleTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(1);
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -54,57 +41,16 @@ public class WebsocketRouteExampleTest extends CamelTestSupport {
@Test
public void testWSHttpCall() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
-
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/echo", 1);
+ testClient.connect();
- websocket.sendTextFrame("Beer");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Beer");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(1, received.size());
- assertEquals("BeerBeer", received.get(0));
+ assertEquals(1, testClient.getReceived().size());
+ assertEquals("BeerBeer", testClient.getReceived().get(0));
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
index 8f684ca688f..64aa17b0ca3 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
@@ -18,16 +18,10 @@ package org.apache.camel.component.websocket;
import java.io.IOException;
import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
@@ -35,31 +29,18 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClientConfig;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLClientAuthRouteExampleTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(10);
-
- private Properties originalValues = new Properties();
private String pwd = "changeit";
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -69,13 +50,7 @@ public class WebsocketSSLClientAuthRouteExampleTest extends CamelTestSupport {
super.setUp();
}
- protected AsyncHttpClient createAsyncHttpSSLClient() throws IOException, GeneralSecurityException {
-
- AsyncHttpClient c;
- AsyncHttpClientConfig config;
-
- DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder();
-
+ private SSLContext createSSLContext() throws GeneralSecurityException, IOException {
SSLContextParameters sslContextParameters = new SSLContextParameters();
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
@@ -94,14 +69,7 @@ public class WebsocketSSLClientAuthRouteExampleTest extends CamelTestSupport {
clientAuthClientSSLKeyManagers.setKeyStore(keystoreParameters);
sslContextParameters.setKeyManagers(clientAuthClientSSLKeyManagers);
- SSLContext sslContext = sslContextParameters.createSSLContext(context());
- JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE);
- builder.setSslContext(ssl);
- builder.setDisableHttpsEndpointIdentificationAlgorithm(true);
- config = builder.build();
- c = new DefaultAsyncHttpClient(config);
-
- return c;
+ return sslContextParameters.createSSLContext(context());
}
protected SSLContextParameters defineSSLContextParameters() {
@@ -130,63 +98,23 @@ public class WebsocketSSLClientAuthRouteExampleTest extends CamelTestSupport {
@Test
public void testWSHttpCall() throws Exception {
-
- AsyncHttpClient c = createAsyncHttpSSLClient();
- WebSocket websocket = c.prepareGet("wss://127.0.0.1:" + port + "/test").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ SSLContext sslContext = createSSLContext();
+ WebsocketTestClient testClient = new WebsocketTestClient("wss://localhost:" + port + "/test", 10, sslContext);
+ testClient.connect();
getMockEndpoint("mock:client").expectedBodiesReceived("Hello from WS client");
- websocket.sendTextFrame("Hello from WS client");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Hello from WS client");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
- assertEquals(10, received.size());
+ assertEquals(10, testClient.getReceived().size());
for (int i = 0; i < 10; i++) {
- assertEquals(">> Welcome on board!", received.get(i));
+ assertEquals(">> Welcome on board!", testClient.getReceived().get(i));
}
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
index 5e7154576c5..e6963378074 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
@@ -18,15 +18,10 @@ package org.apache.camel.component.websocket;
import java.io.IOException;
import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.CamelContext;
import org.apache.camel.SSLContextParametersAware;
import org.apache.camel.builder.RouteBuilder;
@@ -36,32 +31,20 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClientConfig;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLContextGlobalRouteExampleTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(10);
-
private String pwd = "changeit";
private String uri;
private String server = "127.0.0.1";
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -101,13 +84,7 @@ public class WebsocketSSLContextGlobalRouteExampleTest extends CamelTestSupport
return context;
}
- protected AsyncHttpClient createAsyncHttpSSLClient() throws IOException, GeneralSecurityException {
-
- AsyncHttpClient c;
- AsyncHttpClientConfig config;
-
- DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder();
-
+ private SSLContext createSSLContext() throws GeneralSecurityException, IOException {
SSLContextParameters sslContextParameters = new SSLContextParameters();
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
@@ -119,70 +96,29 @@ public class WebsocketSSLContextGlobalRouteExampleTest extends CamelTestSupport
sslContextParameters.setTrustManagers(clientSSLTrustManagers);
SSLContext sslContext = sslContextParameters.createSSLContext(context());
- JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE);
- builder.setSslContext(ssl);
- builder.setDisableHttpsEndpointIdentificationAlgorithm(true);
- config = builder.build();
- c = new DefaultAsyncHttpClient(config);
-
- return c;
+ return sslContext;
}
@Test
public void testWSHttpCall() throws Exception {
- AsyncHttpClient c = createAsyncHttpSSLClient();
- WebSocket websocket = c.prepareGet("wss://127.0.0.1:" + port + "/test").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ SSLContext sslContext = createSSLContext();
+ WebsocketTestClient testClient = new WebsocketTestClient("wss://localhost:" + port + "/test", 10, sslContext);
+ testClient.connect();
getMockEndpoint("mock:client").expectedBodiesReceived("Hello from WS client");
- websocket.sendTextFrame("Hello from WS client");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Hello from WS client");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
- assertEquals(10, received.size());
+ assertEquals(10, testClient.getReceived().size());
for (int i = 0; i < 10; i++) {
- assertEquals(">> Welcome on board!", received.get(i));
+ assertEquals(">> Welcome on board!", testClient.getReceived().get(i));
}
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
index b3182990676..f8583ba0140 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
@@ -18,15 +18,10 @@ package org.apache.camel.component.websocket;
import java.io.IOException;
import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
@@ -36,32 +31,20 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClientConfig;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(10);
-
private String pwd = "changeit";
private String uri;
private String server = "127.0.0.1";
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -88,25 +71,19 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport {
// NOTE: Needed since the client uses a loose trust configuration when no ssl context
// is provided. We turn on WANT client-auth to prefer using authentication
- SSLContextServerParameters scsp = new SSLContextServerParameters();
+ SSLContextServerParameters sslContextServerParams = new SSLContextServerParameters();
SSLContextParameters sslContextParameters = new SSLContextParameters();
sslContextParameters.setKeyManagers(kmp);
sslContextParameters.setTrustManagers(tmp);
- sslContextParameters.setServerParameters(scsp);
+ sslContextParameters.setServerParameters(sslContextServerParams);
Registry registry = new SimpleRegistry();
registry.bind("sslContextParameters", sslContextParameters);
return registry;
}
- protected AsyncHttpClient createAsyncHttpSSLClient() throws IOException, GeneralSecurityException {
-
- AsyncHttpClient c;
- AsyncHttpClientConfig config;
-
- DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder();
-
+ private SSLContext createSSLContext() throws GeneralSecurityException, IOException {
SSLContextParameters sslContextParameters = new SSLContextParameters();
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
@@ -118,70 +95,28 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport {
sslContextParameters.setTrustManagers(clientSSLTrustManagers);
SSLContext sslContext = sslContextParameters.createSSLContext(context());
- JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE);
- builder.setSslContext(ssl);
- builder.setDisableHttpsEndpointIdentificationAlgorithm(true);
- config = builder.build();
- c = new DefaultAsyncHttpClient(config);
-
- return c;
+ return sslContext;
}
@Test
public void testWSHttpCall() throws Exception {
-
- AsyncHttpClient c = createAsyncHttpSSLClient();
- WebSocket websocket = c.prepareGet("wss://127.0.0.1:" + port + "/test").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ SSLContext sslContext = createSSLContext();
+ WebsocketTestClient testClient = new WebsocketTestClient("wss://localhost:" + port + "/test", 10, sslContext);
+ testClient.connect();
getMockEndpoint("mock:client").expectedBodiesReceived("Hello from WS client");
- websocket.sendTextFrame("Hello from WS client");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Hello from WS client");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
- assertEquals(10, received.size());
+ assertEquals(10, testClient.getReceived().size());
for (int i = 0; i < 10; i++) {
- assertEquals(">> Welcome on board!", received.get(i));
+ assertEquals(">> Welcome on board!", testClient.getReceived().get(i));
}
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
index cce8b472ccd..898c4c327d1 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
@@ -18,16 +18,10 @@ package org.apache.camel.component.websocket;
import java.io.IOException;
import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
@@ -35,14 +29,8 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClientConfig;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -53,10 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(10);
-
- private Properties originalValues = new Properties();
private String pwd = "changeit";
private int port;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -69,13 +53,7 @@ public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
super.setUp();
}
- protected AsyncHttpClient createAsyncHttpSSLClient() throws IOException, GeneralSecurityException {
-
- AsyncHttpClient c;
- AsyncHttpClientConfig config;
-
- DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder();
-
+ private SSLContext createSSLContext() throws GeneralSecurityException, IOException {
SSLContextParameters sslContextParameters = new SSLContextParameters();
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
@@ -87,13 +65,7 @@ public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
sslContextParameters.setTrustManagers(clientSSLTrustManagers);
SSLContext sslContext = sslContextParameters.createSSLContext(context());
- JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE);
- builder.setSslContext(ssl);
- builder.setDisableHttpsEndpointIdentificationAlgorithm(true);
- config = builder.build();
- c = new DefaultAsyncHttpClient(config);
-
- return c;
+ return sslContext;
}
protected SSLContextParameters defineSSLContextParameters() {
@@ -124,63 +96,23 @@ public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
@Test
public void testWSHttpCall() throws Exception {
-
- AsyncHttpClient c = createAsyncHttpSSLClient();
- WebSocket websocket = c.prepareGet("wss://127.0.0.1:" + port + "/test").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
-
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ SSLContext sslContext = createSSLContext();
+ WebsocketTestClient testClient = new WebsocketTestClient("wss://localhost:" + port + "/test", 10, sslContext);
+ testClient.connect();
getMockEndpoint("mock:client").expectedBodiesReceived("Hello from WS client");
- websocket.sendTextFrame("Hello from WS client");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Hello from WS client");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
- assertEquals(10, received.size());
+ assertEquals(10, testClient.getReceived().size());
for (int i = 0; i < 10; i++) {
- assertEquals(">> Welcome on board!", received.get(i));
+ assertEquals(">> Welcome on board!", testClient.getReceived().get(i));
}
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java
index baecd8db1da..cd66b84a5d9 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java
@@ -16,20 +16,16 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.Response;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -40,12 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketStaticTest extends CamelTestSupport {
-
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch = new CountDownLatch(1);
+ private static final Logger LOG = LoggerFactory.getLogger(WebsocketStaticTest.class);
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -56,65 +49,33 @@ public class WebsocketStaticTest extends CamelTestSupport {
@Test
public void testStaticResource() throws Exception {
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://127.0.0.1:" + port + "/echo", 1);
+ testClient.connect();
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
+ testClient.sendTextMessage("Beer");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- @Override
- public void onPingFrame(byte[] payload) {
+ assertEquals(1, testClient.getReceived().size());
+ assertEquals("BeerBeer", testClient.getReceived().get(0));
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
+ // now call static html
+ HttpClient client = HttpClient.newBuilder().build();
- websocket.sendTextFrame("Beer");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create("http://127.0.0.1:" + port + "/hello.html"))
+ .GET()
+ .build();
- assertEquals(1, received.size());
- assertEquals("BeerBeer", received.get(0));
+ final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
- // now call static html
- Response response = c.prepareGet("http://127.0.0.1:" + port + "/hello.html").execute().get(5, TimeUnit.SECONDS);
assertNotNull(response);
- assertEquals(200, response.getStatusCode());
- String body = response.getResponseBody();
+ assertEquals(200, response.statusCode());
+ String body = response.body();
assertNotNull(body);
- log.info(body);
+ LOG.info(body);
assertTrue(body.contains("Hello World"));
- c.close();
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
index 7a8796b3c62..1aa4e784d81 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
@@ -16,34 +16,21 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketTwoRoutesExampleTest extends CamelTestSupport {
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch;
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -55,115 +42,28 @@ public class WebsocketTwoRoutesExampleTest extends CamelTestSupport {
@Test
public void testWSHttpCallEcho() throws Exception {
- // We call the route WebSocket BAR
- received.clear();
- latch = new CountDownLatch(1);
-
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/bar").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket webSocket, int i, String s) {
-
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://localhost:" + port + "/bar", 1);
+ testClient.connect();
- @Override
- public void onPongFrame(byte[] payload) {
+ testClient.sendTextMessage("Beer");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- }
- }).build())
- .get();
+ assertEquals(1, testClient.getReceived().size());
+ assertEquals("The bar has Beer", testClient.getReceived().get(0));
- websocket.sendTextFrame("Beer");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
-
- assertEquals(1, received.size());
- assertEquals("The bar has Beer", received.get(0));
-
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
// We call the route WebSocket PUB
- received.clear();
- latch = new CountDownLatch(1);
-
- c = new DefaultAsyncHttpClient();
-
- websocket = c.prepareGet("ws://localhost:" + port + "/pub").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
- }
- }).build())
- .get();
+ WebsocketTestClient testClient2 = new WebsocketTestClient("ws://127.0.0.1:" + port + "/pub", 1);
+ testClient2.connect();
- websocket.sendTextFrame("wine");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient2.sendTextMessage("wine");
+ assertTrue(testClient2.await(10, TimeUnit.SECONDS));
- assertEquals(1, received.size());
- assertEquals("The pub has wine", received.get(0));
+ assertEquals(1, testClient.getReceived().size());
+ assertEquals("The pub has wine", testClient2.getReceived().get(0));
- websocket.sendCloseFrame();
- c.close();
+ testClient2.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
index 619d69f38b6..9f1c364e628 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
@@ -16,34 +16,20 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest extends CamelTestSupport {
-
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch;
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -54,65 +40,19 @@ public class WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest exte
@Test
public void testWSHttpCallEcho() throws Exception {
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://127.0.0.1:" + port + "/bar", 2);
+ testClient.connect();
- // We call the route WebSocket BAR
- received.clear();
- latch = new CountDownLatch(2);
-
- AsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/bar").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
-
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
-
- websocket.sendTextFrame("Beer");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Beer");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(2, received.size());
+ assertEquals(2, testClient.getReceived().size());
//Cannot guarantee the order in which messages are received
- assertTrue(received.contains("The bar has Beer"));
- assertTrue(received.contains("Broadcasting to Bar"));
+ assertTrue(testClient.getReceived().contains("The bar has Beer"));
+ assertTrue(testClient.getReceived().contains("Broadcasting to Bar"));
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
index 8574adbac01..1c683511054 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
@@ -16,33 +16,20 @@
*/
package org.apache.camel.component.websocket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.asynchttpclient.DefaultAsyncHttpClient;
-import org.asynchttpclient.ws.WebSocket;
-import org.asynchttpclient.ws.WebSocketListener;
-import org.asynchttpclient.ws.WebSocketUpgradeHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketTwoRoutesToSameEndpointExampleTest extends CamelTestSupport {
-
- private static List<String> received = new ArrayList<>();
- private static CountDownLatch latch;
-
private int port;
- private Logger log = LoggerFactory.getLogger(getClass());
@Override
@BeforeEach
@@ -53,65 +40,19 @@ public class WebsocketTwoRoutesToSameEndpointExampleTest extends CamelTestSuppor
@Test
public void testWSHttpCallEcho() throws Exception {
+ WebsocketTestClient testClient = new WebsocketTestClient("ws://127.0.0.1:" + port + "/bar", 2);
+ testClient.connect();
- // We call the route WebSocket BAR
- received.clear();
- latch = new CountDownLatch(2);
-
- DefaultAsyncHttpClient c = new DefaultAsyncHttpClient();
-
- WebSocket websocket = c.prepareGet("ws://localhost:" + port + "/bar").execute(
- new WebSocketUpgradeHandler.Builder()
- .addWebSocketListener(new WebSocketListener() {
-
- @Override
- public void onOpen(WebSocket websocket) {
- }
-
- @Override
- public void onClose(WebSocket websocket, int code, String reason) {
- }
-
- @Override
- public void onError(Throwable t) {
- log.warn("Unhandled exception: {}", t.getMessage(), t);
- }
-
- @Override
- public void onBinaryFrame(byte[] payload, boolean finalFragment, int rsv) {
-
- }
-
- @Override
- public void onTextFrame(String payload, boolean finalFragment, int rsv) {
- received.add(payload);
- log.info("received --> " + payload);
- latch.countDown();
- }
-
- @Override
- public void onPingFrame(byte[] payload) {
-
- }
-
- @Override
- public void onPongFrame(byte[] payload) {
-
- }
- }).build())
- .get();
-
- websocket.sendTextFrame("Beer");
- assertTrue(latch.await(10, TimeUnit.SECONDS));
+ testClient.sendTextMessage("Beer");
+ assertTrue(testClient.await(10, TimeUnit.SECONDS));
- assertEquals(2, received.size());
+ assertEquals(2, testClient.getReceived().size());
//Cannot guarantee the order in which messages are received
- assertTrue(received.contains("The bar has Beer"));
- assertTrue(received.contains("Broadcasting to Bar"));
+ assertTrue(testClient.getReceived().contains("The bar has Beer"));
+ assertTrue(testClient.getReceived().contains("Broadcasting to Bar"));
- websocket.sendCloseFrame();
- c.close();
+ testClient.close();
}
@Override