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

fix up use of wrong mbean object name for durable sub - use system assigned port 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415405 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2012-11-29 22:05:06 +00:00
parent ec0a0a3ebe
commit 78022e2b9d
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriberNonPersistentMessageTest.java
View File

@ -45,6 +45,7 @@ import junit.framework.TestSuite;
import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.store.kahadb.KahaDBStore; import org.apache.activemq.store.kahadb.KahaDBStore;
import org.apache.activemq.util.Wait; import org.apache.activemq.util.Wait;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -53,8 +54,8 @@ import org.slf4j.LoggerFactory;
public class DurableSubscriberNonPersistentMessageTest extends TestCase { public class DurableSubscriberNonPersistentMessageTest extends TestCase {
private final Logger LOG = LoggerFactory.getLogger(DurableSubscriberNonPersistentMessageTest.class); private final Logger LOG = LoggerFactory.getLogger(DurableSubscriberNonPersistentMessageTest.class);
private String brokerURL = "failover:(tcp://localhost:61616)"; private String brokerURL;
private String consumerBrokerURL = brokerURL + "?jms.prefetchPolicy.all=100"; private String consumerBrokerURL;
int initialMaxMsgs = 10; int initialMaxMsgs = 10;
int cleanupMsgCount = 10; int cleanupMsgCount = 10;
@ -79,12 +80,15 @@ public class DurableSubscriberNonPersistentMessageTest extends TestCase {
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
broker = new BrokerService(); broker = new BrokerService();
broker.addConnector("tcp://localhost:61616"); TransportConnector transportConnector = broker.addConnector("tcp://localhost:0");
KahaDBStore store = new KahaDBStore(); KahaDBStore store = new KahaDBStore();
store.setDirectory(new File("data")); store.setDirectory(new File("data"));
broker.setPersistenceAdapter(store); broker.setPersistenceAdapter(store);
broker.start(); broker.start();
brokerURL = "failover:(" + transportConnector.getPublishableConnectString() + ")";
consumerBrokerURL = brokerURL + "?jms.prefetchPolicy.all=100";
mbeanServer = ManagementFactory.getPlatformMBeanServer(); mbeanServer = ManagementFactory.getPlatformMBeanServer();
} }
@ -137,15 +141,7 @@ public class DurableSubscriberNonPersistentMessageTest extends TestCase {
String brokerVersion = (String) mbeanServer.getAttribute(new ObjectName("org.apache.activemq:BrokerName=localhost,Type=Broker"), "BrokerVersion"); String brokerVersion = (String) mbeanServer.getAttribute(new ObjectName("org.apache.activemq:BrokerName=localhost,Type=Broker"), "BrokerVersion");
LOG.info("Test run on: " + brokerVersion); LOG.info("Test run on: " + brokerVersion);
// Fuse and Apache 5.6 use different object strings if the consumer final String theJmxObject = "org.apache.activemq:BrokerName=localhost,Type=Subscription,persistentMode=Durable,subscriptionID=MyDurableTopic,destinationType=Topic,destinationName=TEST,clientId=Jason";
// is offline, maybe this has something to do with the difference in
// behavior?
String jmxObject = "org.apache.activemq:BrokerName=localhost,Type=Subscription,active=false,name=Jason_MyDurableTopic";
if (brokerVersion == null || brokerVersion.contains("fuse") || brokerVersion.contains("5.6")) {
jmxObject = "org.apache.activemq:BrokerName=localhost,Type=Subscription,persistentMode=Durable,subscriptionID=MyDurableTopic,destinationType=Topic,destinationName=TEST,clientId=Jason";
}
final String theJmxObject = jmxObject;
assertTrue("pendingQueueSize should be zero", Wait.waitFor(new Wait.Condition() { assertTrue("pendingQueueSize should be zero", Wait.waitFor(new Wait.Condition() {
@Override @Override