This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 6399684f05 Avoid port clashes with WireMock dynamically allocated port
6399684f05 is described below
commit 6399684f05c3363367190c16806163e003b06d7c
Author: James Netherton <[email protected]>
AuthorDate: Mon Dec 5 08:55:50 2022 +0000
Avoid port clashes with WireMock dynamically allocated port
---
.../quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java | 4 +++-
.../camel/quarkus/component/validator/it/ValidatorTestResource.java | 5 +++--
.../org/apache/camel/quarkus/component/xml/it/XmlTestResource.java | 5 +++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
b/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
index 349b714608..bd02e45860 100644
---
a/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
+++
b/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
@@ -33,6 +33,7 @@ import
com.github.tomakehurst.wiremock.recording.RecordingStatus;
import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils;
import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.logging.Logger;
@@ -111,6 +112,7 @@ public abstract class WireMockTestResourceLifecycleManager
implements QuarkusTes
}
}
server.stop();
+ AvailablePortFinder.releaseReservedPorts();
}
}
@@ -215,7 +217,7 @@ public abstract class WireMockTestResourceLifecycleManager
implements QuarkusTes
LOG.info("Starting WireMockServer");
MockBackendUtils.startMockBackend(true);
- WireMockConfiguration configuration = options().dynamicPort();
+ WireMockConfiguration configuration =
options().port(AvailablePortFinder.getNextAvailable());
customizeWiremockConfiguration(configuration);
if (!isRecordingEnabled()) {
diff --git
a/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
b/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
index 0826e204e6..161daf17c8 100644
---
a/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
+++
b/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
@@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -46,7 +46,7 @@ public class ValidatorTestResource implements
QuarkusTestResourceLifecycleManage
+ "</xs:element>"
+ "</xs:schema>";
- server = new WireMockServer(WireMockConfiguration.DYNAMIC_PORT);
+ server = new WireMockServer(AvailablePortFinder.getNextAvailable());
server.start();
server.stubFor(
get(urlEqualTo("/xsd"))
@@ -62,6 +62,7 @@ public class ValidatorTestResource implements
QuarkusTestResourceLifecycleManage
public void stop() {
if (server != null) {
server.stop();
+ AvailablePortFinder.releaseReservedPorts();
}
}
diff --git
a/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
b/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
index a22599edb3..c8b228f928 100644
---
a/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
+++
b/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.Map;
import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -36,7 +36,7 @@ public class XmlTestResource implements
QuarkusTestResourceLifecycleManager {
public Map<String, String> start() {
try (InputStream in = Thread.currentThread().getContextClassLoader()
.getResourceAsStream("xslt/classpath-transform.xsl")) {
- server = new WireMockServer(WireMockConfiguration.DYNAMIC_PORT);
+ server = new
WireMockServer(AvailablePortFinder.getNextAvailable());
server.start();
server.stubFor(
get(urlEqualTo("/xslt"))
@@ -55,6 +55,7 @@ public class XmlTestResource implements
QuarkusTestResourceLifecycleManager {
public void stop() {
if (server != null) {
server.stop();
+ AvailablePortFinder.releaseReservedPorts();
}
}
}
