svn commit: r1058599 - in /camel/trunk/camel-core/src/test/java/org/apache/camel/management: JmxInstrumentationDisableOnCamelContextTest.java JmxInstrumentationWithConnectorTest.java

[da...@apache.org]

Author: davsclaus
Date: Thu Jan 13 15:07:46 2011
New Revision: 1058599

URL: http://svn.apache.org/viewvc?rev=1058599&view=rev
Log:
Fixing test on CI servers.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java?rev=1058599&r1=1058598&r2=1058599&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java Thu Jan 13 15:07:46 2011
@@ -32,7 +32,7 @@ public class JmxInstrumentationDisableOn
 
     @Override
     protected boolean useJmx() {
-        return true;
+        return false;
     }
 
     @Override
@@ -44,8 +44,6 @@ public class JmxInstrumentationDisableOn
 
     @Override
     public void testMBeansRegistered() throws Exception {
-        assertDefaultDomain();
-
         resolveMandatoryEndpoint("mock:end", MockEndpoint.class);
 
         Set<ObjectName> s = mbsc.queryNames(new ObjectName(domainName + ":type=endpoints,*"), null);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java?rev=1058599&r1=1058598&r2=1058599&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java Thu Jan 13 15:07:46 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.management;
 
+import java.util.Random;
 import javax.management.MBeanServerConnection;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
@@ -29,7 +30,7 @@ import javax.management.remote.JMXServic
  */
 public class JmxInstrumentationWithConnectorTest extends JmxInstrumentationUsingDefaultsTest {
 
-    protected static final String JMXSERVICEURL = "service:jmx:rmi:///jndi/rmi://localhost:2123/jmxrmi/camel";
+    protected String url;
     protected JMXConnector clientConnector;
 
     @Override
@@ -48,10 +49,15 @@ public class JmxInstrumentationWithConne
     @Override
     protected void setUp() throws Exception {
         sleepForConnection = 3000;
+
+        int port = 30000 + new Random().nextInt(10000);
+        log.info("Using port " + port);
+        url = "service:jmx:rmi:///jndi/rmi://localhost:" + port + "/jmxrmi/camel";
+
         // need to explicit set it to false to use non-platform mbs
         System.setProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS, "false");
         System.setProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR, "true");
-        System.setProperty(JmxSystemPropertyKeys.REGISTRY_PORT, "2123");
+        System.setProperty(JmxSystemPropertyKeys.REGISTRY_PORT, "" + port);
         super.setUp();
     }
 
@@ -72,7 +78,7 @@ public class JmxInstrumentationWithConne
     protected MBeanServerConnection getMBeanConnection() throws Exception {
         if (mbsc == null) {
             if (clientConnector == null) {
-                clientConnector = JMXConnectorFactory.connect(new JMXServiceURL(JMXSERVICEURL), null);
+                clientConnector = JMXConnectorFactory.connect(new JMXServiceURL(url), null);
             }
             mbsc = clientConnector.getMBeanServerConnection();
         }