Repository: camel Updated Branches: refs/heads/master cd348079b -> d1492924d
Use RoutesBuilder interface in camel-test to allow more freedom. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1492924 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1492924 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1492924 Branch: refs/heads/master Commit: d1492924db9365f4e3de6826375cd3245a572aff Parents: cd34807 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 31 08:39:22 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 31 08:39:22 2015 +0100 ---------------------------------------------------------------------- .../camel/component/dns/DnsDigEndpointTest.java | 11 ++++++----- .../apache/camel/component/dns/DnsIpEndpointTest.java | 11 ++++++----- .../camel/component/dns/DnsIpHeaderTransferTest.java | 14 ++++++-------- .../camel/component/dns/DnsLookupEndpointTest.java | 11 ++++++----- .../camel/component/dns/WikipediaEndpointTest.java | 11 ++++++----- .../org/apache/camel/scala/dsl/AutoStartupTest.scala | 3 ++- 6 files changed, 32 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d1492924/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java index d8f4f21..25a55d5 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java @@ -52,11 +52,12 @@ public class DnsDigEndpointTest extends CamelTestSupport { protected ProducerTemplate template; protected RouteBuilder createRouteBuilder() throws Exception { - RouteBuilder routeBuilder = super.createRouteBuilder(); - - routeBuilder.from("direct:start").to("dns:dig").to("mock:result"); - - return routeBuilder; + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("dns:dig").to("mock:result"); + } + }; } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/d1492924/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java index e33e3ff..ba69369 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java @@ -37,11 +37,12 @@ public class DnsIpEndpointTest extends CamelTestSupport { protected ProducerTemplate template; protected RouteBuilder createRouteBuilder() throws Exception { - RouteBuilder routeBuilder = super.createRouteBuilder(); - - routeBuilder.from("direct:start").to("dns:ip").to("mock:result"); - - return routeBuilder; + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("dns:ip").to("mock:result"); + } + }; } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/d1492924/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java index 20f681c..16528a2 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.component.dns; import org.apache.camel.EndpointInject; @@ -26,9 +25,6 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Ignore; import org.junit.Test; - -import static org.apache.camel.builder.Builder.constant; - public class DnsIpHeaderTransferTest extends CamelTestSupport { @EndpointInject(uri = "mock:result") @@ -38,10 +34,12 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport { protected ProducerTemplate template; protected RouteBuilder createRouteBuilder() throws Exception { - RouteBuilder routeBuilder = super.createRouteBuilder(); - routeBuilder.from("direct:start").setHeader("foo", constant("bar")).to("dns:ip").to("mock:result"); - - return routeBuilder; + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").setHeader("foo", constant("bar")).to("dns:ip").to("mock:result"); + } + }; } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/d1492924/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java index e49b109..f1a5c1a 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java @@ -43,11 +43,12 @@ public class DnsLookupEndpointTest extends CamelTestSupport { protected ProducerTemplate template; protected RouteBuilder createRouteBuilder() throws Exception { - RouteBuilder routeBuilder = super.createRouteBuilder(); - - routeBuilder.from("direct:start").to("dns:lookup").to("mock:result"); - - return routeBuilder; + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("dns:lookup").to("mock:result"); + } + }; } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/d1492924/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java index 5fdcd34..b6b9d7f 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java @@ -46,11 +46,12 @@ public class WikipediaEndpointTest extends CamelTestSupport { protected ProducerTemplate template; protected RouteBuilder createRouteBuilder() throws Exception { - RouteBuilder routeBuilder = super.createRouteBuilder(); - - routeBuilder.from("direct:start").to("dns:wikipedia").to("mock:result"); - - return routeBuilder; + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("dns:wikipedia").to("mock:result"); + } + }; } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/d1492924/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala index 8b0fc72..de41409 100644 --- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala +++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala @@ -16,6 +16,7 @@ */ package org.apache.camel.scala.dsl +import org.apache.camel.RoutesBuilder import org.apache.camel.ServiceStatus import org.apache.camel.ServiceStatus.{Started, Stopped} import org.apache.camel.builder.RouteBuilder @@ -26,7 +27,7 @@ import org.scalatest.{BeforeAndAfterAll, FunSuiteLike} class AutoStartupTest extends CamelTestSupport with FunSuiteLike with BeforeAndAfterAll { - override protected def createRouteBuilders(): Array[RouteBuilder] = { + override protected def createRouteBuilders(): Array[RoutesBuilder] = { Array( createRoute(_ from s"direct:start1" id withoutDslRouteId to "mock:output"), createRoute(_ from s"direct:start2" autoStartup false id booleanDslRouteId to "mock:output"),
