You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ap...@apache.org on 2026/09/03 11:06:17 UTC
(camel) branch revert-25948-jbang-fix-state-leaks created (now 36bb3b402f8d)
This is an automated email from the ASF dual-hosted git repository.
apupier pushed a change to branch revert-25948-jbang-fix-state-leaks
in repository https://gitbox.apache.org/repos/asf/camel.git
at 36bb3b402f8d Revert "[JBANG-IT] Add cleanups for tests that can produce state leaks"
This branch includes the following new commits:
new 36bb3b402f8d Revert "[JBANG-IT] Add cleanups for tests that can produce state leaks"
The 1 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.
(camel) 01/01: Revert "[JBANG-IT] Add cleanups for tests that can produce state leaks"
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch revert-25948-jbang-fix-state-leaks
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 36bb3b402f8d5d17750dba9aec67188eb41fb301
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Thu Sep 3 13:06:08 2026 +0200
Revert "[JBANG-IT] Add cleanups for tests that can produce state leaks"
This reverts commit 6f45acb2e1074b718489684fe028b369b32bc1e9.
---
.../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 deletions(-)
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 3a04c7670699..0f22f54d8e34 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,18 +17,10 @@
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 82eb38b5efa6..910eded0830a 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,14 +19,12 @@ 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 70151566fba2..a750f5473555 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,7 +19,6 @@ 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;
@@ -28,11 +27,6 @@ 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 fa26981fede1..3cfb088f1dd8 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,7 +19,6 @@ 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;
@@ -28,11 +27,6 @@ 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 5cc34284e2d0..1340f0135fd6 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,7 +19,6 @@ 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;
@@ -28,11 +27,6 @@ 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 8f0643acbcd9..8c089868ecdf 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,7 +19,6 @@ 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;
@@ -28,11 +27,6 @@ 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 86fada0bb360..150e7ae69a41 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,7 +20,6 @@ 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;
@@ -29,11 +28,6 @@ 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 83856c056797..61e99eae90e3 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,16 +19,9 @@ 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 d7b5fd0c9480..550d09056b6e 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,7 +22,6 @@ 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,11 +46,6 @@ 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 6ce598221709..a4ab26bc9758 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,7 +20,6 @@ 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;
@@ -30,11 +29,6 @@ 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 0d982e4bb50f..1da09964a522 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,16 +20,10 @@ 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 03c983d8b309..0d22f8220b03 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,17 +31,11 @@ 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 5f7cee251919..ba7edb7730fd 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,16 +19,9 @@ 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 dcfa44228878..bccece7ad867 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,7 +21,6 @@ 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;
@@ -34,15 +33,8 @@ 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 a6cfcf8ead41..1b348b7566ed 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,24 +22,14 @@ 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 33f20295a68a..6f56d7d2dea9 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,16 +19,9 @@ 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 ea1ea13fd17c..6da58274f0ab 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,16 +19,9 @@ 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 316c48d9c956..0ad6a8e19ba3 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,16 +19,10 @@ 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 b4675d78285d..12f5e6fb564b 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,16 +20,10 @@ 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 a8a2742463e7..dd68bdd37511 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,7 +30,6 @@ 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;
@@ -38,15 +37,6 @@ 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 77440d96a16a..1e9174106ec1 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,16 +21,10 @@ 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 5b4123375f53..3ca550881160 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,16 +19,9 @@ 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 a5d87e8619b9..762151f2bc84 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,16 +19,10 @@ 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 413775e3f8ac..07a26e18aa5c 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,7 +30,6 @@ 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;
@@ -44,14 +43,6 @@ 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 69ed3985888d..c3e46d8f7ec5 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,7 +23,6 @@ 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;
@@ -48,11 +47,6 @@ 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 a79a7a257934..a0c220f8f753 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,16 +19,10 @@ 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 52ca3a9b3338..7e8052a11996 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,11 +87,6 @@ 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) {