svn commit: r478558 - in /incubator/activemq/trunk/activemq-core: pom.xml src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java

[foconer]

Author: foconer
Date: Thu Nov 23 05:07:33 2006
New Revision: 478558

URL: http://svn.apache.org/viewvc?view=rev&rev=478558
Log:
AMQ-526: get TwoBrokerMulticastQueueTest to work.

Modified:
    incubator/activemq/trunk/activemq-core/pom.xml
    
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/pom.xml?view=diff&rev=478558&r1=478557&r2=478558
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Thu Nov 23 05:07:33 2006
@@ -230,7 +230,6 @@
 
 
             <!-- m2 tests failing since move from assembly  -->
-            <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
             
<exclude>**/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
             <exclude>**/TwoBrokerQueueClientsReconnectTest.*</exclude>
             <exclude>**/ThreeBrokerQueueNetworkUsingTcpTest.*</exclude>

Modified: 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java?view=diff&rev=478558&r1=478557&r2=478558
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
 Thu Nov 23 05:07:33 2006
@@ -132,15 +132,15 @@
     }
 
     public void testSendReceiveUsingFailover() throws Exception {
-        sendUri = "failover:tcp://localhost:61616,tcp://localhost:61617";
-        recvUri = "failover:tcp://localhost:61616,tcp://localhost:61617";
+        sendUri = "failover:(tcp://localhost:61616,tcp://localhost:61617)";
+        recvUri = "failover:(tcp://localhost:61616,tcp://localhost:61617)";
         createMulticastBrokerNetwork();
         doSendReceiveTest();
     }
 
     public void testMultipleConsumersConnectUsingFailover() throws Exception {
-        sendUri = "failover:tcp://localhost:61616,tcp://localhost:61617";
-        recvUri = "failover:tcp://localhost:61616,tcp://localhost:61617";
+        sendUri = "failover:(tcp://localhost:61616,tcp://localhost:61617)";
+        recvUri = "failover:(tcp://localhost:61616,tcp://localhost:61617)";
         createMulticastBrokerNetwork();
         doMultipleConsumersConnectTest();
     }
@@ -160,21 +160,21 @@
     }
 
     public void testSendReceiveUsingAutoAssignFailover() throws Exception {
-        sendUri = "failover:multicast://default";
-        recvUri = "failover:multicast://default";
+        sendUri = "failover:(discovery:multicast://default)";
+        recvUri = "failover:(discovery:multicast://default)";
         createAutoAssignMulticastBrokerNetwork();
         doSendReceiveTest();
     }
 
     public void testMultipleConsumersConnectUsingAutoAssignFailover() throws 
Exception {
-        sendUri = "failover:multicast://default";
-        recvUri = "failover:multicast://default";
+        sendUri = "failover:(discovery:multicast://default)";
+        recvUri = "failover:(discovery:multicast://default)";
         createAutoAssignMulticastBrokerNetwork();
         doMultipleConsumersConnectTest();
     }
 
     public void testSendReceiveUsingAutoAssignDiscovery() throws Exception {
-        sendUri = "discovery:multicast://default";
+               sendUri = "discovery:multicast://default";
         recvUri = "discovery:multicast://default";
         createAutoAssignMulticastBrokerNetwork();
         doSendReceiveTest();