This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 16d69fcfa29cacc4b82e33775a108f138e1fd939 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Aug 2 16:05:10 2019 +0200 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Itest --- .../java/org/apache/camel/itest/async/HttpAsyncDslTest.java | 11 ++++++----- .../apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java index 4b6180a..3c41d49 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java @@ -23,6 +23,7 @@ import org.apache.camel.component.jms.JmsComponent; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.itest.CamelJmsTestHelper; import org.apache.camel.spi.Registry; +import org.apache.camel.support.SimpleRegistry; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Before; import org.junit.Test; @@ -73,11 +74,11 @@ public class HttpAsyncDslTest extends CamelTestSupport { } @Override - protected JndiRegistry createRegistry() throws Exception { - JndiRegistry jndi = super.createRegistry(); - jndi.bind("validateOrder", new MyValidateOrderBean()); - jndi.bind("handleOrder", new MyHandleOrderBean()); - return jndi; + protected Registry createCamelRegistry() throws Exception { + Registry registry = new SimpleRegistry(); + registry.bind("validateOrder", new MyValidateOrderBean()); + registry.bind("handleOrder", new MyHandleOrderBean()); + return registry; } @Override diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java index dd94d30..91d20d1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java @@ -27,6 +27,8 @@ import javax.net.SocketFactory; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.spi.Registry; +import org.apache.camel.support.SimpleRegistry; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.commons.net.ftp.FTPClient; import org.junit.After; @@ -134,8 +136,8 @@ public class FtpInitialConnectTimeoutTest extends CamelTestSupport { } @Override - protected JndiRegistry createRegistry() throws Exception { - JndiRegistry registry = super.createRegistry(); + protected Registry createCamelRegistry() throws Exception { + Registry registry = new SimpleRegistry(); registry.bind("mocked", mockedClient()); return registry; }
