Author: andygumbrecht
Date: Tue Jul 15 16:22:19 2014
New Revision: 1610742
URL: http://svn.apache.org/r1610742
Log:
LegacyClientTest - Kill all after test.
AsyncPostContructTest - 1ms is quite a long time
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/AsyncPostContructTest.java
tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/AsyncPostContructTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/AsyncPostContructTest.java?rev=1610742&r1=1610741&r2=1610742&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/AsyncPostContructTest.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/AsyncPostContructTest.java
Tue Jul 15 16:22:19 2014
@@ -16,10 +16,12 @@
*/
package org.apache.openejb.core.singleton;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Module;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,6 +40,12 @@ import static org.testng.Assert.assertTr
@RunWith(ApplicationComposer.class)
public class AsyncPostContructTest {
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@EJB
private BuildMeAsync buildMeAsync;
@@ -50,9 +58,9 @@ public class AsyncPostContructTest {
@Test
public void postConstructShouldEndsBeforeAsyncCall() {
- final long start = buildMeAsync.getStartEnd();
+ final long constructed = buildMeAsync.getStartEnd();
final long async = buildMeAsync.getAsyncStart();
- assertTrue(async > start);
+ assertTrue(async >= constructed);
assertSame(buildMeAsync.getAsyncInstance(),
buildMeAsync.getAsyncInstance());
}
@@ -77,12 +85,12 @@ public class AsyncPostContructTest {
} catch (final InterruptedException e) {
// no-op
}
- startEnd = System.currentTimeMillis();
+ startEnd = System.nanoTime();
}
@Asynchronous
public Future<Boolean> async() {
- asyncStart = System.currentTimeMillis();
+ asyncStart = System.nanoTime();
asyncInstance = this;
return new AsyncResult<Boolean>(true);
}
Modified:
tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java?rev=1610742&r1=1610741&r2=1610742&view=diff
==============================================================================
---
tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
(original)
+++
tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
Tue Jul 15 16:22:19 2014
@@ -26,6 +26,7 @@ import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Zips;
import org.apache.openejb.server.control.StandaloneServer;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Test;
@@ -53,7 +54,9 @@ import static org.apache.openejb.util.Ne
public class LegacyClientTest {
- static final Logger logger = Logger.getLogger("org.apache.openejb.client");
+ private static final Map<String, StandaloneServer> servers = new
HashMap<String, StandaloneServer>();
+ private static StandaloneServer root = null;
+ private static final Logger logger =
Logger.getLogger("org.apache.openejb.client");
static {
final ConsoleHandler consoleHandler = new ConsoleHandler();
@@ -63,6 +66,27 @@ public class LegacyClientTest {
logger.setUseParentHandlers(false);
}
+ @AfterClass
+ public static void afterClass() {
+
+ for (final Map.Entry<String, StandaloneServer> entry :
servers.entrySet()) {
+ try {
+ final StandaloneServer server = entry.getValue();
+ server.kill();
+ } catch (final Throwable t) {
+ //Ignore
+ }
+ }
+
+ if (null != root) {
+ try {
+ root.kill();
+ } catch (final Throwable t) {
+ //Ignore
+ }
+ }
+ }
+
@Test
public void test() throws Exception {
@@ -76,35 +100,34 @@ public class LegacyClientTest {
final File dir = Files.tmpdir();
- final StandaloneServer root;
- {
- final String name = "root";
- final File home = new File(dir, name);
+ final String rootname = "root";
+ final File roothome = new File(dir, rootname);
- Files.mkdir(home);
- Zips.unzip(zip, home, true);
+ Files.mkdir(roothome);
+ Zips.unzip(zip, roothome, true);
+
+ root = new StandaloneServer(roothome, roothome);
- root = new StandaloneServer(home, home);
root.killOnExit();
root.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
root.ignoreOut();
- root.setProperty("name", name);
+ root.setProperty("name", rootname);
root.setProperty("openejb.extract.configuration", "false");
- final StandaloneServer.ServerService multipoint =
root.getServerService("multipoint");
+ StandaloneServer.ServerService multipoint =
root.getServerService("multipoint");
multipoint.setBind("localhost");
multipoint.setPort(getNextAvailablePort());
multipoint.setDisabled(false);
- multipoint.set("discoveryName", name);
+ multipoint.set("discoveryName", rootname);
logger.info("Starting Root server");
root.start();
- }
+
final Services services = new Services();
Client.addEventObserver(services);
- final Map<String, StandaloneServer> servers = new HashMap<String,
StandaloneServer>();
+
for (final String name : new String[]{"red", "green", "blue"}) {
final File home = new File(dir, name);
@@ -132,7 +155,7 @@ public class LegacyClientTest {
services.add(uri);
server.getContext().set(URI.class, uri);
- final StandaloneServer.ServerService multipoint =
server.getServerService("multipoint");
+ multipoint = server.getServerService("multipoint");
multipoint.setPort(getNextAvailablePort());
multipoint.setDisabled(false);
multipoint.set("discoveryName", name);
@@ -163,7 +186,7 @@ public class LegacyClientTest {
final URI serverURI = server.getContext().get(URI.class);
logger.info("Waiting for updated list");
- services.assertServices(30, TimeUnit.SECONDS, new
CalculatorCallable(bean), 500);
+ services.assertServices(1, TimeUnit.MINUTES, new
CalculatorCallable(bean), 500);
logger.info("Asserting balance");
assertBalance(bean, services.get().size());
@@ -196,7 +219,7 @@ public class LegacyClientTest {
services.add(serverURI);
logger.info("Waiting for updated list");
- services.assertServices(30, TimeUnit.SECONDS, new
CalculatorCallable(bean), 500);
+ services.assertServices(1, TimeUnit.MINUTES, new
CalculatorCallable(bean), 500);
logger.info("Asserting balance");
assertBalance(bean, services.get().size());
@@ -243,8 +266,6 @@ public class LegacyClientTest {
public static class Services {
- static final Logger logger =
Logger.getLogger(Services.class.getName());
-
private final ReentrantLock lock = new ReentrantLock();
private final Condition condition = lock.newCondition();
@@ -290,9 +311,9 @@ public class LegacyClientTest {
return diffs;
}
- public void assertServices(final long timeout, final TimeUnit unit,
final Callable callable) {
- assertServices(timeout, unit, callable, 10);
- }
+// public void assertServices(final long timeout, final TimeUnit unit,
final Callable callable) {
+// assertServices(timeout, unit, callable, 10);
+// }
public void assertServices(final long timeout, final TimeUnit unit,
final Callable callable, final int delay) {
final ClientThread client = new ClientThread(callable);
