From db3a14cd06d54d32b619c18a9c99f41dd22ba825 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Wed, 6 Mar 2024 10:35:49 +0100
Subject: [PATCH] CAMEL-20522: camel-test - CamelTestSupport does not call
 tearDown for each test method in some test classes

---
 .../java/org/apache/camel/test/junit5/CamelTestSupport.java | 6 ++----
 .../camel/test/junit5/patterns/IsMockEndpointsFileTest.java | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 53bc6fe693afc..a15d23d34bb87 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -65,8 +65,6 @@
 import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.TimeUtils;
 import org.apache.camel.util.URISupport;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterEachCallback;
@@ -140,11 +138,13 @@ public long timeTaken() {
     public void beforeEach(ExtensionContext context) throws Exception {
         currentTestName = context.getDisplayName();
         globalStore = context.getStore(ExtensionContext.Namespace.GLOBAL);
+        setUp();
     }
 
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
         DefaultCamelContext.clearOptions();
+        tearDown();
     }
 
     @Override
@@ -341,7 +341,6 @@ public void setCamelContextService(Service service) {
         THREAD_SERVICE.set(camelContextService);
     }
 
-    @BeforeEach
     public void setUp() throws Exception {
         LOG.info(SEPARATOR);
         LOG.info("Testing: {} ({})", currentTestName, getClass().getName());
@@ -563,7 +562,6 @@ private boolean isRouteCoverageEnabled() {
         return System.getProperty(ROUTE_COVERAGE_ENABLED, "false").equalsIgnoreCase("true") || isDumpRouteCoverage();
     }
 
-    @AfterEach
     public void tearDown() throws Exception {
         long time = watch.taken();
 
diff --git a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java
index 80756406e9c29..2f30ae8d5c8a1 100644
--- a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java
+++ b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java
@@ -20,7 +20,6 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
@@ -28,7 +27,6 @@
 public class IsMockEndpointsFileTest extends CamelTestSupport {
 
     @Override
-    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/input");
         deleteDirectory("target/messages");