Repository: camel Updated Branches: refs/heads/master bc5828966 -> cd348079b
Use RoutesBuilder interface in camel-test to allow more freedom. Thanks to Chris Pimlott for the patch. This closes #543. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd348079 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd348079 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd348079 Branch: refs/heads/master Commit: cd348079b50e6114eb4d3cda1409f5ec9bd03226 Parents: bc58289 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 30 17:48:20 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 30 17:48:20 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/test/junit4/CamelTestSupport.java | 14 ++++++++------ .../org/apache/camel/testng/CamelTestSupport.java | 15 ++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cd348079/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java index d0f472f..2c74e80 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java @@ -39,6 +39,7 @@ import org.apache.camel.NoSuchEndpointException; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; +import org.apache.camel.RoutesBuilder; import org.apache.camel.Service; import org.apache.camel.ServiceStatus; import org.apache.camel.api.management.mbean.ManagedCamelContextMBean; @@ -70,7 +71,7 @@ import org.slf4j.LoggerFactory; * A useful base class which creates a {@link org.apache.camel.CamelContext} with some routes * along with a {@link org.apache.camel.ProducerTemplate} for use in the test case * - * @version + * @version */ public abstract class CamelTestSupport extends TestSupport { private static final Logger LOG = LoggerFactory.getLogger(CamelTestSupport.class); @@ -319,8 +320,8 @@ public abstract class CamelTestSupport extends TestSupport { postProcessTest(); if (isUseRouteBuilder()) { - RouteBuilder[] builders = createRouteBuilders(); - for (RouteBuilder builder : builders) { + RoutesBuilder[] builders = createRouteBuilders(); + for (RoutesBuilder builder : builders) { log.debug("Using created route builder: " + builder); context.addRoutes(builder); } @@ -578,8 +579,9 @@ public abstract class CamelTestSupport extends TestSupport { * Factory method which derived classes can use to create a {@link RouteBuilder} * to define the routes for testing */ - protected RouteBuilder createRouteBuilder() throws Exception { + protected RoutesBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { + @Override public void configure() { // no routes added by default } @@ -592,8 +594,8 @@ public abstract class CamelTestSupport extends TestSupport { * * @see #createRouteBuilder() */ - protected RouteBuilder[] createRouteBuilders() throws Exception { - return new RouteBuilder[] {createRouteBuilder()}; + protected RoutesBuilder[] createRouteBuilders() throws Exception { + return new RoutesBuilder[] {createRouteBuilder()}; } /** http://git-wip-us.apache.org/repos/asf/camel/blob/cd348079/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java index 33d42e2..531a2a8 100644 --- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java +++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java @@ -34,6 +34,7 @@ import org.apache.camel.NoSuchEndpointException; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; +import org.apache.camel.RoutesBuilder; import org.apache.camel.Service; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -287,8 +288,8 @@ public abstract class CamelTestSupport extends TestSupport { postProcessTest(); if (isUseRouteBuilder()) { - RouteBuilder[] builders = createRouteBuilders(); - for (RouteBuilder builder : builders) { + RoutesBuilder[] builders = createRouteBuilders(); + for (RoutesBuilder builder : builders) { log.debug("Using created route builder: " + builder); context.addRoutes(builder); } @@ -465,10 +466,10 @@ public abstract class CamelTestSupport extends TestSupport { } /** - * Factory method which derived classes can use to create a {@link RouteBuilder} + * Factory method which derived classes can use to create a {@link RoutesBuilder} * to define the routes for testing */ - protected RouteBuilder createRouteBuilder() throws Exception { + protected RoutesBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { // no routes added by default @@ -478,12 +479,12 @@ public abstract class CamelTestSupport extends TestSupport { /** * Factory method which derived classes can use to create an array of - * {@link org.apache.camel.builder.RouteBuilder}s to define the routes for testing + * {@link org.apache.camel.RoutesBuilder}s to define the routes for testing * * @see #createRouteBuilder() */ - protected RouteBuilder[] createRouteBuilders() throws Exception { - return new RouteBuilder[] {createRouteBuilder()}; + protected RoutesBuilder[] createRouteBuilders() throws Exception { + return new RoutesBuilder[] {createRouteBuilder()}; } /**
