You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/12/15 13:07:25 UTC
tomee git commit: random port for ZEjbdTest
Repository: tomee
Updated Branches:
refs/heads/master aebb0e59a -> 049136d13
random port for ZEjbdTest
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/049136d1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/049136d1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/049136d1
Branch: refs/heads/master
Commit: 049136d13386d32796dc73bdf454d745199d8b5b
Parents: aebb0e5
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Tue Dec 15 13:07:32 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Tue Dec 15 13:07:32 2015 +0100
----------------------------------------------------------------------
.../test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/049136d1/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
index 8c0fb7b..a82aee2 100644
--- a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
+++ b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
@@ -20,7 +20,6 @@ import org.apache.openejb.client.RemoteInitialContextFactory;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.ServiceDaemon;
import org.apache.openejb.server.ServiceManager;
@@ -28,6 +27,7 @@ import org.apache.openejb.server.SimpleServiceManager;
import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testing.RandomPort;
import org.apache.openejb.util.reflection.Reflections;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,6 +43,8 @@ import static org.junit.Assert.assertTrue;
@EnableServices("ejbd")
@RunWith(ApplicationComposer.class)
public class ZEjbdTest {
+ @RandomPort("ejbd")
+ private int ejbd;
@Configuration
public Properties configuration() {
@@ -82,10 +84,9 @@ public class ZEjbdTest {
}
private void remoteCall(final String scheme) throws NamingException {
- final int port = SystemInstance.get().getOptions().get("ejbd.port", 4201);
final Context ctx = new InitialContext(new Properties() {{
setProperty(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName());
- setProperty(Context.PROVIDER_URL, scheme + "://localhost:" + port + "?connectTimeout=1000&readTimeout=1000");
+ setProperty(Context.PROVIDER_URL, scheme + "://localhost:" + ejbd + "?connectTimeout=1000&readTimeout=1000");
}});
assertEquals("hello", ((AppClientTest.OrangeBusinessRemote) ctx.lookup("OrangeRemote")).echo("olleh"));
}