This is an automated email from the ASF dual-hosted git repository.
Croway 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 6f45acb2e107 [JBANG-IT] Add cleanups for tests that can produce state
leaks
6f45acb2e107 is described below
commit 6f45acb2e1074b718489684fe028b369b32bc1e9
Author: Jakub Vrubel <[email protected]>
AuthorDate: Mon Aug 10 12:37:20 2026 +0200
[JBANG-IT] Add cleanups for tests that can produce state leaks
---
.../java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java | 8 ++++++++
.../java/org/apache/camel/dsl/jbang/it/CamelDebugITCase.java | 2 ++
.../java/org/apache/camel/dsl/jbang/it/CamelGetITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/CamelLogITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/CamelTopITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/CamelTraceITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/CmdGroupITCase.java | 6 ++++++
.../test/java/org/apache/camel/dsl/jbang/it/CmdLoadITCase.java | 7 +++++++
.../java/org/apache/camel/dsl/jbang/it/CmdReceiveITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/CmdStartStopITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/CustomJarsITCase.java | 6 ++++++
.../test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java | 6 ++++++
.../test/java/org/apache/camel/dsl/jbang/it/HistoryITCase.java | 7 +++++++
.../org/apache/camel/dsl/jbang/it/InfrastructureITCase.java | 8 ++++++++
.../test/java/org/apache/camel/dsl/jbang/it/JolokiaITCase.java | 10 ++++++++++
.../java/org/apache/camel/dsl/jbang/it/ListServiceITCase.java | 7 +++++++
.../org/apache/camel/dsl/jbang/it/LocalKameletsITCase.java | 7 +++++++
.../org/apache/camel/dsl/jbang/it/LoggingLevelsITCase.java | 6 ++++++
.../apache/camel/dsl/jbang/it/MetricsObservabilityITCase.java | 6 ++++++
.../test/java/org/apache/camel/dsl/jbang/it/OpenApiITCase.java | 10 ++++++++++
.../java/org/apache/camel/dsl/jbang/it/PlatformHttpITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/ProcessorITCase.java | 7 +++++++
.../java/org/apache/camel/dsl/jbang/it/RouteFromDirITCase.java | 6 ++++++
.../java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java | 9 +++++++++
.../org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java | 6 ++++++
.../org/apache/camel/dsl/jbang/it/ValidatePluginITCase.java | 6 ++++++
.../apache/camel/dsl/jbang/it/support/JBangTestSupport.java | 5 +++++
27 files changed, 177 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java
index 0f22f54d8e34..3a04c7670699 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java
@@ -17,10 +17,18 @@
package org.apache.camel.dsl.jbang.it;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class CamelConfigITCase extends JBangTestSupport {
+ @AfterEach
+ public void resetConfig() {
+ execute("config unset runtime");
+ execute("config unset gav");
+ execute("config unset directory");
+ }
+
@Test
public void testCamelSetAndGetConfig() {
execute("config set gav=com.foo:acme:1.0-SNAPSHOT");
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelDebugITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelDebugITCase.java
index 910eded0830a..82eb38b5efa6 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelDebugITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelDebugITCase.java
@@ -19,12 +19,14 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
+@Tag("container-only")
public class CamelDebugITCase extends JBangTestSupport {
@Test
public void testDebug() throws IOException {
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelGetITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelGetITCase.java
index a750f5473555..70151566fba2 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelGetITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelGetITCase.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -27,6 +28,11 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
public class CamelGetITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testGetContext() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelLogITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelLogITCase.java
index 3cfb088f1dd8..fa26981fede1 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelLogITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelLogITCase.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -27,6 +28,11 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
public class CamelLogITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testLogCommand() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTopITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTopITCase.java
index 1340f0135fd6..5cc34284e2d0 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTopITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTopITCase.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -27,6 +28,11 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
public class CamelTopITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testTop() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTraceITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTraceITCase.java
index 8c089868ecdf..8f0643acbcd9 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTraceITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelTraceITCase.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -27,6 +28,11 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
public class CamelTraceITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testTrace() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdGroupITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdGroupITCase.java
index 150e7ae69a41..86fada0bb360 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdGroupITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdGroupITCase.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.InVersion;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -28,6 +29,11 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
public class CmdGroupITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
@InVersion(from = "4.14.00")
public void testStopGroup() throws IOException {
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdLoadITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdLoadITCase.java
index 61e99eae90e3..83856c056797 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdLoadITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdLoadITCase.java
@@ -19,9 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class CmdLoadITCase extends JBangTestSupport {
+
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testCmdLoad() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdReceiveITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdReceiveITCase.java
index 550d09056b6e..d7b5fd0c9480 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdReceiveITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdReceiveITCase.java
@@ -22,6 +22,7 @@ import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.apache.camel.test.AvailablePortFinder;
import
org.apache.camel.test.infra.mosquitto.services.MosquittoLocalContainerService;
import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -46,6 +47,11 @@ public class CmdReceiveITCase extends JBangTestSupport {
service.shutdown();
}
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testCmdSendAndReceive() throws IOException {
copyResourceInDataFolder(TestResources.MQQT_CONSUMER);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdStartStopITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdStartStopITCase.java
index a4ab26bc9758..6ce598221709 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdStartStopITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CmdStartStopITCase.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -29,6 +30,11 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
public class CmdStartStopITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testCmdStopByRouteID() throws IOException {
copyResourceInDataFolder(TestResources.DIR_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CustomJarsITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CustomJarsITCase.java
index 1da09964a522..0d982e4bb50f 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CustomJarsITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CustomJarsITCase.java
@@ -20,10 +20,16 @@ import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class CustomJarsITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testCustomJars() throws IOException {
copyResourceInDataFolder(TestResources.CUSTOM_JAR);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
index 0d22f8220b03..03c983d8b309 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
@@ -31,11 +31,17 @@ import
org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.apache.camel.dsl.jbang.it.support.JiraIssue;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
public class DevModeITCase extends JBangTestSupport {
+ @AfterEach
+ public void cleanupProfileFiles() {
+ execInContainer("rm -f " + DEFAULT_ROUTE_FOLDER + "/" +
TestResources.TEST_PROFILE_PROP.getName());
+ }
+
private final HttpClient httpClient = HttpClient.newHttpClient();
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/HistoryITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/HistoryITCase.java
index ba7edb7730fd..5f7cee251919 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/HistoryITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/HistoryITCase.java
@@ -19,9 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class HistoryITCase extends JBangTestSupport {
+
+ @AfterEach
+ public void cleanupInbox() {
+ execInContainer("rm -rf inbox");
+ }
+
@Test
public void testHistory() throws IOException {
copyResourceInDataFolder(TestResources.HISTORY_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
index bccece7ad867..dcfa44228878 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
@@ -21,6 +21,7 @@ import java.time.Duration;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
@@ -33,8 +34,15 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
public class InfrastructureITCase extends JBangTestSupport {
private static final String SERVICE = "ftp";
private static final String IMPL_SERVICE = "artemis";
+
private static final String IMPLEMENTATION = "amqp";
+ @AfterEach
+ public void stopInfraServices() {
+ execute("infra stop " + SERVICE, false, true);
+ execute("infra stop " + IMPL_SERVICE, false, true);
+ }
+
private String getServicePID(String message) {
return message.split(":")[1].replaceAll("[^0-9]", "");
}
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/JolokiaITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/JolokiaITCase.java
index 1b348b7566ed..a6cfcf8ead41 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/JolokiaITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/JolokiaITCase.java
@@ -22,14 +22,24 @@ import java.time.Duration;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
+@Tag("container-only")
public class JolokiaITCase extends JBangTestSupport {
+ @AfterEach
+ public void stopJolokiaAndHawtio() {
+ execute("jolokia FromDirectoryRoute --stop", false, true);
+ execInContainer("pkill -f 'hawtio FromDirectoryRoute' 2>/dev/null ||
true");
+ execute("stop FromDirectoryRoute", false, true);
+ }
+
@Test
public void testAttachJolokia() throws IOException {
copyResourceInDataFolder(TestResources.DIR_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ListServiceITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ListServiceITCase.java
index 6f56d7d2dea9..33f20295a68a 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ListServiceITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ListServiceITCase.java
@@ -19,9 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class ListServiceITCase extends JBangTestSupport {
+
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void listServicesTest() throws IOException {
copyResourceInDataFolder(TestResources.SERVER_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LocalKameletsITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LocalKameletsITCase.java
index 6da58274f0ab..ea1ea13fd17c 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LocalKameletsITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LocalKameletsITCase.java
@@ -19,9 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class LocalKameletsITCase extends JBangTestSupport {
+
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void localKameletRunTest() throws IOException {
copyResourceInDataFolder(TestResources.USER_SOURCE_KAMELET);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LoggingLevelsITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LoggingLevelsITCase.java
index 0ad6a8e19ba3..316c48d9c956 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LoggingLevelsITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/LoggingLevelsITCase.java
@@ -19,10 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class LoggingLevelsITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testLoggingLevelRuntime() throws IOException {
copyResourceInDataFolder(TestResources.DIR_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MetricsObservabilityITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MetricsObservabilityITCase.java
index 12f5e6fb564b..b4675d78285d 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MetricsObservabilityITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MetricsObservabilityITCase.java
@@ -20,10 +20,16 @@ import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class MetricsObservabilityITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void metricsTest() throws IOException {
copyResourceInDataFolder(TestResources.SERVER_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/OpenApiITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/OpenApiITCase.java
index dd68bdd37511..a8a2742463e7 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/OpenApiITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/OpenApiITCase.java
@@ -30,6 +30,7 @@ import java.util.Random;
import org.apache.camel.dsl.jbang.it.support.InVersion;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,6 +38,15 @@ import
org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
@Tag("container-only")
public class OpenApiITCase extends JBangTestSupport {
+ @AfterEach
+ public void cleanupOpenApiArtifacts() {
+ execInContainer(String.format(
+ "rm -f %1$s/petstore-v3.json %1$s/petstore.camel.yaml
%1$s/Greetings.java %1$s/greetings-api.json %1$s/rest-dsl.yaml",
+ DEFAULT_ROUTE_FOLDER));
+ execInContainer(String.format("rm -rf %1$s/camel-mock %1$s/model",
DEFAULT_ROUTE_FOLDER));
+ execute("plugin delete generate", false, true);
+ }
+
final HttpClient httpClient = HttpClient.newHttpClient();
@Test
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/PlatformHttpITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/PlatformHttpITCase.java
index 1e9174106ec1..77440d96a16a 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/PlatformHttpITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/PlatformHttpITCase.java
@@ -21,10 +21,16 @@ import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class PlatformHttpITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testPlatformHttp() throws IOException {
copyResourceInDataFolder(TestResources.SERVER_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ProcessorITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ProcessorITCase.java
index 3ca550881160..5b4123375f53 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ProcessorITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ProcessorITCase.java
@@ -19,9 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class ProcessorITCase extends JBangTestSupport {
+
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void testDisableEIP() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RouteFromDirITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RouteFromDirITCase.java
index 762151f2bc84..a5d87e8619b9 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RouteFromDirITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RouteFromDirITCase.java
@@ -19,10 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class RouteFromDirITCase extends JBangTestSupport {
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
public void runFromDirTest() throws IOException {
copyResourceInDataFolder(TestResources.DIR_ROUTE);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
index 07a26e18aa5c..413775e3f8ac 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
@@ -30,6 +30,7 @@ import org.apache.camel.dsl.jbang.it.support.JiraIssue;
import org.apache.camel.test.infra.cli.common.CliProperties;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -43,6 +44,14 @@ import static org.junit.jupiter.api.condition.OS.WINDOWS;
public class RunCommandITCase extends JBangTestSupport {
+ @AfterEach
+ public void cleanupContainerFiles() {
+ // files downloaded by runDownloadedFromGithubTest into
DEFAULT_ROUTE_FOLDER
+ execInContainer(String.format("rm -f %1$s/Echo.java %1$s/Hello.java
%1$s/README.adoc", DEFAULT_ROUTE_FOLDER));
+ // directories created by runRoutesFromMultipleFilesUsingWildcardTest
+ execInContainer("rm -rf /tmp/one /tmp/two");
+ }
+
@Test
@JiraIssue("CAMEL-21082")
public void initKeepFilesInDirectoryTest() {
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
index c3e46d8f7ec5..69ed3985888d 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
@@ -23,6 +23,7 @@ import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
import org.apache.camel.test.AvailablePortFinder;
import
org.apache.camel.test.infra.mosquitto.services.MosquittoLocalContainerService;
import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -47,6 +48,11 @@ public class RunCommandOnMqttITCase extends JBangTestSupport
{
service.shutdown();
}
+ @AfterEach
+ void stopAll() {
+ execute("stop");
+ }
+
@Test
@InVersion(from = "4.00.00")
public void sendMessageWithoutEndpoint() throws IOException {
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ValidatePluginITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ValidatePluginITCase.java
index a0c220f8f753..a79a7a257934 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ValidatePluginITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ValidatePluginITCase.java
@@ -19,10 +19,16 @@ package org.apache.camel.dsl.jbang.it;
import java.io.IOException;
import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
public class ValidatePluginITCase extends JBangTestSupport {
+ @AfterEach
+ public void removeValidatePlugin() {
+ execute("plugin delete validate", false, true);
+ }
+
@Test
public void testValidateOK() throws IOException {
copyResourceInDataFolder(TestResources.ROUTE2);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
index 7e8052a11996..52ca3a9b3338 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
@@ -87,6 +87,11 @@ public abstract class JBangTestSupport {
@AfterEach
protected void afterEach(TestInfo testInfo) {
logger.debug("ending {}#{} using data folder {}",
getClass().getName(), testInfo.getDisplayName(), getDataFolder());
+ execute("config unset runtime");
+ execute("config unset gav");
+ execute("config unset directory");
+ execute("config unset camel-version");
+ execInContainer("rm -f " + DEFAULT_ROUTE_FOLDER +
"/application.properties");
assertNoErrors();
logger.debug("clean up data folder");
if (containerDataFolder != null) {
