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

https://issues.apache.org/jira/browse/AMQ-3523 - fix issue with related test, org.apache.activemq.transport.discovery.DiscoveryNetworkReconnectTest 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179612 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2011-10-06 13:09:49 +00:00
parent 6faa9c3546
commit 58e9c66201
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
View File

@ -26,6 +26,7 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName; import javax.management.ObjectName;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.AnnotatedMBean;
import org.apache.activemq.broker.jmx.ManagementContext; import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.transport.discovery.multicast.MulticastDiscoveryAgentFactory; import org.apache.activemq.transport.discovery.multicast.MulticastDiscoveryAgentFactory;
import org.apache.activemq.util.SocketProxy; import org.apache.activemq.util.SocketProxy;
@ -51,7 +52,7 @@ import org.junit.runner.RunWith;
public class DiscoveryNetworkReconnectTest { public class DiscoveryNetworkReconnectTest {
private static final Logger LOG = LoggerFactory.getLogger(DiscoveryNetworkReconnectTest.class); private static final Logger LOG = LoggerFactory.getLogger(DiscoveryNetworkReconnectTest.class);
final int maxReconnects = 5; final int maxReconnects = 2;
final String groupName = "GroupID-" + "DiscoveryNetworkReconnectTest"; final String groupName = "GroupID-" + "DiscoveryNetworkReconnectTest";
final String discoveryAddress = "multicast://default?group=" + groupName + "&initialReconnectDelay=1000"; final String discoveryAddress = "multicast://default?group=" + groupName + "&initialReconnectDelay=1000";
final Semaphore mbeanRegistered = new Semaphore(0); final Semaphore mbeanRegistered = new Semaphore(0);
@ -72,6 +73,7 @@ public class DiscoveryNetworkReconnectTest {
public boolean matches(Object arg0) { public boolean matches(Object arg0) {
ObjectName other = (ObjectName) arg0; ObjectName other = (ObjectName) arg0;
ObjectName mine = (ObjectName) name; ObjectName mine = (ObjectName) name;
LOG.info("Match: " + mine + " vs: " + other);
return other.getKeyProperty("Type").equals(mine.getKeyProperty("Type")) && return other.getKeyProperty("Type").equals(mine.getKeyProperty("Type")) &&
other.getKeyProperty("NetworkConnectorName").equals(mine.getKeyProperty("NetworkConnectorName")); other.getKeyProperty("NetworkConnectorName").equals(mine.getKeyProperty("NetworkConnectorName"));
} }
@ -121,7 +123,7 @@ public class DiscoveryNetworkReconnectTest {
public Object invoke(Invocation invocation) throws Throwable { public Object invoke(Invocation invocation) throws Throwable {
LOG.info("Mbean Registered: " + invocation.getParameter(0)); LOG.info("Mbean Registered: " + invocation.getParameter(0));
mbeanRegistered.release(); mbeanRegistered.release();
return new ObjectInstance((ObjectName)invocation.getParameter(0), "dscription"); return new ObjectInstance((ObjectName)invocation.getParameter(1), "dscription");
} }
}); });
atLeast(maxReconnects - 1).of (managementContext).unregisterMBean(with(new NetworkBridgeObjectNameMatcher<ObjectName>( atLeast(maxReconnects - 1).of (managementContext).unregisterMBean(with(new NetworkBridgeObjectNameMatcher<ObjectName>(