Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-18 16:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

AMQ-1489 - reflect the new respect of host and port elements of multicast uri and use of group as query parameter in the tests that specify a group to ensure some test isolation; resolve unit test failures

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@693051 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2008-09-08 10:52:06 +00:00
parent b006b2533b
commit 4a7e0b35bd
13 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
View File

@ -92,8 +92,8 @@ public class PeerTransportFactory extends TransportFactory {
IntrospectionSupport.setProperties(service, brokerOptions); IntrospectionSupport.setProperties(service, brokerOptions);
service.setBrokerName(finalBroker); service.setBrokerName(finalBroker);
TransportConnector c = service.addConnector("tcp://localhost:0"); TransportConnector c = service.addConnector("tcp://localhost:0");
c.setDiscoveryUri(new URI("multicast://" + finalGroup)); c.setDiscoveryUri(new URI("multicast://default?group=" + finalGroup));
service.addNetworkConnector("multicast://" + finalGroup); service.addNetworkConnector("multicast://default?group=" + finalGroup);
return service; return service;
} }
}); });

4
activemq-core/src/test/java/org/apache/activemq/JmsMultipleBrokersTestSupport.java
View File

@ -129,8 +129,8 @@ public class JmsMultipleBrokersTestSupport extends CombinationTestSupport {
} }
TransportConnector transport = (TransportConnector)transportConnectors.get(0); TransportConnector transport = (TransportConnector)transportConnectors.get(0);
transport.setDiscoveryUri(new URI("multicast://" + groupName)); transport.setDiscoveryUri(new URI("multicast://default?group=" + groupName));
broker.addNetworkConnector("multicast://" + groupName); broker.addNetworkConnector("multicast://default?group=" + groupName);
} }
// Multicasting may take longer to setup // Multicasting may take longer to setup

4
activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
View File

