[jboss-cvs] JBoss Messaging SVN: r5720 - trunk/tests/src/org/jboss/messaging/tests/integration/discovery.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jan 25 06:41:58 EST 2009
Author: timfox
Date: 2009-01-25 06:41:57 -0500 (Sun, 25 Jan 2009)
New Revision: 5720
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/discovery/DiscoveryTest.java
Log:
Commented out test that won't pass due to promiscuous traffic
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/discovery/DiscoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/discovery/DiscoveryTest.java 2009-01-25 06:00:09 UTC (rev 5719)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/discovery/DiscoveryTest.java 2009-01-25 11:41:57 UTC (rev 5720)
@@ -20,7 +20,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
package org.jboss.messaging.tests.integration.discovery;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
@@ -55,481 +54,494 @@
public class DiscoveryTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(DiscoveryTest.class);
+
+ private static final String address1 = "230.1.2.3";
+
+ private static final String address2 = "230.1.2.4";
+
+ private static final String address3 = "230.1.2.5";
+
+ private static final String address4 = "230.1.2.6";
public void testSimpleBroadcast() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress = InetAddress.getByName(address1);
final int groupPort = 6745;
final int timeout = 500;
-
+
BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
+
bg.start();
-
+
TransportConfiguration live1 = generateTC();
-
+
TransportConfiguration backup1 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
-
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ backup1);
+
bg.addConnectorPair(connectorPair);
-
+
DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
+
dg.start();
-
+
bg.broadcastConnectors();
-
+
boolean ok = dg.waitForBroadcast(1000);
-
+
assertTrue(ok);
-
+
List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg.getConnectors();
-
+
assertNotNull(connectors);
-
+
assertEquals(1, connectors.size());
-
+
Pair<TransportConfiguration, TransportConfiguration> receivedPair = connectors.get(0);
-
+
assertEquals(connectorPair, receivedPair);
-
+
bg.stop();
-
+
dg.stop();
-
+
}
+
+// There is a bug in some OSes where different addresses but *Same port* will receive the traffic - hence this test won't pass
+// See http://www.jboss.org/community/docs/DOC-11710 (jboss wiki promiscuous traffic)
- public void testSimpleBroadcastDifferentAddress() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
- final int groupPort = 6745;
- final int timeout = 500;
-
- BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
- bg.start();
-
- TransportConfiguration live1 = generateTC();
-
- TransportConfiguration backup1 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
-
- bg.addConnectorPair(connectorPair);
-
- final InetAddress groupAddress2 = InetAddress.getByName("230.1.2.4");
-
- DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress2, groupPort, timeout);
-
- dg.start();
-
- bg.broadcastConnectors();
-
- boolean ok = dg.waitForBroadcast(1000);
-
- assertFalse(ok);
-
- bg.stop();
-
- dg.stop();
- }
+// public void testSimpleBroadcastDifferentAddress() throws Exception
+// {
+// final InetAddress groupAddress = InetAddress.getByName(address1);
+// final int groupPort = 6745;
+// final int timeout = 500;
+//
+// BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
+//
+// bg.start();
+//
+// TransportConfiguration live1 = generateTC();
+//
+// TransportConfiguration backup1 = generateTC();
+//
+// Pair<TransportConfiguration, TransportConfiguration> connectorPair = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+// backup1);
+//
+// bg.addConnectorPair(connectorPair);
+//
+// final InetAddress groupAddress2 = InetAddress.getByName(address2);
+//
+// DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress2, groupPort, timeout);
+//
+// dg.start();
+//
+// bg.broadcastConnectors();
+//
+// boolean ok = dg.waitForBroadcast(1000);
+//
+// assertFalse(ok);
+//
+// bg.stop();
+//
+// dg.stop();
+//
+// }
+
public void testSimpleBroadcastDifferentPort() throws Exception
- {
+ {
final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
final int groupPort = 6745;
final int timeout = 500;
-
+
BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
+
bg.start();
-
+
TransportConfiguration live1 = generateTC();
-
+
TransportConfiguration backup1 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
-
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ backup1);
+
bg.addConnectorPair(connectorPair);
-
+
final int port2 = 6746;
-
+
DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress, port2, timeout);
-
+
dg.start();
-
+
bg.broadcastConnectors();
-
+
boolean ok = dg.waitForBroadcast(1000);
-
+
assertFalse(ok);
-
+
bg.stop();
-
- dg.stop();
+
+ dg.stop();
}
-
+
public void testSimpleBroadcastDifferentAddressAndPort() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress = InetAddress.getByName(address1);
final int groupPort = 6745;
final int timeout = 500;
-
+
BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
+
bg.start();
-
+
TransportConfiguration live1 = generateTC();
-
+
TransportConfiguration backup1 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
-
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ backup1);
+
bg.addConnectorPair(connectorPair);
-
- final InetAddress groupAddress2 = InetAddress.getByName("230.1.2.4");
+
+ final InetAddress groupAddress2 = InetAddress.getByName(address2);
final int port2 = 6746;
-
+
DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress2, port2, timeout);
-
+
dg.start();
-
+
bg.broadcastConnectors();
-
+
boolean ok = dg.waitForBroadcast(1000);
-
+
assertFalse(ok);
-
+
bg.stop();
-
- dg.stop();
+
+ dg.stop();
}
-
+
public void testMultipleGroups() throws Exception
- {
- final InetAddress groupAddress1 = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress1 = InetAddress.getByName(address1);
final int groupPort1 = 6745;
-
- final InetAddress groupAddress2 = InetAddress.getByName("230.1.2.4");
+
+ final InetAddress groupAddress2 = InetAddress.getByName(address2);
final int groupPort2 = 6746;
-
- final InetAddress groupAddress3 = InetAddress.getByName("230.1.2.5");
+
+ final InetAddress groupAddress3 = InetAddress.getByName(address3);
final int groupPort3 = 6747;
-
+
final int timeout = 500;
-
- BroadcastGroup bg1 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress1, groupPort1);
+
+ BroadcastGroup bg1 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress1, groupPort1);
bg1.start();
-
- BroadcastGroup bg2 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress2, groupPort2);
+
+ BroadcastGroup bg2 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress2, groupPort2);
bg2.start();
-
- BroadcastGroup bg3 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress3, groupPort3);
+
+ BroadcastGroup bg3 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress3, groupPort3);
bg3.start();
-
- TransportConfiguration live1 = generateTC();
+
+ TransportConfiguration live1 = generateTC();
TransportConfiguration backup1 = generateTC();
-
- TransportConfiguration live2 = generateTC();
+
+ TransportConfiguration live2 = generateTC();
TransportConfiguration backup2 = generateTC();
-
- TransportConfiguration live3 = generateTC();
+
+ TransportConfiguration live3 = generateTC();
TransportConfiguration backup3 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair1 =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair2 =
- new Pair<TransportConfiguration, TransportConfiguration>(live2, backup2);
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair3 =
- new Pair<TransportConfiguration, TransportConfiguration>(live3, backup3);
-
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair1 = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ backup1);
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair2 = new Pair<TransportConfiguration, TransportConfiguration>(live2,
+ backup2);
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair3 = new Pair<TransportConfiguration, TransportConfiguration>(live3,
+ backup3);
+
bg1.addConnectorPair(connectorPair1);
bg2.addConnectorPair(connectorPair2);
bg3.addConnectorPair(connectorPair3);
-
- DiscoveryGroup dg1 = new DiscoveryGroupImpl(randomString(), groupAddress1, groupPort1, timeout);
+
+ DiscoveryGroup dg1 = new DiscoveryGroupImpl(randomString(), groupAddress1, groupPort1, timeout);
dg1.start();
-
- DiscoveryGroup dg2 = new DiscoveryGroupImpl(randomString(), groupAddress2, groupPort2, timeout);
+
+ DiscoveryGroup dg2 = new DiscoveryGroupImpl(randomString(), groupAddress2, groupPort2, timeout);
dg2.start();
-
- DiscoveryGroup dg3 = new DiscoveryGroupImpl(randomString(), groupAddress3, groupPort3, timeout);
+
+ DiscoveryGroup dg3 = new DiscoveryGroupImpl(randomString(), groupAddress3, groupPort3, timeout);
dg3.start();
-
+
bg1.broadcastConnectors();
-
+
bg2.broadcastConnectors();
-
+
bg3.broadcastConnectors();
-
- boolean ok = dg1.waitForBroadcast(1000);
- assertTrue(ok);
- List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg1.getConnectors();
- assertNotNull(connectors);
- assertEquals(1, connectors.size());
- Pair<TransportConfiguration, TransportConfiguration> receivedPair = connectors.get(0);
+
+ boolean ok = dg1.waitForBroadcast(1000);
+ assertTrue(ok);
+ List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg1.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(1, connectors.size());
+ Pair<TransportConfiguration, TransportConfiguration> receivedPair = connectors.get(0);
assertEquals(connectorPair1, receivedPair);
-
- ok = dg2.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg2.getConnectors();
- assertNotNull(connectors);
- assertEquals(1, connectors.size());
- receivedPair = connectors.get(0);
+
+ ok = dg2.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg2.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(1, connectors.size());
+ receivedPair = connectors.get(0);
assertEquals(connectorPair2, receivedPair);
-
- ok = dg3.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg3.getConnectors();
- assertNotNull(connectors);
- assertEquals(1, connectors.size());
- receivedPair = connectors.get(0);
+
+ ok = dg3.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg3.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(1, connectors.size());
+ receivedPair = connectors.get(0);
assertEquals(connectorPair3, receivedPair);
-
+
bg1.stop();
bg2.stop();
bg3.stop();
-
+
dg1.stop();
dg2.stop();
- dg3.stop();
+ dg3.stop();
}
-
+
public void testBroadcastNullBackup() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress = InetAddress.getByName(address1);
final int groupPort = 6745;
final int timeout = 500;
-
+
BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
+
bg.start();
-
+
TransportConfiguration live1 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, null);
-
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ null);
+
bg.addConnectorPair(connectorPair);
-
+
DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
+
dg.start();
-
+
bg.broadcastConnectors();
-
+
boolean ok = dg.waitForBroadcast(1000);
-
+
assertTrue(ok);
-
+
List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg.getConnectors();
-
+
assertNotNull(connectors);
-
+
assertEquals(1, connectors.size());
-
+
Pair<TransportConfiguration, TransportConfiguration> receivedPair = connectors.get(0);
-
+
assertEquals(connectorPair, receivedPair);
-
+
bg.stop();
-
+
dg.stop();
-
+
}
-
+
public void testDiscoveryListenersCalled() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress = InetAddress.getByName(address1);
final int groupPort = 6745;
final int timeout = 500;
-
+
BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
+
bg.start();
-
+
TransportConfiguration live1 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, null);
-
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ null);
+
bg.addConnectorPair(connectorPair);
-
+
DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
- MyListener listener1 = new MyListener();
- MyListener listener2 = new MyListener();
+
+ MyListener listener1 = new MyListener();
+ MyListener listener2 = new MyListener();
MyListener listener3 = new MyListener();
-
+
dg.registerListener(listener1);
dg.registerListener(listener2);
dg.registerListener(listener3);
-
+
dg.start();
-
- bg.broadcastConnectors();
- boolean ok = dg.waitForBroadcast(1000);
+
+ bg.broadcastConnectors();
+ boolean ok = dg.waitForBroadcast(1000);
assertTrue(ok);
-
+
assertTrue(listener1.called);
assertTrue(listener2.called);
assertTrue(listener3.called);
-
+
listener1.called = false;
listener2.called = false;
listener3.called = false;
-
- bg.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+
+ bg.broadcastConnectors();
+ ok = dg.waitForBroadcast(1000);
assertTrue(ok);
-
- //Won't be called since connectors haven't changed
+
+ // Won't be called since connectors haven't changed
assertFalse(listener1.called);
assertFalse(listener2.called);
assertFalse(listener3.called);
-
+
listener1.called = false;
listener2.called = false;
listener3.called = false;
-
+
TransportConfiguration live2 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair2 =
- new Pair<TransportConfiguration, TransportConfiguration>(live2, null);
-
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair2 = new Pair<TransportConfiguration, TransportConfiguration>(live2,
+ null);
+
bg.addConnectorPair(connectorPair2);
-
+
dg.unregisterListener(listener1);
-
- bg.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+
+ bg.broadcastConnectors();
+ ok = dg.waitForBroadcast(1000);
assertTrue(ok);
-
+
assertFalse(listener1.called);
assertTrue(listener2.called);
assertTrue(listener3.called);
-
+
listener1.called = false;
listener2.called = false;
listener3.called = false;
-
+
dg.unregisterListener(listener2);
-
- bg.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+
+ bg.broadcastConnectors();
+ ok = dg.waitForBroadcast(1000);
assertTrue(ok);
-
+
assertFalse(listener1.called);
assertFalse(listener2.called);
assertFalse(listener3.called);
-
+
listener1.called = false;
listener2.called = false;
listener3.called = false;
-
+
TransportConfiguration live4 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair4 =
- new Pair<TransportConfiguration, TransportConfiguration>(live4, null);
-
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair4 = new Pair<TransportConfiguration, TransportConfiguration>(live4,
+ null);
+
bg.addConnectorPair(connectorPair4);
-
+
dg.unregisterListener(listener3);
-
- bg.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+
+ bg.broadcastConnectors();
+ ok = dg.waitForBroadcast(1000);
assertTrue(ok);
-
+
assertFalse(listener1.called);
assertFalse(listener2.called);
assertFalse(listener3.called);
-
+
bg.stop();
-
+
dg.stop();
-
+
}
-
+
public void testConnectorsUpdatedMultipleBroadcasters() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress = InetAddress.getByName(address1);
final int groupPort = 6745;
final int timeout = 500;
-
- BroadcastGroup bg1 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
+
+ BroadcastGroup bg1 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
bg1.start();
-
- BroadcastGroup bg2 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
+
+ BroadcastGroup bg2 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
bg2.start();
-
- BroadcastGroup bg3 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
+
+ BroadcastGroup bg3 = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
bg3.start();
-
- TransportConfiguration live1 = generateTC();
- TransportConfiguration backup1 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair1 =
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
+
+ TransportConfiguration live1 = generateTC();
+ TransportConfiguration backup1 = generateTC();
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair1 = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ backup1);
bg1.addConnectorPair(connectorPair1);
-
- TransportConfiguration live2 = generateTC();
- TransportConfiguration backup2 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair2 =
- new Pair<TransportConfiguration, TransportConfiguration>(live2, backup2);
+
+ TransportConfiguration live2 = generateTC();
+ TransportConfiguration backup2 = generateTC();
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair2 = new Pair<TransportConfiguration, TransportConfiguration>(live2,
+ backup2);
bg2.addConnectorPair(connectorPair2);
-
- TransportConfiguration live3 = generateTC();
- TransportConfiguration backup3 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair3 =
- new Pair<TransportConfiguration, TransportConfiguration>(live3, backup3);
+
+ TransportConfiguration live3 = generateTC();
+ TransportConfiguration backup3 = generateTC();
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair3 = new Pair<TransportConfiguration, TransportConfiguration>(live3,
+ backup3);
bg3.addConnectorPair(connectorPair3);
-
+
DiscoveryGroup dg = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
- MyListener listener1 = new MyListener();
+
+ MyListener listener1 = new MyListener();
dg.registerListener(listener1);
- MyListener listener2 = new MyListener();
+ MyListener listener2 = new MyListener();
dg.registerListener(listener2);
-
+
dg.start();
-
- bg1.broadcastConnectors();
- boolean ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(1, connectors.size());
+
+ bg1.broadcastConnectors();
+ boolean ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(1, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(listener1.called);
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
- bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(2, connectors.size());
+
+ bg2.broadcastConnectors();
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(2, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
assertTrue(listener1.called);
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
- bg3.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(3, connectors.size());
+
+ bg3.broadcastConnectors();
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(3, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
assertTrue(connectors.contains(connectorPair3));
@@ -537,13 +549,13 @@
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg1.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(3, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(3, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
assertTrue(connectors.contains(connectorPair3));
@@ -551,13 +563,13 @@
assertFalse(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(3, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(3, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
assertTrue(connectors.contains(connectorPair3));
@@ -565,13 +577,13 @@
assertFalse(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg3.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(3, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(3, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
assertTrue(connectors.contains(connectorPair3));
@@ -579,18 +591,18 @@
assertFalse(listener2.called);
listener1.called = false;
listener2.called = false;
-
- TransportConfiguration live1_1 = generateTC();
- TransportConfiguration backup1_1 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair1_1 =
- new Pair<TransportConfiguration, TransportConfiguration>(live1_1, backup1_1);
+
+ TransportConfiguration live1_1 = generateTC();
+ TransportConfiguration backup1_1 = generateTC();
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair1_1 = new Pair<TransportConfiguration, TransportConfiguration>(live1_1,
+ backup1_1);
bg1.addConnectorPair(connectorPair1_1);
bg1.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(4, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(4, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
assertTrue(connectors.contains(connectorPair3));
@@ -599,16 +611,16 @@
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg2.removeConnectorPair(connectorPair2);
bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(4, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(4, connectors.size());
assertTrue(connectors.contains(connectorPair1));
- //Connector2 should still be there since not timed out yet
+ // Connector2 should still be there since not timed out yet
assertTrue(connectors.contains(connectorPair2));
assertTrue(connectors.contains(connectorPair3));
assertTrue(connectors.contains(connectorPair1_1));
@@ -616,19 +628,19 @@
assertFalse(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
Thread.sleep(timeout);
-
+
bg1.broadcastConnectors();
ok = dg.waitForBroadcast(1000);
bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+ ok = dg.waitForBroadcast(1000);
bg3.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
-
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(3, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(3, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair3));
assertTrue(connectors.contains(connectorPair1_1));
@@ -636,156 +648,156 @@
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg1.removeConnectorPair(connectorPair1);
bg3.removeConnectorPair(connectorPair3);
-
+
Thread.sleep(timeout);
-
+
bg1.broadcastConnectors();
ok = dg.waitForBroadcast(1000);
bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+ ok = dg.waitForBroadcast(1000);
bg3.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
-
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(1, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(1, connectors.size());
assertTrue(connectors.contains(connectorPair1_1));
assertTrue(listener1.called);
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg1.removeConnectorPair(connectorPair1_1);
-
+
Thread.sleep(timeout);
-
+
bg1.broadcastConnectors();
ok = dg.waitForBroadcast(1000);
bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+ ok = dg.waitForBroadcast(1000);
bg3.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
-
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(0, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(0, connectors.size());
assertTrue(listener1.called);
assertTrue(listener2.called);
listener1.called = false;
listener2.called = false;
-
+
bg1.broadcastConnectors();
ok = dg.waitForBroadcast(1000);
bg2.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
+ ok = dg.waitForBroadcast(1000);
bg3.broadcastConnectors();
- ok = dg.waitForBroadcast(1000);
-
- connectors = dg.getConnectors();
- assertNotNull(connectors);
- assertEquals(0, connectors.size());
+ ok = dg.waitForBroadcast(1000);
+
+ connectors = dg.getConnectors();
+ assertNotNull(connectors);
+ assertEquals(0, connectors.size());
assertFalse(listener1.called);
assertFalse(listener2.called);
bg1.stop();
bg2.stop();
bg3.stop();
-
- dg.stop();
+
+ dg.stop();
}
-
+
public void testMultipleDiscoveryGroups() throws Exception
- {
- final InetAddress groupAddress = InetAddress.getByName("230.1.2.3");
+ {
+ final InetAddress groupAddress = InetAddress.getByName(address1);
final int groupPort = 6745;
final int timeout = 500;
-
+
BroadcastGroup bg = new BroadcastGroupImpl(randomString(), null, -1, groupAddress, groupPort);
-
+
bg.start();
-
- TransportConfiguration live1 = generateTC();
+
+ TransportConfiguration live1 = generateTC();
TransportConfiguration backup1 = generateTC();
-
- Pair<TransportConfiguration, TransportConfiguration> connectorPair1=
- new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1);
-
+
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair1 = new Pair<TransportConfiguration, TransportConfiguration>(live1,
+ backup1);
+
bg.addConnectorPair(connectorPair1);
-
+
DiscoveryGroup dg1 = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
+
DiscoveryGroup dg2 = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
+
DiscoveryGroup dg3 = new DiscoveryGroupImpl(randomString(), groupAddress, groupPort, timeout);
-
+
dg1.start();
dg2.start();
dg3.start();
-
+
bg.broadcastConnectors();
-
- boolean ok = dg1.waitForBroadcast(1000);
- assertTrue(ok);
- List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg1.getConnectors();
- assertNotNull(connectors);
+
+ boolean ok = dg1.waitForBroadcast(1000);
+ assertTrue(ok);
+ List<Pair<TransportConfiguration, TransportConfiguration>> connectors = dg1.getConnectors();
+ assertNotNull(connectors);
assertEquals(1, connectors.size());
assertTrue(connectors.contains(connectorPair1));
-
- ok = dg2.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg2.getConnectors();
- assertNotNull(connectors);
+
+ ok = dg2.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg2.getConnectors();
+ assertNotNull(connectors);
assertEquals(1, connectors.size());
- assertTrue(connectors.contains(connectorPair1));
- ok = dg3.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg3.getConnectors();
- assertNotNull(connectors);
+ assertTrue(connectors.contains(connectorPair1));
+ ok = dg3.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg3.getConnectors();
+ assertNotNull(connectors);
assertEquals(1, connectors.size());
- assertTrue(connectors.contains(connectorPair1));
-
- TransportConfiguration live2 = generateTC();
+ assertTrue(connectors.contains(connectorPair1));
+
+ TransportConfiguration live2 = generateTC();
TransportConfiguration backup2 = generateTC();
- Pair<TransportConfiguration, TransportConfiguration> connectorPair2=
- new Pair<TransportConfiguration, TransportConfiguration>(live2, backup2);
-
+ Pair<TransportConfiguration, TransportConfiguration> connectorPair2 = new Pair<TransportConfiguration, TransportConfiguration>(live2,
+ backup2);
+
bg.addConnectorPair(connectorPair2);
-
+
bg.broadcastConnectors();
- ok = dg1.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg1.getConnectors();
- assertNotNull(connectors);
+ ok = dg1.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg1.getConnectors();
+ assertNotNull(connectors);
assertEquals(2, connectors.size());
assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
-
- ok = dg2.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg2.getConnectors();
- assertNotNull(connectors);
+
+ ok = dg2.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg2.getConnectors();
+ assertNotNull(connectors);
assertEquals(2, connectors.size());
- assertTrue(connectors.contains(connectorPair1));
+ assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
-
- ok = dg3.waitForBroadcast(1000);
- assertTrue(ok);
- connectors = dg3.getConnectors();
- assertNotNull(connectors);
+
+ ok = dg3.waitForBroadcast(1000);
+ assertTrue(ok);
+ connectors = dg3.getConnectors();
+ assertNotNull(connectors);
assertEquals(2, connectors.size());
- assertTrue(connectors.contains(connectorPair1));
+ assertTrue(connectors.contains(connectorPair1));
assertTrue(connectors.contains(connectorPair2));
-
+
bg.stop();
-
+
dg1.stop();
dg2.stop();
- dg3.stop();
+ dg3.stop();
}
-
+
private TransportConfiguration generateTC()
{
String className = "org.foo.bar." + UUIDGenerator.getInstance().generateStringUUID();
@@ -797,7 +809,7 @@
TransportConfiguration tc = new TransportConfiguration(className, params, name);
return tc;
}
-
+
private static class MyListener implements DiscoveryListener
{
volatile boolean called;
@@ -805,7 +817,7 @@
public void connectorsChanged()
{
called = true;
- }
+ }
}
}
More information about the jboss-cvs-commits
mailing list