some more test fixes
git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk/openejb@1406155 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java
index acde838..d5cd204 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java
@@ -57,6 +57,7 @@
@Before
public void startOpenEJB() throws Exception {
+ System.setProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE, "true");
config = new ConfigurationFactory();
assembler = new Assembler();
assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
@@ -83,6 +84,7 @@
@After
public void resetList() {
+ System.clearProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE);
assembler.destroy();
SystemInstance.reset();
}
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java
index dcff4c3..7365f96 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java
@@ -23,6 +23,8 @@
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.junit.Module;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +33,16 @@
@RunWith(ApplicationComposer.class)
public class JMXContainerTest {
+ @BeforeClass
+ public static void init() {
+ System.setProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE, "true");
+ }
+
+ @AfterClass
+ public static void reset() {
+ System.clearProperty(LocalMBeanServer.OPENEJB_JMX_ACTIVE);
+ }
+
@Test
public void checkContainerIsRegistered() throws Exception {
final ObjectName on = new ObjectName("openejb.management:ObjectType=containers,DataSource=Default Singleton Container");
