You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/12/31 12:50:26 UTC
(camel) 04/09: CAMEL-21274: camel-test - Add option to dump routes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch td
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8cd1a894efaec6c82a504bdb83ce03978bc128c0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 31 11:55:55 2024 +0100
CAMEL-21274: camel-test - Add option to dump routes
---
.../camel/test/junit5/util/CamelContextTestHelper.java | 14 ++++++++++++--
.../camel/test/spring/junit5/CamelAnnotationsHandler.java | 10 +++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
index dd202988e94..ee26f8d69c8 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
@@ -251,10 +251,20 @@ public final class CamelContextTestHelper {
}
public static boolean isRouteCoverageEnabled(boolean legacyDumpCoverage) {
- return Boolean.parseBoolean(System.getProperty(ROUTE_COVERAGE_ENABLED, "false")) || legacyDumpCoverage;
+ String p = System.getProperty(ROUTE_COVERAGE_ENABLED);
+ if (p != null) {
+ // JVM system property take precedence
+ return Boolean.parseBoolean(p);
+ }
+ return legacyDumpCoverage;
}
public static String getRouteDump(String legacyDumpRoute) {
- return System.getProperty(ROUTE_DUMP_ENABLED, legacyDumpRoute);
+ String p = System.getProperty(ROUTE_DUMP_ENABLED);
+ if (p != null) {
+ // JVM system property take precedence
+ return p;
+ }
+ return legacyDumpRoute;
}
}
diff --git a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
index 3b7019843bb..2877fad54a1 100644
--- a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
+++ b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
@@ -45,6 +45,7 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.annotation.AnnotationUtils;
import static org.apache.camel.test.junit5.TestSupport.isCamelDebugPresent;
+import static org.apache.camel.test.junit5.util.CamelContextTestHelper.isRouteCoverageEnabled;
public final class CamelAnnotationsHandler {
@@ -123,11 +124,10 @@ public final class CamelAnnotationsHandler {
public static void handleRouteCoverageEnable(
ConfigurableApplicationContext context, Class<?> testClass, Function testMethod)
throws Exception {
- if (testClass.isAnnotationPresent(EnableRouteCoverage.class)) {
- System.setProperty(CamelContextTestHelper.ROUTE_COVERAGE_ENABLED, "true");
+ boolean enabled = isRouteCoverageEnabled(testClass.isAnnotationPresent(EnableRouteCoverage.class));
+ if (enabled) {
CamelSpringTestHelper.doToSpringCamelContexts(context, new CamelSpringTestHelper.DoToSpringCamelContextsStrategy() {
-
@Override
public void execute(String contextName, SpringCamelContext camelContext) throws Exception {
LOGGER.info("Enabling RouteCoverage");
@@ -177,9 +177,9 @@ public final class CamelAnnotationsHandler {
ConfigurableApplicationContext context, Class<?> testClass,
Function<CamelSpringTestHelper.DoToSpringCamelContextsStrategy, String> testMethod)
throws Exception {
- if (testClass.isAnnotationPresent(EnableRouteCoverage.class)) {
+ boolean enabled = isRouteCoverageEnabled(testClass.isAnnotationPresent(EnableRouteCoverage.class));
+ if (enabled) {
CamelSpringTestHelper.doToSpringCamelContexts(context, new CamelSpringTestHelper.DoToSpringCamelContextsStrategy() {
-
@Override
public void execute(String contextName, SpringCamelContext camelContext) throws Exception {
LOGGER.debug("Dumping RouteCoverage");