You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/01/19 09:15:07 UTC

svn commit: r1060708 - /camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java

Author: davsclaus
Date: Wed Jan 19 08:15:07 2011
New Revision: 1060708

URL: http://svn.apache.org/viewvc?rev=1060708&view=rev
Log:
Fixed test.

Modified:
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java?rev=1060708&r1=1060707&r2=1060708&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java Wed Jan 19 08:15:07 2011
@@ -16,13 +16,10 @@
  */
 package org.apache.camel.spring.management;
 
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.Set;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.camel.Endpoint;
 import org.apache.camel.spring.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -50,15 +47,22 @@ public class DualCamelContextManagedTest
         
         MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
 
+        ObjectName on1 = null;
+        ObjectName on2 = null;
         Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
-        assertEquals(2, set.size());
-        Iterator<ObjectName> it = set.iterator();
-
-        ObjectName on1 = it.next();
-        ObjectName on2 = it.next();
+        // filter out only camel-A and camel-B
+        for (ObjectName on : set) {
+            if (on.getCanonicalName().contains("camel-A")) {
+                on1 = on;
+            } else if (on.getCanonicalName().contains("camel-B")) {
+                on2 = on;
+            }
+        }
+        assertNotNull("Should have found camel-A route", on1);
+        assertNotNull("Should have found camel-B route", on2);
 
-        assertTrue("Route 1 is missing", on1.getCanonicalName().contains("route1") || on2.getCanonicalName().contains("route1"));
-        assertTrue("Route 2 is missing", on1.getCanonicalName().contains("route2") || on2.getCanonicalName().contains("route2"));
+        assertTrue("Route 1 is missing", on1.getCanonicalName().contains("route1"));
+        assertTrue("Route 2 is missing", on2.getCanonicalName().contains("route2"));
 
         set = mbeanServer.queryNames(new ObjectName("*:type=endpoints,*"), null);
         assertEquals(7, set.size());