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/04/12 09:42:19 UTC
tomee git commit: fixing few tests
Repository: tomee
Updated Branches:
refs/heads/master 924b428a3 -> 466e9cf55
fixing few tests
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/466e9cf5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/466e9cf5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/466e9cf5
Branch: refs/heads/master
Commit: 466e9cf55037a6498b93a85682927d9bfbb31a2a
Parents: 924b428
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Apr 12 09:42:06 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Apr 12 09:42:06 2015 +0200
----------------------------------------------------------------------
.../org/apache/openejb/config/AnnotationDeployer.java | 2 +-
.../openejb/config/BuiltInEnvironmentEntries.java | 14 +++++++++++---
.../config/AutoConfigPersistenceUnitsTest.java | 2 ++
.../openejb/config/ConfigurationFactoryTest.java | 2 ++
.../java/org/apache/openejb/timer/GetTimerTest.java | 6 +++---
.../timer/QuartzPersistenceForEJBTimersTest.java | 6 +++---
6 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/466e9cf5/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index c47e3b1..32e3179 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -357,7 +357,7 @@ public class AnnotationDeployer implements DynamicDeployer {
public AnnotationDeployer() {
discoverAnnotatedBeans = new DiscoverAnnotatedBeans();
processAnnotatedBeans = new ProcessAnnotatedBeans(SystemInstance.get().getOptions().get("openejb.jaxws.add-remote", false));
- builtInEnvironmentEntries = new BuiltInEnvironmentEntries();
+ builtInEnvironmentEntries = new BuiltInEnvironmentEntries(SystemInstance.get().getOptions().get("openejb.environment.default", true));
envEntriesPropertiesDeployer = new EnvEntriesPropertiesDeployer();
mBeanDeployer = new MBeanDeployer();
mergeWebappJndiContext = new MergeWebappJndiContext();
http://git-wip-us.apache.org/repos/asf/tomee/blob/466e9cf5/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java b/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
index 810b301..ade5a90 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
@@ -36,6 +36,11 @@ import javax.validation.ValidatorFactory;
import java.util.Map;
public class BuiltInEnvironmentEntries implements DynamicDeployer {
+ private final boolean addDefaults;
+
+ public BuiltInEnvironmentEntries(final boolean addDefaults) {
+ this.addDefaults = addDefaults;
+ }
public AppModule deploy(final AppModule appModule) throws OpenEJBException {
@@ -83,9 +88,12 @@ public class BuiltInEnvironmentEntries implements DynamicDeployer {
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/ValidatorFactory").type(ValidatorFactory.class));
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/TransactionManager").type(TransactionManager.class));
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/TransactionSynchronizationRegistry").type(TransactionSynchronizationRegistry.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedExecutorService").type(ManagedExecutorService.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedScheduledExecutorService").type(ManagedScheduledExecutorService.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedThreadFactory").type(ManagedThreadFactory.class));
+
+ if (addDefaults) {
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedExecutorService").type(ManagedExecutorService.class));
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedScheduledExecutorService").type(ManagedScheduledExecutorService.class));
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedThreadFactory").type(ManagedThreadFactory.class));
+ }
// OpenEJB specific feature
http://git-wip-us.apache.org/repos/asf/tomee/blob/466e9cf5/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
index b270c5c..820f029 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
@@ -61,6 +61,7 @@ public class AutoConfigPersistenceUnitsTest extends TestCase {
protected void setUp() throws Exception {
System.setProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE, "false");
+ System.setProperty("openejb.environment.default", "false");
config = new ConfigurationFactory();
assembler = new Assembler();
@@ -75,6 +76,7 @@ public class AutoConfigPersistenceUnitsTest extends TestCase {
@Override
public void tearDown() {
System.getProperties().remove(LocalMBeanServer.OPENEJB_JMX_ACTIVE);
+ System.getProperties().remove("openejb.environment.default");
OpenEJB.destroy();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/466e9cf5/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
index f0b88c8..4cce410 100755
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
@@ -56,6 +56,7 @@ public class ConfigurationFactoryTest {
@Test
public void testConfigureApplicationWebModule() throws OpenEJBException {
+ SystemInstance.get().setProperty("openejb.environment.default", "false");
final String moduleId = "testConfigureApplicationWebModule";
final String fileSeparator = System.getProperty("file.separator");
@@ -68,6 +69,7 @@ public class ConfigurationFactoryTest {
final WebModule webModule = new WebModule(webApp, null, null, fileSeparator + "some" + fileSeparator + "where.war", moduleId);
final WebAppInfo info = factory.configureApplication(webModule);
assertEquals(moduleId, info.moduleId);
+ SystemInstance.get().getProperties().remove("openejb.environment.default");
}
@Test
http://git-wip-us.apache.org/repos/asf/tomee/blob/466e9cf5/container/openejb-core/src/test/java/org/apache/openejb/timer/GetTimerTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/timer/GetTimerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/timer/GetTimerTest.java
index 9d30e83..d659fff 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/timer/GetTimerTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/timer/GetTimerTest.java
@@ -54,11 +54,11 @@ public class GetTimerTest {
@Test
public void test() throws InterruptedException {
- assertEquals(0, bean.timers().size());
- bean.newTimer();
assertEquals(1, bean.timers().size());
+ bean.newTimer();
+ assertEquals(2, bean.timers().size());
bean.awaitTimeout();
- assertEquals(1, bean.timers().size());
+ assertEquals(2, bean.timers().size());
}
@Singleton
http://git-wip-us.apache.org/repos/asf/tomee/blob/466e9cf5/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java b/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java
index 180295d..f6714dd 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java
@@ -55,9 +55,9 @@ public class QuartzPersistenceForEJBTimersTest {
@Test
public void doTest() {
- assertEquals(0, bean.timers().size());
- bean.newTimer();
assertEquals(1, bean.timers().size());
+ bean.newTimer();
+ assertEquals(2, bean.timers().size());
while (!bean.awaitTimeout()) {
try {
Thread.sleep(100);
@@ -65,7 +65,7 @@ public class QuartzPersistenceForEJBTimersTest {
// no-op
}
}
- assertEquals(1, bean.timers().size());
+ assertEquals(2, bean.timers().size());
}
@Module