Fixed failing tests due to mcast route change

Author: belaban

tests/junit-functional/org/jgroups/tests/NioServerTest2.java

@@ -8,6 +8,7 @@
 import org.jgroups.protocols.pbcast.GMS;
 import org.jgroups.protocols.pbcast.NAKACK2;
 import org.jgroups.protocols.pbcast.STABLE;
+import org.jgroups.util.ResourceManager;
 import org.jgroups.util.Util;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -30,9 +31,10 @@ public class NioServerTest2 {
     protected MyReceiver           ra, rb;
 
     @BeforeMethod protected void init() throws Exception {
-        a=create("A");
+        String mcast_addr=ResourceManager.getNextMulticastAddress();
+        a=create("A", mcast_addr);
         a.setReceiver(ra=new MyReceiver());
-        b=create("B");
+        b=create("B", mcast_addr);
         b.setReceiver(rb=new MyReceiver());
         a.connect("NioServerTest2");
         b.connect("NioServerTest2");
@@ -76,10 +78,10 @@ protected static void check(MyReceiver r, String name) {
     }
 
 
-    protected static JChannel create(String name) throws Exception {
+    protected static JChannel create(String name, String mcast_addr) throws Exception {
         return new JChannel(
           new TCP_NIO2().setRecvBufSize(recv_buf_size).setSendBufSize(send_buf_size).setBindAddress(Util.getLoopback()),
-          new MPING(),
+          new MPING().setMulticastAddress(mcast_addr),
           new NAKACK2().useMcastXmit(false),
           new UNICAST3(),
           new STABLE(),

tests/junit/org/jgroups/tests/ConcurrentStartupTest.java

@@ -8,10 +8,12 @@
 import org.jgroups.protocols.pbcast.NAKACK2;
 import org.jgroups.protocols.pbcast.STABLE;
 import org.jgroups.stack.Protocol;
+import org.jgroups.util.ResourceManager;
 import org.jgroups.util.Util;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
+import java.net.InetAddress;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -40,21 +42,29 @@ public class ConcurrentStartupTest {
     }
 
     @Test(enabled=false)
-    protected void setup(Class<? extends TP> tp_cl, Class<? extends Discovery> discovery_cl) throws Exception {
-        for(int i=0; i < channels.length; i++)
-            channels[i]=create(tp_cl, discovery_cl, String.valueOf(i+1));
+    protected void setup(Class<? extends TP> tp_cl, Class<? extends Discovery> discovery_cl,
+                         String mcast_addr) throws Exception {
+        for(int i=0; i < channels.length; i++) {
+            channels[i]=create(tp_cl,discovery_cl,String.valueOf(i + 1));
+            if(mcast_addr != null) {
+                TP tp=channels[i].getProtocolStack().getTransport();
+                if(tp instanceof UDP)
+                    ((UDP)tp).setMulticastAddress(InetAddress.getByName(mcast_addr));
+            }
+        }
     }
 
 
     // @Test(invocationCount=5)
     public void testConcurrentJoinWithSHARED_LOOPBACK() throws Exception {
-        setup(SHARED_LOOPBACK.class, SHARED_LOOPBACK_PING.class);
+        setup(SHARED_LOOPBACK.class, SHARED_LOOPBACK_PING.class, null);
         startThreads(CLUSTER_SHARED);
     }
 
     @Test(invocationCount=10)
     public void testConcurrentJoinWithLOCAL_PING() throws Exception {
-        setup(UDP.class, LOCAL_PING.class);
+        String mcast_addr=ResourceManager.getNextMulticastAddress();
+        setup(UDP.class, LOCAL_PING.class, mcast_addr);
         for(int i=0; i < channels.length; i++) {
             final int index=i;
             channels[i].setUpHandler(new UpHandler() {
@@ -82,7 +92,8 @@ public Object up(Event evt) {
 
     // @Test(invocationCount=10)
     public void testConcurrentJoinWithPING() throws Exception {
-        setup(UDP.class, PING.class);
+        String mcast_addr=ResourceManager.getNextMulticastAddress();
+        setup(UDP.class, PING.class, mcast_addr);
         startThreads("withUDPandPING");
     }
 

tests/junit/org/jgroups/tests/SequencerOrderTest.java

@@ -4,14 +4,19 @@
 
 
 import org.jgroups.*;
+import org.jgroups.protocols.MPING;
 import org.jgroups.protocols.SHUFFLE;
+import org.jgroups.protocols.TP;
+import org.jgroups.protocols.UDP;
 import org.jgroups.protocols.pbcast.NAKACK2;
 import org.jgroups.stack.ProtocolStack;
+import org.jgroups.util.ResourceManager;
 import org.jgroups.util.Util;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.net.InetAddress;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -38,20 +43,15 @@ public class SequencerOrderTest {
 
     @BeforeMethod
     void setUp() throws Exception {
-        a=new JChannel(props).name("A");
-        a.connect(GROUP);
-        r1=new MyReceiver("A");
-        a.setReceiver(r1);
+        String mcast_addr=ResourceManager.getNextMulticastAddress();
+        a=create(props, "A", mcast_addr).connect(GROUP);
+        a.setReceiver(r1=new MyReceiver("A"));
 
-        b=new JChannel(props).name("B");
-        b.connect(GROUP);
-        r2=new MyReceiver("B");
-        b.setReceiver(r2);
+        b=create(props, "B", mcast_addr).connect(GROUP);
+        b.setReceiver(r2=new MyReceiver("B"));
 
-        c=new JChannel(props).name("C");
-        c.connect(GROUP);
-        r3=new MyReceiver("C");
-        c.setReceiver(r3);
+        c=create(props, "C", mcast_addr).connect(GROUP);
+        c.setReceiver(r3=new MyReceiver("C"));
 
         Util.waitUntilAllChannelsHaveSameView(10000, 1000, a, b, c);
 
@@ -93,6 +93,17 @@ public void testBroadcastSequence() throws Exception {
         verifySameOrder(EXPECTED_MSGS, l1, l2, l3);
     }
 
+    protected JChannel create(String props, String name, String mcast_addr) throws Exception {
+        JChannel ch=new JChannel(props).name(name);
+        TP tp=ch.getProtocolStack().getTransport();
+        if(tp instanceof UDP)
+            ((UDP)tp).setMulticastAddress(InetAddress.getByName(mcast_addr));
+        MPING mping=ch.getProtocolStack().findProtocol(MPING.class);
+        if(mping != null)
+            mping.setMulticastAddress(mcast_addr);
+        return ch;
+    }
+
     protected static void insertShuffle(JChannel... channels) throws Exception {
         for(JChannel ch: channels) {
             SHUFFLE shuffle=new SHUFFLE();