This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 07fc10e914d2f7bb1c068d2837b7acb496f83da8
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Thu Jun 27 16:22:10 2024 +0200
CAMEL-20838: cleanup dumping the route coverage
---
.../java/org/apache/camel/test/junit5/CamelContextManager.java | 10 ++++++++++
.../java/org/apache/camel/test/junit5/CamelTestSupport.java | 6 +-----
.../apache/camel/test/junit5/LegacyCamelContextManager.java | 9 +++++++++
.../apache/camel/test/junit5/TransientCamelContextManager.java | 9 +++++++++
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java
index 8738ddde481..0ba17002e47 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelContextManager.java
@@ -109,4 +109,14 @@ public interface CamelContextManager {
* @param globalStore JUnit's data context instance
*/
void setGlobalStore(ExtensionContext.Store globalStore);
+
+ /**
+ * Dumps the route coverage information
+ *
+ * @param clazz
+ * @param currentTestName
+ * @param time
+ * @throws Exception
+ */
+ void dumpRouteCoverage(Class<?> clazz, String currentTestName, long time)
throws Exception;
}
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 629c35e4599..74cfdabfe62 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
@@ -33,7 +33,6 @@ import org.apache.camel.spi.Language;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.junit5.util.CamelContextTestHelper;
import org.apache.camel.test.junit5.util.ExtensionHelper;
-import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension;
import org.apache.camel.util.StopWatch;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -262,10 +261,7 @@ public abstract class CamelTestSupport extends
AbstractTestSupport
public void tearDown() throws Exception {
long time = watch.taken();
- if (isRouteCoverageEnabled()) {
- final RouteCoverageDumperExtension routeCoverageWrapper = new
RouteCoverageDumperExtension(context);
- routeCoverageWrapper.dumpRouteCoverage(getClass(),
currentTestName, time);
- }
+ contextManager.dumpRouteCoverage(getClass(), currentTestName, time);
if (testConfigurationBuilder.isCreateCamelContextPerClass()) {
// will tear down test specially in afterAll callback
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java
index 1e9508ace64..f3e8b60866d 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/LegacyCamelContextManager.java
@@ -33,6 +33,7 @@ import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.test.junit5.util.CamelContextTestHelper;
import org.apache.camel.test.junit5.util.ExtensionHelper;
+import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -351,4 +352,12 @@ public class LegacyCamelContextManager implements
CamelContextManager {
public void setGlobalStore(ExtensionContext.Store globalStore) {
this.globalStore = globalStore;
}
+
+ @Override
+ public void dumpRouteCoverage(Class<?> clazz, String currentTestName, long
time) throws Exception {
+ if (testConfigurationBuilder.isRouteCoverageEnabled()) {
+ final RouteCoverageDumperExtension routeCoverageWrapper = new
RouteCoverageDumperExtension(context);
+ routeCoverageWrapper.dumpRouteCoverage(clazz, currentTestName,
time);
+ }
+ }
}
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java
index b5a66eb9aaf..9b6590d879e 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TransientCamelContextManager.java
@@ -31,6 +31,7 @@ import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.test.junit5.util.CamelContextTestHelper;
import org.apache.camel.test.junit5.util.ExtensionHelper;
+import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -271,4 +272,12 @@ public class TransientCamelContextManager implements
CamelContextManager {
public void setGlobalStore(ExtensionContext.Store globalStore) {
this.globalStore = globalStore;
}
+
+ @Override
+ public void dumpRouteCoverage(Class<?> clazz, String currentTestName, long
time) throws Exception {
+ if (testConfigurationBuilder.isRouteCoverageEnabled()) {
+ final RouteCoverageDumperExtension routeCoverageWrapper = new
RouteCoverageDumperExtension(context);
+ routeCoverageWrapper.dumpRouteCoverage(clazz, currentTestName,
time);
+ }
+ }
}
