Author: davsclaus
Date: Thu Jun 30 07:08:03 2011
New Revision: 1141417
URL: http://svn.apache.org/viewvc?rev=1141417&view=rev
Log:
Use dynamic ports in unit tests.
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java?rev=1141417&r1=1141416&r2=1141417&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
Thu Jun 30 07:08:03 2011
@@ -26,7 +26,9 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultMessage;
+import org.junit.Ignore;
+@Ignore("Run this test manually")
public class CometdProducerConsumerInOutInteractiveMain {
private static final String URI =
"cometd://127.0.0.1:9091/service/test?baseResource=file:./src/test/resources/webapp&"
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java?rev=1141417&r1=1141416&r2=1141417&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
Thu Jun 30 07:08:03 2011
@@ -30,7 +30,9 @@ import org.cometd.bayeux.server.BayeuxSe
import org.cometd.bayeux.server.ServerMessage;
import org.cometd.bayeux.server.ServerSession;
import org.cometd.server.DefaultSecurityPolicy;
+import org.junit.Ignore;
+@Ignore("Run this test manually")
public class CometdProducerConsumerInteractiveAuthenticatedMain {
private static final String URI =
"cometd://127.0.0.1:9091/channel/test?baseResource=file:./src/test/resources/webapp&"
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java?rev=1141417&r1=1141416&r2=1141417&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
Thu Jun 30 07:08:03 2011
@@ -27,7 +27,9 @@ import org.apache.camel.impl.DefaultCame
import org.cometd.bayeux.server.BayeuxServer;
import org.cometd.bayeux.server.ServerMessage;
import org.cometd.bayeux.server.ServerSession;
+import org.junit.Ignore;
+@Ignore("Run this test manually")
public class CometdProducerConsumerInteractiveExtensionMain {
private static final String URI =
"cometd://127.0.0.1:9091/channel/test?baseResource=file:./src/test/resources/webapp&"
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java?rev=1141417&r1=1141416&r2=1141417&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
Thu Jun 30 07:08:03 2011
@@ -22,7 +22,9 @@ import java.net.URI;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Ignore;
+@Ignore("Run this test manually")
public class CometdProducerConsumerInteractiveMain {
private static final String URI =
"cometd://127.0.0.1:9091/channel/test?baseResource=file:./src/test/resources/webapp&"
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java?rev=1141417&r1=1141416&r2=1141417&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
Thu Jun 30 07:08:03 2011
@@ -21,8 +21,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -30,8 +31,8 @@ import org.junit.Test;
*/
public class CometdProducerConsumerTest extends CamelTestSupport {
- private static final String URI =
"cometd://127.0.0.1:9080/service/test?baseResource=file:./target/test-classes/webapp&"
- +
"timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
+ private int port;
+ private String uri;
@Test
public void testProducer() throws Exception {
@@ -47,10 +48,13 @@ public class CometdProducerConsumerTest
}
@Override
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- stopCamelContext();
+ @Before
+ public void setUp() throws Exception {
+ port = AvailablePortFinder.getNextAvailable(23500);
+ uri = "cometd://127.0.0.1:" + port +
"/service/test?baseResource=file:./target/test-classes/webapp&"
+ +
"timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
+
+ super.setUp();
}
@Override
@@ -58,8 +62,9 @@ public class CometdProducerConsumerTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:input").to(URI);
- from(URI).to("mock:test");
+ from("direct:input").to(uri);
+
+ from(uri).to("mock:test");
}
};
}
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java?rev=1141417&r1=1141416&r2=1141417&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
Thu Jun 30 07:08:03 2011
@@ -22,8 +22,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -31,10 +32,9 @@ import org.junit.Test;
*/
public class SslCometdProducerConsumerTest extends CamelTestSupport {
- private static final String URI =
"cometds://127.0.0.1:9080/service/test?baseResource=file:./target/test-classes/webapp&"
- +
"timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
-
- protected String pwd = "changeit";
+ private int port;
+ private String uri;
+ private String pwd = "changeit";
@Test
public void testProducer() throws Exception {
@@ -50,10 +50,13 @@ public class SslCometdProducerConsumerTe
}
@Override
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- stopCamelContext();
+ @Before
+ public void setUp() throws Exception {
+ port = AvailablePortFinder.getNextAvailable(23500);
+ uri = "cometds://127.0.0.1:" + port +
"/service/test?baseResource=file:./target/test-classes/webapp&"
+ +
"timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
+
+ super.setUp();
}
@Override
@@ -67,8 +70,9 @@ public class SslCometdProducerConsumerTe
URL keyStoreUrl =
this.getClass().getClassLoader().getResource("jsse/localhost.ks");
component.setSslKeystore(keyStoreUrl.getPath());
- from("direct:input").to(URI);
- from(URI).to("mock:test");
+ from("direct:input").to(uri);
+
+ from(uri).to("mock:test");
}
};
}