Repository: camel Updated Branches: refs/heads/master d02a9ce1b -> 8d6b53ff4
Camel route coverage polished a bit Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d6b53ff Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d6b53ff Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d6b53ff Branch: refs/heads/master Commit: 8d6b53ff4060985267321fd170bb9000694d9474 Parents: d02a9ce Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Oct 17 14:12:43 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Oct 17 14:12:43 2017 +0200 ---------------------------------------------------------------------- .../component/sql/SqlProducerUseMessageBodyForSqlTest.java | 6 +++--- .../main/java/org/apache/camel/maven/RouteCoverageMojo.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8d6b53ff/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java index ea8b7d8..8c91531 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java @@ -56,7 +56,7 @@ public class SqlProducerUseMessageBodyForSqlTest extends CamelTestSupport { public void configure() { getContext().getComponent("sql", SqlComponent.class).setDataSource(db); - from("direct:start") + from("direct:start").routeId("foo") .setBody(constant("select * from projects where license = :?lic order by id")) .to("sql://query?useMessageBodyForSql=true") .to("mock:result"); @@ -84,7 +84,7 @@ public class SqlProducerUseMessageBodyForSqlTest extends CamelTestSupport { public void configure() { getContext().getComponent("sql", SqlComponent.class).setDataSource(db); - from("direct:start") + from("direct:start").routeId("bar") .setBody(constant("select * from projects where license = :?lic order by id")) .to("sql://query?useMessageBodyForSql=true") .to("mock:result"); @@ -114,7 +114,7 @@ public class SqlProducerUseMessageBodyForSqlTest extends CamelTestSupport { public void configure() { getContext().getComponent("sql", SqlComponent.class).setDataSource(db); - from("direct:start") + from("direct:start").routeId("baz") .setBody(constant("insert into projects(id, project, license) values(:?id,:?project,:?lic)")) .to("sql://query?useMessageBodyForSql=true&batch=true") .to("mock:result"); http://git-wip-us.apache.org/repos/asf/camel/blob/8d6b53ff/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java index a790bba..36ba108 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java @@ -196,7 +196,7 @@ public class RouteCoverageMojo extends AbstractExecMojo { // favor strict matching on route ids for (CamelNodeDetails t : routeIdTrees) { String routeId = t.getRouteId(); - String fileName = asRelativeFile(t.getFileName()); + String fileName = stripRootPath(asRelativeFile(t.getFileName())); // grab dump data for the route try { @@ -243,7 +243,8 @@ public class RouteCoverageMojo extends AbstractExecMojo { } if (!coverage.isEmpty()) { - String out = templateCoverageData(className, null, coverage, notCovered); + String fileName = stripRootPath(asRelativeFile(t.getValue().get(0).getFileName())); + String out = templateCoverageData(fileName, null, coverage, notCovered); getLog().info("Route coverage summary:\n\n" + out); getLog().info(""); }
