Repository: camel Updated Branches: refs/heads/camel-2.14.x 339521179 -> 56fa1bc54 refs/heads/camel-2.15.x 3e112488b -> 7ed9589af
CAMEL-8541: camel-test CDI compliant Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ed9589a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ed9589a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ed9589a Branch: refs/heads/camel-2.15.x Commit: 7ed9589afa2ac65a81ca1e074b59d0a40cbb28ba Parents: 3e11248 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 25 13:11:05 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 25 13:12:37 2015 +0100 ---------------------------------------------------------------------- .../camel/component/jms/JmsDefaultTaskExecutorTypeTest.java | 2 +- .../org/apache/camel/component/jms/JmsRouteRequestReplyTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7ed9589a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java index 7ca513f..d16291a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java @@ -124,7 +124,7 @@ public class JmsDefaultTaskExecutorTypeTest extends CamelTestSupport { jmsComponent.getConfiguration().setConcurrentConsumers(3); jmsComponent.getConfiguration().setMaxConcurrentConsumers(10); jmsComponent.getConfiguration().setReceiveTimeout(50); - if ("testDefaultTaskExecutorThreadPoolAtComponentConfig".equals(testName.getMethodName())) { + if ("testDefaultTaskExecutorThreadPoolAtComponentConfig".equals(getTestMethodName())) { jmsComponent.getConfiguration().setDefaultTaskExecutorType(DefaultTaskExecutorType.ThreadPool); } camelContext.addComponent("activemq", jmsComponent); http://git-wip-us.apache.org/repos/asf/camel/blob/7ed9589a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java index 96ce4ca..d3a557e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java @@ -475,10 +475,10 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); - return contextBuilders.get(testName.getMethodName()).buildContext(camelContext); + return contextBuilders.get(getTestMethodName()).buildContext(camelContext); } protected RouteBuilder createRouteBuilder() throws Exception { - return routeBuilders.get(testName.getMethodName()); + return routeBuilders.get(getTestMethodName()); } }
