This is an automated email from the ASF dual-hosted git repository. pascalschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit f106a3f8c0f48e4a382b0014759a07773aba7dca Author: Pascal Schumacher <[email protected]> AuthorDate: Sun Nov 12 19:15:36 2017 +0100 camel-jms: make tests with JMX access succeed when other tests are run before --- .../org/apache/camel/component/jms/ManagedJmsEndpointTest.java | 7 ++++++- .../apache/camel/component/jms/ManagedJmsEndpointTopicTest.java | 7 ++++++- .../jms/tx/JMSTransactionIsTransactedRedeliveredTest.java | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java index 0ce6cff..ad3b31b 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java @@ -28,6 +28,8 @@ import org.junit.Test; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; +import java.util.Set; + /** * */ @@ -55,7 +57,10 @@ public class ManagedJmsEndpointTest extends CamelTestSupport { public void testJmsEndpoint() throws Exception { MBeanServer mbeanServer = getMBeanServer(); - ObjectName name = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"activemq://queue:start\""); + Set<ObjectName> objectNames = mbeanServer.queryNames(new ObjectName("org.apache.camel:context=camel-*,type=endpoints,name=\"activemq://queue:start\""), null); + assertEquals(1, objectNames.size()); + ObjectName name = objectNames.iterator().next(); + String uri = (String) mbeanServer.getAttribute(name, "EndpointUri"); assertEquals("activemq://queue:start", uri); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java index c51a9bd..de62cdc 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java @@ -28,6 +28,8 @@ import org.junit.Test; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; +import java.util.Set; + /** * */ @@ -55,7 +57,10 @@ public class ManagedJmsEndpointTopicTest extends CamelTestSupport { public void testJmsEndpoint() throws Exception { MBeanServer mbeanServer = getMBeanServer(); - ObjectName name = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"activemq://topic:start\""); + Set<ObjectName> objectNames = mbeanServer.queryNames(new ObjectName("org.apache.camel:context=camel-*,type=endpoints,name=\"activemq://topic:start\""), null); + assertEquals(1, objectNames.size()); + ObjectName name = objectNames.iterator().next(); + String uri = (String) mbeanServer.getAttribute(name, "EndpointUri"); assertEquals("activemq://topic:start", uri); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java index 802d7a1..96d6e04 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.jms.tx; +import java.util.Set; + import javax.management.MBeanServer; import javax.management.ObjectName; @@ -75,7 +77,9 @@ public class JMSTransactionIsTransactedRedeliveredTest extends CamelSpringTestSu // need a little sleep to ensure JMX is updated Thread.sleep(500); - ObjectName name = ObjectName.getInstance("org.apache.camel:context=camel-1,type=routes,name=\"myRoute\""); + Set<ObjectName> objectNames = getMBeanServer().queryNames(new ObjectName("org.apache.camel:context=camel-*,type=routes,name=\"myRoute\""), null); + assertEquals(1, objectNames.size()); + ObjectName name = objectNames.iterator().next(); Long total = (Long) getMBeanServer().getAttribute(name, "ExchangesTotal"); assertEquals(3, total.intValue()); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
