svn commit: r991954 - /camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java

[da...@apache.org]

Author: davsclaus
Date: Thu Sep  2 14:39:02 2010
New Revision: 991954

URL: http://svn.apache.org/viewvc?rev=991954&view=rev
Log:
Fixed test on other boxes

Modified:
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java?rev=991954&r1=991953&r2=991954&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java Thu Sep  2 14:39:02 2010
@@ -23,6 +23,7 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 import org.apache.camel.impl.EventDrivenConsumerRoute;
+import org.apache.camel.management.JmxSystemPropertyKeys;
 import org.apache.camel.spring.SpringCamelContext;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
@@ -35,6 +36,20 @@ import org.springframework.core.io.Class
  */
 public class CamelContextFactoryBeanTest extends XmlConfigTestSupport {
 
+    @Override
+    protected void setUp() throws Exception {
+        // disable JMX
+        System.setProperty(JmxSystemPropertyKeys.DISABLED, "true");
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        // enable JMX
+        System.clearProperty(JmxSystemPropertyKeys.DISABLED);
+    }
+
     public void testClassPathRouteLoading() throws Exception {
         ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextFactoryBean.xml");