@ -54,7 +54,7 @@ public class BrokerServiceTest extends TestCase {
BrokerService service = new BrokerService(); BrokerService service = new BrokerService();
service.setPersistent(false); service.setPersistent(false);
service.setUseJmx(true); service.setUseJmx(true);
NetworkConnector connector = service.addNetworkConnector("multicast://group-"+System.currentTimeMillis()); NetworkConnector connector = service.addNetworkConnector("multicast://default?group=group-"+System.currentTimeMillis());
service.start(); service.start();
service.removeNetworkConnector(connector); service.removeNetworkConnector(connector);
@ -66,7 +66,7 @@ public class BrokerServiceTest extends TestCase {
BrokerService service = new BrokerService(); BrokerService service = new BrokerService();
service.setPersistent(false); service.setPersistent(false);
service.setUseJmx(false); service.setUseJmx(false);
NetworkConnector connector = service.addNetworkConnector("multicast://group-"+System.currentTimeMillis()); NetworkConnector connector = service.addNetworkConnector("multicast://default?group=group-"+System.currentTimeMillis());
service.start(); service.start();
service.removeNetworkConnector(connector); service.removeNetworkConnector(connector);

4
activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
View File

@ -203,11 +203,11 @@ public class NetworkLoadTest extends TestCase {
TransportConnector transportConnector = new TransportConnector(); TransportConnector transportConnector = new TransportConnector();
transportConnector.setUri(new URI("tcp://localhost:"+(60000+brokerId))); transportConnector.setUri(new URI("tcp://localhost:"+(60000+brokerId)));
transportConnector.setDiscoveryUri(new URI("multicast://"+groupId)); transportConnector.setDiscoveryUri(new URI("multicast://default?group="+groupId));
broker.addConnector(transportConnector); broker.addConnector(transportConnector);
DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector(); DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector();
networkConnector.setUri(new URI("multicast://"+groupId)); networkConnector.setUri(new URI("multicast://default?group="+groupId));
networkConnector.setBridgeTempDestinations(true); networkConnector.setBridgeTempDestinations(true);
networkConnector.setPrefetchSize(1); networkConnector.setPrefetchSize(1);
broker.addNetworkConnector(networkConnector); broker.addNetworkConnector(networkConnector);

4
activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
View File

@ -112,8 +112,8 @@ public class TopicClusterTest extends TestCase implements MessageListener {
String url = "tcp://localhost:0"; String url = "tcp://localhost:0";
TransportConnector connector = container.addConnector(url); TransportConnector connector = container.addConnector(url);
connector.setDiscoveryUri(new URI("multicast://"+groupId)); connector.setDiscoveryUri(new URI("multicast://default?group="+groupId));
container.addNetworkConnector("multicast://"+groupId); container.addNetworkConnector("multicast://default?group="+groupId);
container.start(); container.start();
services.add(container); services.add(container);

2
activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
View File

@ -134,7 +134,7 @@ public class DiscoveryTransportBrokerTest extends NetworkTestSupport {
if ( groupName == null ) { if ( groupName == null ) {
groupName = "group-"+System.currentTimeMillis(); groupName = "group-"+System.currentTimeMillis();
} }
return "multicast://"+groupName; return "multicast://default?group="+groupName;
} }
protected TransportConnector createRemoteConnector() throws Exception, IOException, URISyntaxException { protected TransportConnector createRemoteConnector() throws Exception, IOException, URISyntaxException {

24
activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
View File

@ -140,43 +140,43 @@ public class TwoBrokerMulticastQueueTest extends CombinationTestSupport {
} }
public void testSendReceiveUsingDiscovery() throws Exception { public void testSendReceiveUsingDiscovery() throws Exception {
sendUri = "discovery:multicast://"+groupId; sendUri = "discovery:multicast://default?group="+groupId;
recvUri = "discovery:multicast://"+groupId; recvUri = "discovery:multicast://default?group="+groupId;
createMulticastBrokerNetwork(); createMulticastBrokerNetwork();
doSendReceiveTest(); doSendReceiveTest();
} }
public void testMultipleConsumersConnectUsingDiscovery() throws Exception { public void testMultipleConsumersConnectUsingDiscovery() throws Exception {
sendUri = "discovery:multicast://"+groupId; sendUri = "discovery:multicast://default?group="+groupId;
recvUri = "discovery:multicast://"+groupId; recvUri = "discovery:multicast://default?group="+groupId;
createMulticastBrokerNetwork(); createMulticastBrokerNetwork();
doMultipleConsumersConnectTest(); doMultipleConsumersConnectTest();
} }
public void testSendReceiveUsingAutoAssignFailover() throws Exception { public void testSendReceiveUsingAutoAssignFailover() throws Exception {
sendUri = "failover:(discovery:multicast://"+groupId+")"; sendUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
recvUri = "failover:(discovery:multicast://"+groupId+")"; recvUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
createAutoAssignMulticastBrokerNetwork(); createAutoAssignMulticastBrokerNetwork();
doSendReceiveTest(); doSendReceiveTest();
} }
public void testMultipleConsumersConnectUsingAutoAssignFailover() throws Exception { public void testMultipleConsumersConnectUsingAutoAssignFailover() throws Exception {
sendUri = "failover:(discovery:multicast://"+groupId+")"; sendUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
recvUri = "failover:(discovery:multicast://"+groupId+")"; recvUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
createAutoAssignMulticastBrokerNetwork(); createAutoAssignMulticastBrokerNetwork();
doMultipleConsumersConnectTest(); doMultipleConsumersConnectTest();
} }
public void testSendReceiveUsingAutoAssignDiscovery() throws Exception { public void testSendReceiveUsingAutoAssignDiscovery() throws Exception {
sendUri = "discovery:multicast://"+groupId; sendUri = "discovery:multicast://default?group="+groupId;
recvUri = "discovery:multicast://"+groupId; recvUri = "discovery:multicast://default?group="+groupId;
createAutoAssignMulticastBrokerNetwork(); createAutoAssignMulticastBrokerNetwork();
doSendReceiveTest(); doSendReceiveTest();
} }
public void testMultipleConsumersConnectUsingAutoAssignDiscovery() throws Exception { public void testMultipleConsumersConnectUsingAutoAssignDiscovery() throws Exception {
sendUri = "discovery:multicast://"+groupId; sendUri = "discovery:multicast://default?group="+groupId;
recvUri = "discovery:multicast://"+groupId; recvUri = "discovery:multicast://default?group="+groupId;
createAutoAssignMulticastBrokerNetwork(); createAutoAssignMulticastBrokerNetwork();
doMultipleConsumersConnectTest(); doMultipleConsumersConnectTest();
} }

2
activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
View File

@ -25,7 +25,7 @@
<property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property> <property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
</bean> </bean>
<broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true"> <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">
<transportConnectors> <transportConnectors>
<transportConnector name="stomp" uri="stomp://localhost:61613"/> <transportConnector name="stomp" uri="stomp://localhost:61613"/>

4
activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
View File

@ -21,11 +21,11 @@
<broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://${groupId}"/> <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default?group=${groupId}"/>
</transportConnectors> </transportConnectors>
<networkConnectors> <networkConnectors>
<networkConnector uri="multicast://${groupId}"/> <networkConnector uri="multicast://default?group=${groupId}"/>
</networkConnectors> </networkConnectors>
<persistenceAdapter> <persistenceAdapter>

4
activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
View File

@ -21,11 +21,11 @@
<broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://${groupId}"/> <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://default?group=${groupId}"/>
</transportConnectors> </transportConnectors>
<networkConnectors> <networkConnectors>
<networkConnector uri="multicast://${groupId}"/> <networkConnector uri="multicast://default?group=${groupId}"/>
</networkConnectors> </networkConnectors>
<persistenceAdapter> <persistenceAdapter>

4
activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
View File

@ -21,11 +21,11 @@
<broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/> <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
</transportConnectors> </transportConnectors>
<networkConnectors> <networkConnectors>
<networkConnector uri="multicast://${groupId}"/> <networkConnector uri="multicast://default?group=${groupId}"/>
</networkConnectors> </networkConnectors>
<persistenceAdapter> <persistenceAdapter>

4
activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
View File

@ -21,11 +21,11 @@
<broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/> <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
</transportConnectors> </transportConnectors>
<networkConnectors> <networkConnectors>
<networkConnector uri="multicast://${groupId}"/> <networkConnector uri="multicast://default?group=${groupId}"/>
</networkConnectors> </networkConnectors>
<persistenceAdapter> <persistenceAdapter>

4
activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
View File

@ -21,11 +21,11 @@
<broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/> <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
</transportConnectors> </transportConnectors>
<networkConnectors> <networkConnectors>
<networkConnector uri="multicast://${groupId}"/> <networkConnector uri="multicast://default?group=${groupId}"/>
</networkConnectors> </networkConnectors>
<persistenceAdapter> <persistenceAdapter>