This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b2dbfc174954 CAMEL-23214: Migrate AvailablePortFinder in camel-vertx
tests (#22119)
b2dbfc174954 is described below
commit b2dbfc17495452e03f7a67c49cdf2594fc07c6b7
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Mar 20 09:12:43 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder in camel-vertx tests (#22119)
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../vertx/http/VertxHttpBridgeEndpointTest.java | 12 ++--
.../vertx/http/VertxHttpMultiRouteTest.java | 4 +-
.../vertx/http/VertxHttpProxyServerTest.java | 10 +--
.../component/vertx/http/VertxHttpTestSupport.java | 10 +--
.../vertx/websocket/MainVertxWebsocketSSLTest.java | 4 +-
.../vertx/websocket/VertxWebSocketEventTest.java | 2 +-
.../VertxWebSocketSlowClientConsumerTest.java | 6 +-
.../websocket/VertxWebSocketSlowConsumerTest.java | 4 +-
.../vertx/websocket/VertxWebSocketTestSupport.java | 11 ++--
...WebsocketConsumerAsClientBinaryMessageTest.java | 8 +--
...xWebsocketConsumerAsClientMaxReconnectTest.java | 8 +--
...ertxWebsocketConsumerAsClientReconnectTest.java | 8 +--
...txWebsocketConsumerAsClientTextMessageTest.java | 8 +--
.../VertxWebsocketEndpointConfigurationTest.java | 8 ++-
.../websocket/VertxWebsocketMultiConsumerTest.java | 8 +--
.../vertx/websocket/VertxWebsocketOriginTest.java | 16 +++--
.../vertx/websocket/VertxWebsocketRouterTest.java | 8 +--
.../vertx/websocket/VertxWebsocketSSLTest.java | 17 ++---
.../vertx/websocket/VertxWebsocketTest.java | 76 +++++++++++-----------
.../component/vertx/VertxBaseTestSupport.java | 12 ++--
20 files changed, 125 insertions(+), 115 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
index 7503bd495697..123fbafb41d4 100644
---
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
+++
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
@@ -26,12 +26,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
class VertxHttpBridgeEndpointTest extends VertxHttpTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
@Test
void bridgeEndpointWithQueryStringDoesNotDuplicateHeaders() throws
Exception {
@@ -89,15 +91,15 @@ class VertxHttpBridgeEndpointTest extends
VertxHttpTestSupport {
@Override
public void configure() throws Exception {
from(getTestServerUri() + "/upstream")
-
.toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true";, PORT);
+
.toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true";,
PORT.getPort());
from(getTestServerUri() +
"/upstream/prefix?matchOnUriPrefix=true")
-
.toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true";, PORT);
+
.toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true";,
PORT.getPort());
- fromF("undertow:http://localhost:%d/downstream";, PORT)
+ fromF("undertow:http://localhost:%d/downstream";,
PORT.getPort())
.to("mock:result");
- fromF("undertow:http://localhost:%d/downstream/test";, PORT)
+ fromF("undertow:http://localhost:%d/downstream/test";,
PORT.getPort())
.to("mock:result");
}
};
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMultiRouteTest.java
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMultiRouteTest.java
index 4b1ef209c4ad..e0d433d895dc 100644
---
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMultiRouteTest.java
+++
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMultiRouteTest.java
@@ -46,7 +46,7 @@ public class VertxHttpMultiRouteTest extends
VertxHttpTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- restConfiguration().port(port);
+ restConfiguration().port(port.getPort());
rest()
.post("/greeting")
@@ -57,7 +57,7 @@ public class VertxHttpMultiRouteTest extends
VertxHttpTestSupport {
from("direct:greet")
.removeHeaders("CamelHttp*")
-
.toF("vertx-http:http://localhost:%d/hello?httpMethod=POST";, port)
+
.toF("vertx-http:http://localhost:%d/hello?httpMethod=POST";, port.getPort())
.to("mock:result");
from("direct:hello")
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
index 2583178994f1..09c861a449d1 100644
---
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
+++
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
@@ -21,17 +21,19 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class VertxHttpProxyServerTest extends VertxHttpTestSupport {
- private final int port2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
@Test
public void testProxyConfiguration() {
String result = template.requestBody(getProducerUri() +
"?proxyHost=localhost&proxyPort="
- + port2 + "&proxyUsername=foo"
+ + port2.getPort() +
"&proxyUsername=foo"
+
"&proxyPassword=bar&proxyType=HTTP",
null, String.class);
assertEquals("Hello Proxied World", result);
@@ -41,7 +43,7 @@ public class VertxHttpProxyServerTest extends
VertxHttpTestSupport {
public void testProxyComponent() {
VertxHttpComponent comp = context.getComponent("vertx-http",
VertxHttpComponent.class);
comp.setProxyHost("localhost");
- comp.setProxyPort(port2);
+ comp.setProxyPort(port2.getPort());
comp.setProxyUsername("foo");
comp.setProxyPassword("bar");
comp.setProxyType(ProxyType.HTTP);
@@ -64,7 +66,7 @@ public class VertxHttpProxyServerTest extends
VertxHttpTestSupport {
from(getTestServerUri())
.setBody(constant("Hello Proxied World"));
- fromF("undertow:http://localhost:%d";, port2)
+ fromF("undertow:http://localhost:%d";, port2.getPort())
.to(getTestServerUri());
}
};
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
index 96ca3b78525c..3407fcdbc358 100644
---
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
+++
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
@@ -26,13 +26,15 @@ import io.vertx.core.impl.VertxInternal;
import io.vertx.core.impl.btc.BlockedThreadEvent;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class VertxHttpTestSupport extends CamelTestSupport {
- protected final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
protected String getTestServerUrl() {
- return String.format("http://localhost:%d";, port);
+ return String.format("http://localhost:%d";, port.getPort());
}
protected String getTestServerUri() {
@@ -40,11 +42,11 @@ public class VertxHttpTestSupport extends CamelTestSupport {
}
protected String getProducerUri() {
- return String.format("vertx-http:http://localhost:%d";, port);
+ return String.format("vertx-http:http://localhost:%d";, port.getPort());
}
protected int getPort() {
- return port;
+ return port.getPort();
}
protected Vertx
createVertxWithThreadBlockedHandler(Handler<BlockedThreadEvent> handler) {
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/MainVertxWebsocketSSLTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/MainVertxWebsocketSSLTest.java
index 45f235cfe758..5b17eec5ea27 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/MainVertxWebsocketSSLTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/MainVertxWebsocketSSLTest.java
@@ -40,9 +40,9 @@ public class MainVertxWebsocketSSLTest extends
VertxWebSocketTestSupport {
public void configure() {
from("direct:start")
- .toF("vertx-websocket:localhost:%d/echo?", port);
+ .toF("vertx-websocket:localhost:%d/echo?",
port.getPort());
- fromF("vertx-websocket:localhost:%d/echo?", port)
+ fromF("vertx-websocket:localhost:%d/echo?", port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
index e980c651b6d3..a998d451e0bd 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
@@ -80,7 +80,7 @@ public class VertxWebSocketEventTest extends
VertxWebSocketTestSupport {
.endChoice();
fromF("vertx-websocket:localhost:%d/test?fireWebSocketConnectionEvents=true&serverOptions=#serverOptions&bridgeErrorHandler=true",
- port)
+ port.getPort())
.choice()
.when(simple("${header.CamelVertxWebsocket.event} ==
'OPEN'"))
.process(exchange -> {
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowClientConsumerTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowClientConsumerTest.java
index fa6997a6ddf3..270495f2e5f9 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowClientConsumerTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowClientConsumerTest.java
@@ -56,10 +56,10 @@ public class VertxWebSocketSlowClientConsumerTest extends
VertxWebSocketTestSupp
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- fromF("vertx-websocket:localhost:%d/echo/slow", port)
-
.toF("vertx-websocket:localhost:%d/echo/slow?sendToAll=true", port);
+ fromF("vertx-websocket:localhost:%d/echo/slow", port.getPort())
+
.toF("vertx-websocket:localhost:%d/echo/slow?sendToAll=true", port.getPort());
-
fromF("vertx-websocket:localhost:%d/echo/slow?consumeAsClient=true", port)
+
fromF("vertx-websocket:localhost:%d/echo/slow?consumeAsClient=true",
port.getPort())
.delay(600).syncDelayed()
.to("mock:clientConsumerResult");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowConsumerTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowConsumerTest.java
index de982c6d61bc..86109b1fa321 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowConsumerTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketSlowConsumerTest.java
@@ -57,9 +57,9 @@ public class VertxWebSocketSlowConsumerTest extends
VertxWebSocketTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .toF("vertx-websocket:localhost:%d/slow", port);
+ .toF("vertx-websocket:localhost:%d/slow",
port.getPort());
- fromF("vertx-websocket:localhost:%d/slow", port)
+ fromF("vertx-websocket:localhost:%d/slow", port.getPort())
.delay(600).syncDelayed()
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
index 9d18c6a59393..5778d3acaa2e 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
@@ -35,11 +35,14 @@ import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class VertxWebSocketTestSupport extends CamelTestSupport {
- protected final int port = AvailablePortFinder.getNextAvailable();
- protected final int port2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
/**
* Returns the randomized port used for the Vert.x server if no port was
provided to the consumer.
@@ -49,8 +52,8 @@ public class VertxWebSocketTestSupport extends
CamelTestSupport {
Map<VertxWebsocketHostKey, VertxWebsocketHost> registry =
component.getVertxHostRegistry();
return registry.values()
.stream()
- .filter(wsHost -> wsHost.getPort() != port)
- .filter(wsHost -> wsHost.getPort() != port2)
+ .filter(wsHost -> wsHost.getPort() != port.getPort())
+ .filter(wsHost -> wsHost.getPort() != port2.getPort())
.findFirst()
.get()
.getPort();
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientBinaryMessageTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientBinaryMessageTest.java
index 8f60b912f25e..ada714f894c7 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientBinaryMessageTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientBinaryMessageTest.java
@@ -30,7 +30,7 @@ public class VertxWebsocketConsumerAsClientBinaryMessageTest
extends VertxWebSoc
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(5);
- String uri = String.format("vertx-websocket:localhost:%d/echo", port);
+ String uri = String.format("vertx-websocket:localhost:%d/echo",
port.getPort());
for (int i = 1; i <= 5; i++) {
template.sendBody(uri, "Hello
World".getBytes(StandardCharsets.UTF_8));
}
@@ -43,11 +43,11 @@ public class
VertxWebsocketConsumerAsClientBinaryMessageTest extends VertxWebSoc
return new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/echo", port)
+ fromF("vertx-websocket:localhost:%d/echo", port.getPort())
.log("Server consumer received message: ${body}")
-
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port);
+
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port.getPort());
-
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true", port)
+
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true", port.getPort())
.log("Client consumer received message: ${body}")
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientMaxReconnectTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientMaxReconnectTest.java
index 789dacbdf7cf..1d5a173eb7d2 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientMaxReconnectTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientMaxReconnectTest.java
@@ -32,7 +32,7 @@ public class VertxWebsocketConsumerAsClientMaxReconnectTest
extends VertxWebSock
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedBodiesReceived("Hello World");
- String uri = String.format("vertx-websocket:localhost:%d/echo", port);
+ String uri = String.format("vertx-websocket:localhost:%d/echo",
port.getPort());
template.sendBody(uri, "Hello World");
mockEndpoint.assertIsSatisfied();
@@ -69,12 +69,12 @@ public class VertxWebsocketConsumerAsClientMaxReconnectTest
extends VertxWebSock
return new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/echo",
port).routeId("server")
+ fromF("vertx-websocket:localhost:%d/echo",
port.getPort()).routeId("server")
.log("Server consumer: Received message: ${body}")
-
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port);
+
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port.getPort());
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true&reconnectInterval=10&maxReconnectAttempts=1",
- port)
+ port.getPort())
.log("Client consumer 1: Received message: ${body}")
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientReconnectTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientReconnectTest.java
index e452f85e1a90..1380be718dc7 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientReconnectTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientReconnectTest.java
@@ -32,7 +32,7 @@ public class VertxWebsocketConsumerAsClientReconnectTest
extends VertxWebSocketT
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedBodiesReceived("Hello World");
- String uri = String.format("vertx-websocket:localhost:%d/echo", port);
+ String uri = String.format("vertx-websocket:localhost:%d/echo",
port.getPort());
template.sendBody(uri, "Hello World");
mockEndpoint.assertIsSatisfied();
@@ -69,11 +69,11 @@ public class VertxWebsocketConsumerAsClientReconnectTest
extends VertxWebSocketT
return new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/echo",
port).routeId("server")
+ fromF("vertx-websocket:localhost:%d/echo",
port.getPort()).routeId("server")
.log("Server consumer: Received message: ${body}")
-
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port);
+
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port.getPort());
-
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true&reconnectInterval=10",
port)
+
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true&reconnectInterval=10",
port.getPort())
.log("Client consumer 1: Received message: ${body}")
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientTextMessageTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientTextMessageTest.java
index 4ecefadeeb1c..23c342ff9858 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientTextMessageTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConsumerAsClientTextMessageTest.java
@@ -28,7 +28,7 @@ public class VertxWebsocketConsumerAsClientTextMessageTest
extends VertxWebSocke
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(5);
- String uri = String.format("vertx-websocket:localhost:%d/echo", port);
+ String uri = String.format("vertx-websocket:localhost:%d/echo",
port.getPort());
for (int i = 1; i <= 5; i++) {
template.sendBody(uri, "Hello World " + i);
}
@@ -41,11 +41,11 @@ public class VertxWebsocketConsumerAsClientTextMessageTest
extends VertxWebSocke
return new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/echo", port)
+ fromF("vertx-websocket:localhost:%d/echo", port.getPort())
.log("Server consumer received message: ${body}")
-
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port);
+
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true", port.getPort());
-
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true", port)
+
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true", port.getPort())
.log("Client consumer received message: ${body}")
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
index cd467566de17..6b86db813fe7 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static
org.apache.camel.component.vertx.websocket.VertxWebsocketConstants.ORIGIN_HTTP_HEADER_NAME;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,7 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class VertxWebsocketEndpointConfigurationTest extends
VertxWebSocketTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
@BindToRegistry("clientOptions")
HttpClientOptions clientOptions = new HttpClientOptions();
@@ -49,7 +51,7 @@ public class VertxWebsocketEndpointConfigurationTest extends
VertxWebSocketTestS
@Test
public void testHttpClientOptions() {
VertxWebsocketEndpoint endpoint = context
- .getEndpoint("vertx-websocket:localhost:" + PORT +
"/options/client?clientOptions=#clientOptions",
+ .getEndpoint("vertx-websocket:localhost:" + PORT.getPort() +
"/options/client?clientOptions=#clientOptions",
VertxWebsocketEndpoint.class);
assertSame(clientOptions,
endpoint.getConfiguration().getClientOptions());
@@ -58,7 +60,7 @@ public class VertxWebsocketEndpointConfigurationTest extends
VertxWebSocketTestS
@Test
public void testHttpServerOptions() {
VertxWebsocketEndpoint endpoint = context
- .getEndpoint("vertx-websocket:localhost:" + PORT +
"/options/server?serverOptions=#serverOptions",
+ .getEndpoint("vertx-websocket:localhost:" + PORT.getPort() +
"/options/server?serverOptions=#serverOptions",
VertxWebsocketEndpoint.class);
assertSame(serverOptions,
endpoint.getConfiguration().getServerOptions());
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketMultiConsumerTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketMultiConsumerTest.java
index 2c228a03171d..bcca860f275d 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketMultiConsumerTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketMultiConsumerTest.java
@@ -52,19 +52,19 @@ public class VertxWebsocketMultiConsumerTest extends
VertxWebSocketTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/test/a", port)
+ fromF("vertx-websocket:localhost:%d/test/a", port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
- fromF("vertx-websocket:localhost:%d/test/b", port)
+ fromF("vertx-websocket:localhost:%d/test/b", port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
- fromF("vertx-websocket:localhost:%d/test/c", port)
+ fromF("vertx-websocket:localhost:%d/test/c", port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
- fromF("vertx-websocket:localhost:%d/test", port2)
+ fromF("vertx-websocket:localhost:%d/test", port2.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result2");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
index ef29adbb4065..0480a7ab3dd2 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -32,7 +33,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class VertxWebsocketOriginTest extends VertxWebSocketTestSupport {
- private static final int PORT2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT2 = AvailablePortFinder.find();
@Test
public void testValidOrigin() throws InterruptedException {
@@ -45,7 +47,7 @@ public class VertxWebsocketOriginTest extends
VertxWebSocketTestSupport {
@Test
public void testInvalidOrigin() {
CamelExecutionException e =
assertThrows(CamelExecutionException.class, () -> {
- template.sendBody("vertx-websocket:localhost:" + PORT2 + "/test",
"world");
+ template.sendBody("vertx-websocket:localhost:" + PORT2.getPort() +
"/test", "world");
});
UpgradeRejectedException upgradeRejectedException = unwrapException(e);
@@ -55,10 +57,10 @@ public class VertxWebsocketOriginTest extends
VertxWebSocketTestSupport {
@Test
public void testCustomOrigin() throws InterruptedException {
- String originUrl = "http://foohost:"; + PORT2;
+ String originUrl = "http://foohost:"; + PORT2.getPort();
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedBodiesReceived("Hello world");
- template.sendBody("vertx-websocket:localhost:" + PORT2 +
"/test?originHeaderUrl=" + originUrl, "world");
+ template.sendBody("vertx-websocket:localhost:" + PORT2.getPort() +
"/test?originHeaderUrl=" + originUrl, "world");
mockEndpoint.assertIsSatisfied();
}
@@ -66,7 +68,7 @@ public class VertxWebsocketOriginTest extends
VertxWebSocketTestSupport {
public void testOriginDisabled() throws InterruptedException {
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedBodiesReceived("Hello world");
- template.sendBody("vertx-websocket:localhost:" + PORT2 +
"/test?allowOriginHeader=false", "world");
+ template.sendBody("vertx-websocket:localhost:" + PORT2.getPort() +
"/test?allowOriginHeader=false", "world");
mockEndpoint.assertIsSatisfied();
}
@@ -86,11 +88,11 @@ public class VertxWebsocketOriginTest extends
VertxWebSocketTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
-
fromF("vertx-websocket:localhost:%d/test?allowedOriginPattern=.*localhost.*",
port)
+
fromF("vertx-websocket:localhost:%d/test?allowedOriginPattern=.*localhost.*",
port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
-
fromF("vertx-websocket:localhost:%d/test?allowedOriginPattern=.*foohost.*",
PORT2)
+
fromF("vertx-websocket:localhost:%d/test?allowedOriginPattern=.*foohost.*",
PORT2.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketRouterTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketRouterTest.java
index b6c04ebadb03..2f7c7d4aac82 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketRouterTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketRouterTest.java
@@ -40,7 +40,7 @@ public class VertxWebsocketRouterTest extends
VertxWebSocketTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
fromF("vertx-websocket:localhost:%d/test?router=#customRouter", port)
+
fromF("vertx-websocket:localhost:%d/test?router=#customRouter", port.getPort())
.to("mock:result");
}
});
@@ -81,7 +81,7 @@ public class VertxWebsocketRouterTest extends
VertxWebSocketTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/test", port)
+ fromF("vertx-websocket:localhost:%d/test", port.getPort())
.to("mock:result");
}
});
@@ -118,7 +118,7 @@ public class VertxWebsocketRouterTest extends
VertxWebSocketTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
fromF("vertx-websocket:localhost:%d/test?router=#customRouter", port)
+
fromF("vertx-websocket:localhost:%d/test?router=#customRouter", port.getPort())
.to("mock:result");
}
});
@@ -158,7 +158,7 @@ public class VertxWebsocketRouterTest extends
VertxWebSocketTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/test", port)
+ fromF("vertx-websocket:localhost:%d/test", port.getPort())
.to("mock:result");
}
});
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketSSLTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketSSLTest.java
index 96715f34e1fd..75fd3b1111ea 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketSSLTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketSSLTest.java
@@ -77,9 +77,9 @@ public class VertxWebsocketSSLTest extends
VertxWebSocketTestSupport {
@Override
public void configure() {
from("direct:start")
-
.toF("vertx-websocket:localhost:%d/echo?sslContextParameters=#clientSSLParameters",
port);
+
.toF("vertx-websocket:localhost:%d/echo?sslContextParameters=#clientSSLParameters",
port.getPort());
-
fromF("vertx-websocket:localhost:%d/echo?sslContextParameters=#serverSSLParameters",
port)
+
fromF("vertx-websocket:localhost:%d/echo?sslContextParameters=#serverSSLParameters",
port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
}
@@ -109,9 +109,9 @@ public class VertxWebsocketSSLTest extends
VertxWebSocketTestSupport {
@Override
public void configure() {
from("direct:start")
-
.toF("vertx-websocket:localhost:%d/echo?sslContextParameters=#clientSSLParameters",
port);
+
.toF("vertx-websocket:localhost:%d/echo?sslContextParameters=#clientSSLParameters",
port.getPort());
- fromF("vertx-websocket:localhost:%d/echo", port)
+ fromF("vertx-websocket:localhost:%d/echo", port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
}
@@ -143,7 +143,7 @@ public class VertxWebsocketSSLTest extends
VertxWebSocketTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
fromF("vertx-websocket:localhost:%d/test?sslContextParameters=#serverSSLParameters",
port)
+
fromF("vertx-websocket:localhost:%d/test?sslContextParameters=#serverSSLParameters",
port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
}
@@ -177,12 +177,13 @@ public class VertxWebsocketSSLTest extends
VertxWebSocketTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
fromF("vertx-websocket:localhost:%d/echo?sslContextParameters=#serverSSLParameters",
port)
+
fromF("vertx-websocket:localhost:%d/echo?sslContextParameters=#serverSSLParameters",
port.getPort())
.log("Server consumer received message: ${body}")
.toF("vertx-websocket:localhost:%d/echo?sendToAll=true&sslContextParameters=#clientSSLParameters",
- port);
+ port.getPort());
-
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true&sslContextParameters=#clientSSLParameters",
port)
+
fromF("vertx-websocket:localhost:%d/echo?consumeAsClient=true&sslContextParameters=#clientSSLParameters",
+ port.getPort())
.log("Client consumer received message: ${body}")
.to("mock:result");
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketTest.java
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketTest.java
index a1624dc4df51..dffba2fc51ba 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketTest.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketTest.java
@@ -95,7 +95,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 2; i++) {
- openWebSocketConnection("localhost", port, "/test", message -> {
+ openWebSocketConnection("localhost", port.getPort(), "/test",
message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -125,7 +125,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 2; i++) {
- openWebSocketConnection("localhost", port,
"/test/paramA/other/paramB", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/paramA/other/paramB", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -157,7 +157,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 2; i++) {
- openWebSocketConnection("localhost", port,
"/test/paramA/other/paramB", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/paramA/other/paramB", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -189,7 +189,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 2; i++) {
- openWebSocketConnection("localhost", port,
"/test/wildcarded/path", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/path", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -197,7 +197,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
});
}
- openWebSocketConnection("localhost", port,
"/test/wildcarded/otherpath", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/otherpath", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -227,7 +227,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 2; i++) {
- openWebSocketConnection("localhost", port,
"/test/wildcarded/path", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/path", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -235,7 +235,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
});
}
- openWebSocketConnection("localhost", port,
"/test/wildcarded/otherpath", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/otherpath", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -277,7 +277,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 5; i++) {
- openWebSocketConnection("localhost", port, "/test", message -> {
+ openWebSocketConnection("localhost", port.getPort(), "/test",
message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -314,7 +314,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < expectedResultCount; i++) {
- openWebSocketConnection("localhost", port, "/test", message -> {
+ openWebSocketConnection("localhost", port.getPort(), "/test",
message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -324,13 +324,13 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
// Open a connection on path /test on another port to ensure the 'send
to all' operation
// only targeted peers connected on path /test
- openWebSocketConnection("localhost", port2, "/test", message -> {
+ openWebSocketConnection("localhost", port2.getPort(), "/test", message
-> {
results.add("/test on port " + port2 + " should not have been
called");
});
// Open a connection on path /test-other to ensure the 'send to all'
operation
// only targeted peers connected on path /test
- openWebSocketConnection("localhost", port, "/test-other", message -> {
+ openWebSocketConnection("localhost", port.getPort(), "/test-other",
message -> {
results.add("/test-other should not have been called");
});
@@ -356,7 +356,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < expectedResultCount; i++) {
- openWebSocketConnection("localhost", port, "/test", message -> {
+ openWebSocketConnection("localhost", port.getPort(), "/test",
message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -366,13 +366,13 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
// Open a connection on path /test on another port to ensure the 'send
to all' operation
// only targeted peers connected on path /test
- openWebSocketConnection("localhost", port2, "/test", message -> {
+ openWebSocketConnection("localhost", port2.getPort(), "/test", message
-> {
results.add("/test on port " + port2 + " should not have been
called");
});
// Open a connection on path /test-other to ensure the 'send to all'
operation
// only targeted peers connected on path /test
- openWebSocketConnection("localhost", port, "/test-other", message -> {
+ openWebSocketConnection("localhost", port.getPort(), "/test-other",
message -> {
results.add("/test-other should not have been called");
});
@@ -396,7 +396,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < expectedResultCount; i++) {
- openWebSocketConnection("localhost", port,
"/test/firstParam/other/secondParam", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/firstParam/other/secondParam", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -404,7 +404,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
});
// Below we produce to an explicit path so this peer should be
ignored
- openWebSocketConnection("localhost", port,
"/test/otherFirstParam/other/otherSecondParam", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/otherFirstParam/other/otherSecondParam", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -430,14 +430,14 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 5; i++) {
- openWebSocketConnection("localhost", port,
"/test/firstParam/other/secondParam", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/firstParam/other/secondParam", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
}
});
- openWebSocketConnection("localhost", port,
"/test/otherFirstParam/other/otherSecondParam", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/otherFirstParam/other/otherSecondParam", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -462,7 +462,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < expectedResultCount; i++) {
- openWebSocketConnection("localhost", port,
"/test/wildcarded/path", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/path", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -470,7 +470,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
});
// Below we produce to an explicit path so this peer should be
ignored
- openWebSocketConnection("localhost", port,
"/test/wildcarded/other", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/other", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -495,14 +495,14 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
List<String> results = new ArrayList<>();
for (int i = 0; i < 5; i++) {
- openWebSocketConnection("localhost", port,
"/test/wildcarded/path", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/path", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
}
});
- openWebSocketConnection("localhost", port,
"/test/wildcarded/other", message -> {
+ openWebSocketConnection("localhost", port.getPort(),
"/test/wildcarded/other", message -> {
synchronized (latch) {
results.add(message + " " + latch.getCount());
latch.countDown();
@@ -545,7 +545,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
CountDownLatch latch = new CountDownLatch(1);
List<String> results = new ArrayList<>();
- WebSocket webSocket = openWebSocketConnection("localhost", port,
"/testA/echo/testB", message -> {
+ WebSocket webSocket = openWebSocketConnection("localhost",
port.getPort(), "/testA/echo/testB", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -563,7 +563,7 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
CountDownLatch latch = new CountDownLatch(1);
List<String> results = new ArrayList<>();
- WebSocket webSocket = openWebSocketConnection("localhost", port,
"/wildcard/echo/foo/bar", message -> {
+ WebSocket webSocket = openWebSocketConnection("localhost",
port.getPort(), "/wildcard/echo/foo/bar", message -> {
synchronized (latch) {
results.add(message);
latch.countDown();
@@ -671,32 +671,32 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
@Override
public void configure() {
from("direct:start")
- .toF("vertx-websocket:localhost:%d/test", port);
+ .toF("vertx-websocket:localhost:%d/test",
port.getPort());
- fromF("vertx-websocket:localhost:%d/test", port)
+ fromF("vertx-websocket:localhost:%d/test", port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
- fromF("vertx-websocket:localhost:%d/test", port2)
+ fromF("vertx-websocket:localhost:%d/test", port2.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
- fromF("vertx-websocket:localhost:%d/test-other", port)
+ fromF("vertx-websocket:localhost:%d/test-other",
port.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
-
fromF("vertx-websocket:localhost:%d/path/params/{firstParam}/{secondParam}",
port)
+
fromF("vertx-websocket:localhost:%d/path/params/{firstParam}/{secondParam}",
port.getPort())
.setBody(simple("${header.firstParam}
${header.secondParam}"))
.to("mock:pathParamResult");
-
fromF("vertx-websocket:localhost:%d/{firstParam}/echo/{secondParam}", port)
+
fromF("vertx-websocket:localhost:%d/{firstParam}/echo/{secondParam}",
port.getPort())
.setBody(simple("${body} ${header.firstParam}
${header.secondParam}"))
- .toF("vertx-websocket:localhost:%d/testA/echo/testB",
port);
+ .toF("vertx-websocket:localhost:%d/testA/echo/testB",
port.getPort());
-
fromF("vertx-websocket:localhost:%d/test/{paramA}/other/{paramB}", port)
+
fromF("vertx-websocket:localhost:%d/test/{paramA}/other/{paramB}",
port.getPort())
.setBody(simple("${header.firstParam}
${header.secondParam}"));
- fromF("vertx-websocket:localhost:%d/query/params", port)
+ fromF("vertx-websocket:localhost:%d/query/params",
port.getPort())
.setBody(simple("${header.firstParam}
${header.secondParam}"))
.to("mock:queryParamResult");
@@ -711,19 +711,19 @@ public class VertxWebsocketTest extends
VertxWebSocketTestSupport {
})
.toD("vertx-websocket:localhost:${header.port}/greeting");
- fromF("vertx-websocket:localhost:%d", port)
+ fromF("vertx-websocket:localhost:%d", port.getPort())
.setBody().simple("Hello ${body} from the default
path")
.to("mock:defaultPath");
- fromF("vertx-websocket:localhost:%d/wild/card*", port)
+ fromF("vertx-websocket:localhost:%d/wild/card*",
port.getPort())
.setBody().simple("Hello ${body} from the wildcard
path")
.to("mock:wildcardPath");
- fromF("vertx-websocket:localhost:%d/wildcard/echo*", port)
+ fromF("vertx-websocket:localhost:%d/wildcard/echo*",
port.getPort())
.setBody().simple("${body} World")
-
.toF("vertx-websocket:localhost:%d/wildcard/echo/foo/bar", port);
+
.toF("vertx-websocket:localhost:%d/wildcard/echo/foo/bar", port.getPort());
- fromF("vertx-websocket:localhost:%d/test/wildcarded*", port)
+ fromF("vertx-websocket:localhost:%d/test/wildcarded*",
port.getPort())
.setBody().simple("Hello ${body} from the wildcard
path");
}
};
diff --git
a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
index ca76adcbd99e..cdf648f1aa49 100644
---
a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
+++
b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
@@ -18,23 +18,19 @@ package org.apache.camel.component.vertx;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class VertxBaseTestSupport extends CamelTestSupport {
- protected static int port;
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
protected final Logger log = LoggerFactory.getLogger(getClass());
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
protected int getPort() {
- return port;
+ return port.getPort();
}
}
