Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tidying up jmx test to behave better in CI environments 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1050372 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-12-17 13:10:41 +00:00
parent a91a181474
commit 55794fe070
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View File

@ -305,7 +305,7 @@ public class ManagementContext implements Service {
return getMBeanServer().queryNames(name, query);
}
public ObjectInstance getObjectInstance(ObjectName name) throws Exception {
public ObjectInstance getObjectInstance(ObjectName name) throws InstanceNotFoundException {
return getMBeanServer().getObjectInstance(name);
}

12
activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
View File

@ -21,6 +21,9 @@ import org.apache.activemq.TestSupport;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.broker.jmx.DurableSubscriptionViewMBean;
import org.apache.activemq.broker.jmx.SubscriptionView;
import org.apache.activemq.broker.jmx.SubscriptionViewMBean;
import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.DurableTopicSubscription;
import org.apache.activemq.broker.region.Subscription;
@ -77,12 +80,12 @@ public class DurableSubscriptionUnsubscribeTest extends TestSupport {
assertCount(100, 0);
}
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName[] subs = broker.getAdminView().getInactiveDurableTopicSubscribers();
for (int i = 0; i < subs.length; i++) {
ObjectName sub = subs[i];
mbs.invoke(sub, "destroy", null, null);
ObjectName subName = subs[i];
DurableSubscriptionViewMBean sub = (DurableSubscriptionViewMBean)broker.getManagementContext().newProxyInstance(subName, DurableSubscriptionViewMBean.class, true);
sub.destroy();
if (i % 20 == 0) {
Thread.sleep(1000);
@ -226,12 +229,11 @@ public class DurableSubscriptionUnsubscribeTest extends TestSupport {
private int countMBean() throws MalformedObjectNameException, InstanceNotFoundException {
int count = 0;
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
for (int i = 0; i < 100; i++) {
String name = "org.apache.activemq:BrokerName=" + getName() + ",Type=Subscription,active=false,name=" + getName() + "_SubsId" + i;
ObjectName sub = new ObjectName(name);
try {
ObjectInstance oi = mbs.getObjectInstance(sub);
broker.getManagementContext().getObjectInstance(sub);
count++;
}
catch (InstanceNotFoundException ignore) {