You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/27 10:59:37 UTC

git commit: Fixed the test error of SpringJmxDumpCBRRoutesAsXmlTest

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 678eb77ff -> b49717a9b


Fixed the test error of SpringJmxDumpCBRRoutesAsXmlTest


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b49717a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b49717a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b49717a9

Branch: refs/heads/camel-2.12.x
Commit: b49717a9b895dac873fc78ee3496d90e2cf02408
Parents: 678eb77
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Aug 27 16:59:11 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Aug 27 16:59:11 2014 +0800

----------------------------------------------------------------------
 .../management/SpringJmxDumpCBRRoutesAsXmlTest.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b49717a9/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
index 2b4940e..764dbf2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.spring.management;
 
+import java.util.Set;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -24,7 +25,7 @@ import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
- * @version 
+ * @version
  */
 public class SpringJmxDumpCBRRoutesAsXmlTest extends SpringTestSupport {
 
@@ -37,10 +38,17 @@ public class SpringJmxDumpCBRRoutesAsXmlTest extends SpringTestSupport {
         return context.getManagementStrategy().getManagementAgent().getMBeanServer();
     }
 
+    static ObjectName getCamelContextObjectName(MBeanServer mbeanServer) throws Exception {
+        Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=context,*"), null);
+        assertEquals(1, set.size());
+
+        return set.iterator().next();
+    }
+
     public void testJmxDumpCBRRoutesAsXml() throws Exception {
         MBeanServer mbeanServer = getMBeanServer();
-
-        ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=context,name=\"camel-1\"");
+        // We need to look up the camel context object name first
+        ObjectName on = getCamelContextObjectName(mbeanServer);
         String xml = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null, null);
         assertNotNull(xml);
         log.info(xml);