Author: kkolinko
Date: Sat Nov 7 17:10:21 2015
New Revision: 1713156
URL: http://svn.apache.org/viewvc?rev=1713156&view=rev
Log:
Use TesterUtil class to allow tribes tests to run in parallel. Originates from
r1303587.
Remove unused method clear().
Minor formatting fixes to align with Tomcat 7.
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Sat Nov 7 17:10:21 2015
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
+import org.apache.catalina.tribes.TesterUtil;
public class TestGroupChannelMemberArrival {
private static int count = 10;
@@ -42,12 +43,7 @@ public class TestGroupChannelMemberArriv
listeners[i] = new TestMbrListener( ("Listener-" + (i + 1)));
channels[i].addMembershipListener(listeners[i]);
}
- }
-
- public void clear() {
- for (int i = 0; i < channels.length; i++) {
- listeners[i].members.clear();
- }
+ TesterUtil.addRandomDomain(channels);
}
@Test
@@ -69,11 +65,18 @@ public class TestGroupChannelMemberArriv
};
threads[i] = t;
}
- for (int i=0; i<threads.length; i++ ) threads[i].start();
- for (int i=0; i<threads.length; i++ ) threads[i].join();
+ for (int i = 0; i < threads.length; i++) {
+ threads[i].start();
+ }
+ for (int i = 0; i < threads.length; i++) {
+ threads[i].join();
+ }
Thread.sleep(2000);
System.out.println("All channels started.");
- for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking
member arrival length",channels.length-1,listeners[i].members.size());
+ for (int i = listeners.length - 1; i >= 0; i--) {
+ assertEquals("Checking member arrival length", channels.length - 1,
+ listeners[i].members.size());
+ }
}
@After
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
Sat Nov 7 17:10:21 2015
@@ -47,7 +47,7 @@ public class TestGroupChannelOptionFlag
@After
public void tearDown() throws Exception {
- if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) {}
+ if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) { /* Ignore */ }
channel = null;
}
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Sat Nov 7 17:10:21 2015
@@ -29,6 +29,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
public class TestGroupChannelSenderConnections {
@@ -43,14 +44,13 @@ public class TestGroupChannelSenderConne
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
listeners[i] = new TestMsgListener( ("Listener-" + (i + 1)));
channels[i].addChannelListener(listeners[i]);
+ }
+ TesterUtil.addRandomDomain(channels);
+ for (int i = 0; i < channels.length; i++) {
channels[i].start(Channel.SND_RX_SEQ|Channel.SND_TX_SEQ);
-
}
}
- public void clear() {
- }
-
public void sendMessages(long delay, long sleep) throws Exception {
Member local = channels[0].getLocalMember(true);
Member dest = channels[1].getLocalMember(true);
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?rev=1713156&r1=1713155&r2=1713156&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Sat Nov 7 17:10:21 2015
@@ -91,7 +91,7 @@ public class TestGroupChannelStartStop {
} catch ( Exception x){/*expected*/}
assertEquals(count,1);
channel.stop(Channel.DEFAULT);
-
+
count = 0;
try {
channel.start(Channel.SND_RX_SEQ);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
