Updated Branches: refs/heads/camel-2.12.x c62270f15 -> 3b2da77ea
Fixed tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b2da77e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b2da77e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b2da77e Branch: refs/heads/camel-2.12.x Commit: 3b2da77ea196fcf012907d6fdba1db327a380ec2 Parents: c62270f Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Oct 22 11:51:00 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Oct 22 11:53:51 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/jms/CamelJmsTestHelper.java | 5 +++++ .../apache/camel/component/jms/TwoConsumerOnSameQueueTest.java | 6 +++--- .../apache/camel/component/jms/TwoConsumerOnSameTopicTest.java | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3b2da77e/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 8b9721c..8c81f3e 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 @@ -16,11 +16,13 @@ */ package org.apache.camel.component.jms; +import java.io.File; import java.util.concurrent.atomic.AtomicInteger; import javax.jms.ConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.pool.PooledConnectionFactory; +import org.apache.camel.util.FileUtil; /** * A helper for unit testing with Apache ActiveMQ as embedded JMS broker. @@ -74,6 +76,9 @@ public final class CamelJmsTestHelper { // use an unique data directory in target String dir = "target/activemq-data-" + id; + // remove dir so its empty on startup + FileUtil.removeDir(new File(dir)); + String url = "vm://test-broker-" + id + "?broker.persistent=true&broker.useJmx=false&broker.dataDirectory=" + dir; if (options != null) { url = url + "&" + options; http://git-wip-us.apache.org/repos/asf/camel/blob/3b2da77e/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java index ecc7ebe..e60781f 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java @@ -92,7 +92,7 @@ public class TwoConsumerOnSameQueueTest extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); - ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory(); + ConnectionFactory connectionFactory = CamelJmsTestHelper.createPersistentConnectionFactory(); camelContext.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory)); return camelContext; @@ -104,10 +104,10 @@ public class TwoConsumerOnSameQueueTest extends CamelTestSupport { @Override public void configure() throws Exception { from("activemq:queue:foo").routeId("a") - .to("mock:a"); + .to("log:a", "mock:a"); from("activemq:queue:foo").routeId("b") - .to("mock:b"); + .to("log:b", "mock:b"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/3b2da77e/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java index 90d02fc..d6c7352 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java @@ -121,10 +121,10 @@ public class TwoConsumerOnSameTopicTest extends CamelTestSupport { @Override public void configure() throws Exception { from("activemq:topic:foo").routeId("a") - .to("mock:a"); + .to("log:a", "mock:a"); from("activemq:topic:foo").routeId("b") - .to("mock:b"); + .to("log:b", "mock:b"); } }; }
