Author: davsclaus
Date: Fri Jun 15 08:17:57 2012
New Revision: 1350518
URL: http://svn.apache.org/viewvc?rev=1350518&view=rev
Log:
Use dynamic ports in testing
Modified:
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteEndpointTest.java
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
Modified:
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java?rev=1350518&r1=1350517&r2=1350518&view=diff
==============================================================================
---
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
(original)
+++
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
Fri Jun 15 08:17:57 2012
@@ -25,6 +25,7 @@ import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -33,22 +34,23 @@ import org.junit.Test;
*/
public class RmiConcurrencyTest extends CamelTestSupport {
- private static boolean created;
+ private int port;
protected int getPort() {
- return 37543;
+ if (port == 0) {
+ port = AvailablePortFinder.getNextAvailable(37500);
+ }
+ return port;
}
+
@Override
protected JndiRegistry createRegistry() throws Exception {
if (classPathHasSpaces()) {
return null;
}
- if (!created) {
- LocateRegistry.createRegistry(getPort());
- created = true;
- }
+ LocateRegistry.createRegistry(getPort());
JndiRegistry context = super.createRegistry();
context.bind("echo", new EchoService());
@@ -95,12 +97,12 @@ public class RmiConcurrencyTest extends
@Override
public void configure() throws Exception {
// setup the jmi server endpoint
- RmiEndpoint echo =
(RmiEndpoint)endpoint("rmi://localhost:37543/echo");
+ RmiEndpoint echo = (RmiEndpoint)endpoint("rmi://localhost:" +
getPort() + "/echo");
echo.setRemoteInterfaces(IEcho.class);
from(echo).to("bean:echo");
// and our route where we call the server
-
from("direct:echo").to("rmi://localhost:37543/echo?method=echo").to("mock:result");
+ from("direct:echo").toF("rmi://localhost:%s/echo?method=echo",
getPort()).to("mock:result");
}
};
}
Modified:
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java?rev=1350518&r1=1350517&r2=1350518&view=diff
==============================================================================
---
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
(original)
+++
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
Fri Jun 15 08:17:57 2012
@@ -23,6 +23,7 @@ import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -31,10 +32,13 @@ import org.junit.Test;
*/
public class RmiDamnExceptionTest extends CamelTestSupport {
- private static boolean created;
+ private int port;
protected int getPort() {
- return 37544;
+ if (port == 0) {
+ port = AvailablePortFinder.getNextAvailable(37501);
+ }
+ return port;
}
@Override
@@ -43,10 +47,7 @@ public class RmiDamnExceptionTest extend
return null;
}
- if (!created) {
- LocateRegistry.createRegistry(getPort());
- created = true;
- }
+ LocateRegistry.createRegistry(getPort());
JndiRegistry context = super.createRegistry();
context.bind("echo", new EchoService());
@@ -78,12 +79,12 @@ public class RmiDamnExceptionTest extend
@Override
public void configure() throws Exception {
// setup the jmi server endpoint
- RmiEndpoint echo =
(RmiEndpoint)endpoint("rmi://localhost:37544/echo");
+ RmiEndpoint echo = (RmiEndpoint)endpoint("rmi://localhost:" +
getPort() + "/echo");
echo.setRemoteInterfaces(IEcho.class);
from(echo).to("bean:echo");
// and our route where we call the server
-
from("direct:echo").to("rmi://localhost:37544/echo?method=damn").to("mock:result");
+ from("direct:echo").toF("rmi://localhost:%s/echo?method=damn",
getPort()).to("mock:result");
}
};
}
Modified:
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteEndpointTest.java?rev=1350518&r1=1350517&r2=1350518&view=diff
==============================================================================
---
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteEndpointTest.java
(original)
+++
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteEndpointTest.java
Fri Jun 15 08:17:57 2012
@@ -20,16 +20,13 @@ import java.net.URI;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
/**
* @version
*/
public class RmiRouteEndpointTest extends RmiRouteTest {
- protected int getPort() {
- return 37542;
- }
-
@Override
protected RouteBuilder getRouteBuilder(final CamelContext context) {
return new RouteBuilder() {
@@ -37,7 +34,7 @@ public class RmiRouteEndpointTest extend
public void configure() throws Exception {
RmiEndpoint say = new RmiEndpoint();
say.setCamelContext(context);
- say.setUri(new URI("rmi://localhost:37542/bye"));
+ say.setUri(new URI("rmi://localhost:" + getPort() + "/bye"));
from("direct:hello").to(say);
@@ -46,7 +43,7 @@ public class RmiRouteEndpointTest extend
RmiEndpoint bye = new RmiEndpoint();
bye.setCamelContext(context);
bye.setRemoteInterfaces(ISay.class);
- bye.setUri(new URI("rmi://localhost:37542/bye"));
+ bye.setUri(new URI("rmi://localhost:" + getPort() + "/bye"));
from(bye).to("bean:bye");
}
Modified:
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java?rev=1350518&r1=1350517&r2=1350518&view=diff
==============================================================================
---
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
(original)
+++
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
Fri Jun 15 08:17:57 2012
@@ -25,6 +25,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.ProxyHelper;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.util.jndi.JndiContext;
import org.junit.Assert;
import org.junit.Test;
@@ -34,8 +35,13 @@ import org.junit.Test;
*/
public class RmiRouteTest extends Assert {
+ private int port;
+
protected int getPort() {
- return 37541;
+ if (port == 0) {
+ port = AvailablePortFinder.getNextAvailable(37502);
+ }
+ return port;
}
@Test
@@ -73,11 +79,11 @@ public class RmiRouteTest extends Assert
// START SNIPPET: route
// lets add simple route
public void configure() {
- from("direct:hello").to("rmi://localhost:37541/bye");
+ from("direct:hello").toF("rmi://localhost:%s/bye", getPort());
// When exposing an RMI endpoint, the interfaces it exposes
must
// be configured.
- RmiEndpoint bye =
(RmiEndpoint)endpoint("rmi://localhost:37541/bye");
+ RmiEndpoint bye = (RmiEndpoint)endpoint("rmi://localhost:" +
getPort() + "/bye");
bye.setRemoteInterfaces(ISay.class);
from(bye).to("bean:bye");
}
