Repository: camel Updated Branches: refs/heads/master 56945ab9b -> 2774eda16
CAMEL-7669: jms unit tests no need for connection pool for vm connection tests. Other tests should start|stop connection pool. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/500dcd08 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/500dcd08 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/500dcd08 Branch: refs/heads/master Commit: 500dcd08e3dde873cb23baf7a2ecd5a29b986b40 Parents: 56945ab Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Aug 7 20:37:49 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Aug 7 20:37:49 2014 +0200 ---------------------------------------------------------------------- .../camel/component/jms/CamelJmsTestHelper.java | 24 +++++++++----------- ...uestReplyTempQueueMultipleConsumersTest.java | 2 +- .../component/jms/JmsTransactedRouteTest.java | 2 +- .../component/jms/ManagedJmsEndpointTest.java | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/500dcd08/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java index 8c81f3e..e8d1b3a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java @@ -36,6 +36,14 @@ public final class CamelJmsTestHelper { private CamelJmsTestHelper() { } + public static PooledConnectionFactory createPooledConnectionFactory() { + ConnectionFactory cf = createConnectionFactory(null); + PooledConnectionFactory pooled = new PooledConnectionFactory(); + pooled.setConnectionFactory(cf); + pooled.setMaxConnections(8); + return pooled; + } + public static ConnectionFactory createConnectionFactory() { return createConnectionFactory(null); } @@ -52,17 +60,12 @@ public final class CamelJmsTestHelper { connectionFactory.setCopyMessageOnSend(false); connectionFactory.setOptimizeAcknowledge(true); connectionFactory.setOptimizedMessageDispatch(true); - - // When using asyncSend, producers will not be guaranteed to send in the order we + // When using asyncSend, producers will not be guaranteed to send in the order we // have in the tests (which may be confusing for queues) so we need this set to false. // Another way of guaranteeing order is to use persistent messages or transactions. connectionFactory.setUseAsyncSend(false); - connectionFactory.setAlwaysSessionAsync(false); - // use a pooled connection factory - PooledConnectionFactory pooled = new PooledConnectionFactory(connectionFactory); - pooled.setMaxConnections(8); - return pooled; + return connectionFactory; } public static ConnectionFactory createPersistentConnectionFactory() { @@ -88,12 +91,7 @@ public final class CamelJmsTestHelper { connectionFactory.setCopyMessageOnSend(false); connectionFactory.setOptimizeAcknowledge(true); connectionFactory.setOptimizedMessageDispatch(true); - connectionFactory.setUseAsyncSend(true); connectionFactory.setAlwaysSessionAsync(false); - - // use a pooled connection factory - PooledConnectionFactory pooled = new PooledConnectionFactory(connectionFactory); - pooled.setMaxConnections(8); - return pooled; + return connectionFactory; } } http://git-wip-us.apache.org/repos/asf/camel/blob/500dcd08/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java index 66b3ff9..cb2a67a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java @@ -86,7 +86,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); - connectionFactory = (PooledConnectionFactory) CamelJmsTestHelper.createConnectionFactory(); + connectionFactory = CamelJmsTestHelper.createPooledConnectionFactory(); camelContext.addComponent("jms", jmsComponentAutoAcknowledge(connectionFactory)); return camelContext; http://git-wip-us.apache.org/repos/asf/camel/blob/500dcd08/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java index 5a18ae2..9f47d3d 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java @@ -59,7 +59,7 @@ public class JmsTransactedRouteTest extends CamelTestSupport { return new RouteBuilder() { public void configure() throws Exception { from("activemq:test.a").to("activemq:test.b"); - from("activemq:test.b").to("mock:result"); + from("activemq:test.b").to("log:result", "mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/500dcd08/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java index 34ab04f..c06e620 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java @@ -41,7 +41,7 @@ public class ManagedJmsEndpointTest extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext context = new DefaultCamelContext(); - ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory(); + ConnectionFactory connectionFactory = CamelJmsTestHelper.createPersistentConnectionFactory(); context.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory)); return context;
