Author: rmannibucau
Date: Sun Jul 13 11:22:57 2014
New Revision: 1610166
URL: http://svn.apache.org/r1610166
Log:
cleaning up few tests but keeping them run in separate jvm since they can
change the jvm config
Modified:
tomee/tomee/trunk/server/openejb-ejbd/pom.xml
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/PropertiesPropogationTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
Modified: tomee/tomee/trunk/server/openejb-ejbd/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/pom.xml?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/pom.xml Sun Jul 13 11:22:57 2014
@@ -58,6 +58,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <reuseForks>false</reuseForks>
<!-- DEBUG: Uncomment this line and comment out the next -->
<!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
<argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"
-Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api.
-Dopenejb.classloader.forced-load=org.apache.openejb</argLine>
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
Sun Jul 13 11:22:57 2014
@@ -115,6 +115,9 @@ public class AppClientTest extends TestC
assertTrue(global instanceof OrangeBusinessRemote);
OrangeBusinessRemote globalOrangeBusinessRemote =
(OrangeBusinessRemote) global;
assertEquals("nap", globalOrangeBusinessRemote.echo("pan"));
+
+ serviceDaemon.stop();
+ OpenEJB.destroy();
}
public static interface OrangeHome extends EJBHome {
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java
Sun Jul 13 11:22:57 2014
@@ -90,6 +90,9 @@ public class DynamicConnectionStrategyTe
remote.echo("foo");
assertTrue(TestConnectionStrategy.called.get());
+
+ serviceDaemon.stop();
+ OpenEJB.destroy();
}
@Remote
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java
Sun Jul 13 11:22:57 2014
@@ -61,5 +61,8 @@ public class EjbdJmxTest {
for (MBeanAttributeInfo info : beanInfo.getAttributes()) {
System.out.println(info);
}
+
+ service.stop();
+ OpenEJB.destroy();
}
}
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java
Sun Jul 13 11:22:57 2014
@@ -90,6 +90,9 @@ public class FailoverConnectionFactoryTe
remote.echo("foo");
assertTrue(TestConnectionStrategy.called.get());
+
+ serviceDaemon.stop();
+ OpenEJB.destroy();
}
@Remote
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java
Sun Jul 13 11:22:57 2014
@@ -158,6 +158,8 @@ public class FailoverTest extends TestCa
assertEquals(Host.RED, target.getHost());
+ red.stop();
+ OpenEJB.destroy();
}
private TargetRemote getBean(final ServerService server) throws
NamingException, IOException, OpenEJBException {
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java
Sun Jul 13 11:22:57 2014
@@ -32,6 +32,8 @@ import javax.ejb.Remote;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
@@ -136,23 +138,29 @@ public class KeepAilveTest extends TestC
final int threads = 1;
final CountDownLatch latch = new CountDownLatch(threads);
+ final Collection<Thread> th = new ArrayList<>(threads);
for (int i = 0; i < threads; i++) {
final Client client = new Client(latch, i, port);
- thread(client, false);
+ th.add(thread(client, false));
}
final boolean await = latch.await(60, TimeUnit.SECONDS);
assertTrue(await);
+
+ for (final Thread t : th) {
+ t.join(1000);
+ }
} finally {
serviceDaemon.stop();
OpenEJB.destroy();
}
}
- public static void thread(final Runnable runnable, final boolean daemon) {
+ public static Thread thread(final Runnable runnable, final boolean daemon)
{
final Thread thread = new Thread(runnable);
thread.setDaemon(daemon);
thread.start();
+ return thread;
}
public static class Client implements Runnable {
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
Sun Jul 13 11:22:57 2014
@@ -35,6 +35,8 @@ import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.naming.Context;
import javax.naming.InitialContext;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -76,8 +78,10 @@ public class MultithreadTest {
// -- READY --
// How much ever the no of client invocations the count should be 10
as only 10 instances will be created.
+ final Collection<Thread> threads = new ArrayList<>(30);
for (int i = 0; i < 30; i++) {
final Thread t = new Thread(r);
+ threads.add(t);
t.start();
}
@@ -98,6 +102,9 @@ public class MultithreadTest {
assertEquals(10, CounterBean.instances.get());
+ for (final Thread t : threads) {
+ t.join(1000);
+ }
}
@Test
@@ -120,8 +127,10 @@ public class MultithreadTest {
// -- READY --
// 30 instances should be created and discarded.
+ final Collection<Thread> threads = new ArrayList<>(30);
for (int i = 0; i < 30; i++) {
final Thread t = new Thread(r);
+ threads.add(t);
t.start();
}
@@ -129,6 +138,10 @@ public class MultithreadTest {
final int count = CounterBean.discardedInstances.get();
assertTrue("Timeout after 10s. CountDownLatch: " + count + " of 30
invocations", success);
assertEquals(30, CounterBean.discardedInstances.get());
+
+ for (final Thread t : threads) {
+ t.join(1000);
+ }
}
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@@ -159,8 +172,10 @@ public class MultithreadTest {
comment("On your mark!");
+ final Collection<Thread> threads = new ArrayList<>(20);
for (int i = 0; i < 20; i++) {
final Thread t = new Thread(r);
+ threads.add(t);
t.start();
}
@@ -182,6 +197,10 @@ public class MultithreadTest {
comment("Go!");
startPistol.countDown(); // go
+
+ for (final Thread t : threads) {
+ t.join(1000);
+ }
}
@After
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/PropertiesPropogationTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/PropertiesPropogationTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/PropertiesPropogationTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/PropertiesPropogationTest.java
Sun Jul 13 11:22:57 2014
@@ -113,6 +113,9 @@ public class PropertiesPropogationTest e
// The openejb.client.color property should have been propogated
assertTrue(properties.containsKey("openejb.client.color"));
assertEquals("red", properties.getProperty("openejb.client.color"));
+
+ serviceDaemon.stop();
+ OpenEJB.destroy();
}
@Remote
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
Sun Jul 13 11:22:57 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.server.ejbd;
+import org.apache.openejb.server.ServiceManager;
import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.openejb.OpenEJB;
@@ -49,8 +50,8 @@ public class Server2ServerEjbRefTest ext
initProps.setProperty("openejb.deployments.classpath.filter.descriptors",
"true");
OpenEJB.init(initProps, new ServerFederation());
- final int blue = server();
- final int orange = server();
+ final ServiceDaemon blue = server();
+ final ServiceDaemon orange = server();
final Assembler assembler =
SystemInstance.get().getComponent(Assembler.class);
final ConfigurationFactory config = new ConfigurationFactory();
@@ -58,7 +59,7 @@ public class Server2ServerEjbRefTest ext
final JndiProvider jndiProvider = new JndiProvider("orange");
final Properties p = jndiProvider.getProperties();
p.setProperty(Context.INITIAL_CONTEXT_FACTORY,
RemoteInitialContextFactory.class.getName());
- p.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" + orange);
+ p.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" +
orange.getPort());
final JndiContextInfo contextInfo =
config.configureService(jndiProvider, JndiContextInfo.class);
assembler.createExternalContext(contextInfo);
@@ -84,16 +85,19 @@ public class Server2ServerEjbRefTest ext
// Lets look it up the normal way to be sure it can work
final Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,
RemoteInitialContextFactory.class.getName());
- properties.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" +
blue);
+ properties.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" +
blue.getPort());
final InitialContext initialContext = new
InitialContext(properties);
final BlueRemote blueBeanRemote = (BlueRemote)
initialContext.lookup("BlueBeanRemote");
assertNotNull(blueBeanRemote);
blueBeanRemote.hasOrangeRemote();
}
+ blue.stop();
+ orange.stop();
+ OpenEJB.destroy();
}
- private int server() throws Exception {
+ private ServiceDaemon server() throws Exception {
final EjbServer ejbServer = new EjbServer();
ejbServer.init(new Properties());
@@ -101,7 +105,7 @@ public class Server2ServerEjbRefTest ext
final ServiceDaemon serviceDaemon = new ServiceDaemon(pool, 0,
"localhost");
serviceDaemon.start();
- return serviceDaemon.getPort();
+ return serviceDaemon;
}
public static class OrangeBean implements OrangeRemote {
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java
Sun Jul 13 11:22:57 2014
@@ -120,7 +120,6 @@ public class StaticFailoverTest extends
System.out.println(counter.hit());
System.out.println(counter.hit());
System.out.println(counter.hit());
-
}
@Override
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
Sun Jul 13 11:22:57 2014
@@ -108,6 +108,9 @@ public class UberInterfaceTest extends T
assertEquals(reference, local.echo(reference));
assertSame(reference, local.echo(reference)); // pass by reference
}
+
+ serviceDaemon.stop();
+ OpenEJB.destroy();
}
@Local
Modified:
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java?rev=1610166&r1=1610165&r2=1610166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java
Sun Jul 13 11:22:57 2014
@@ -49,6 +49,7 @@ public class ZEjbdTest {
public Properties configuration() {
final Properties configuration = new Properties();
configuration.setProperty("ejbd.gzip", "true");
+ configuration.setProperty("openejb.client.connection.socket.read",
"1000");
return configuration;
}
@@ -85,7 +86,7 @@ public class ZEjbdTest {
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);
+ setProperty(Context.PROVIDER_URL, scheme + "://localhost:" + port
+ "?connectTimeout=1000&readTimeout=1000");
}});
assertEquals("hello", ((AppClientTest.OrangeBusinessRemote)
ctx.lookup("OrangeRemote")).echo("olleh"));
}
