Use dynamic port number for testing.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4ad5ea6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4ad5ea6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4ad5ea6 Branch: refs/heads/camel-2.12.x Commit: c4ad5ea68a545da439e49be1fd2986240da9532b Parents: 5a274ea Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Oct 13 11:14:06 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Oct 13 11:14:29 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/stomp/StompBaseTest.java | 6 +++++- .../org/apache/camel/component/stomp/StompConsumerTest.java | 2 +- .../apache/camel/component/stomp/StompConsumerUriTest.java | 7 +------ .../org/apache/camel/component/stomp/StompProducerTest.java | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c4ad5ea6/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java index 3193c86..643787b 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java @@ -17,19 +17,23 @@ package org.apache.camel.component.stomp; import org.apache.activemq.broker.BrokerService; +import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; public abstract class StompBaseTest extends CamelTestSupport { protected BrokerService brokerService; protected int numberOfMessages = 100; + protected int port; protected int getPort() { - return 61613; + return port; } @Override public void setUp() throws Exception { + port = AvailablePortFinder.getNextAvailable(61613); + brokerService = new BrokerService(); brokerService.setPersistent(false); brokerService.setAdvisorySupport(false); http://git-wip-us.apache.org/repos/asf/camel/blob/c4ad5ea6/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java index a2def8c..894cc4c 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java @@ -34,7 +34,7 @@ public class StompConsumerTest extends StompBaseTest { @Test public void testConsume() throws Exception { - Stomp stomp = new Stomp("tcp://localhost:61613"); + Stomp stomp = new Stomp("tcp://localhost:" + getPort()); final BlockingConnection producerConnection = stomp.connectBlocking(); MockEndpoint mock = getMockEndpoint("mock:result"); http://git-wip-us.apache.org/repos/asf/camel/blob/c4ad5ea6/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java index a87e943..fa3aa08 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java @@ -32,11 +32,6 @@ import static org.fusesource.stomp.client.Constants.SEND; public class StompConsumerUriTest extends StompBaseTest { - @Override - protected int getPort() { - return 61614; - } - @Test public void testConsume() throws Exception { Stomp stomp = new Stomp("tcp://localhost:" + getPort()); @@ -60,7 +55,7 @@ public class StompConsumerUriTest extends StompBaseTest { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - from("stomp:queue:test?brokerURL=tcp://localhost:61614") + from("stomp:queue:test?brokerURL=tcp://localhost:" + getPort()) .transform(body().convertToString()) .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/c4ad5ea6/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java index fc878ea..f933423 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java @@ -35,7 +35,7 @@ public class StompProducerTest extends StompBaseTest { @Test public void testProduce() throws Exception { - Stomp stomp = new Stomp("tcp://localhost:61613"); + Stomp stomp = new Stomp("tcp://localhost:" + getPort()); final BlockingConnection subscribeConnection = stomp.connectBlocking(); StompFrame frame = new StompFrame(SUBSCRIBE);
