Author: kkolinko
Date: Wed Sep 28 21:05:21 2011
New Revision: 1177062
URL: http://svn.apache.org/viewvc?rev=1177062&view=rev
Log:
Merged revision 1177060 from tomcat/trunk:
Improve TestNonBlockingCoordinator:
- Format code for better readbility.
- In testCoord1() change how equality is tested. Read expected value from 0th
member, instead of (i-1)th. They all should be the same.
- Remove unneeded main() method.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 21:05:21 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1177062&r1=1177061&r2=1177062&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Wed Sep 28 21:05:21 2011
@@ -30,15 +30,14 @@ public class TestNonBlockingCoordinator
private GroupChannel[] channels = null;
private NonBlockingCoordinator[] coordinators = null;
- private int channelCount = 10;
- private Thread[] threads = null;
+ private final int channelCount = 10;
@Before
public void setUp() throws Exception {
System.out.println("Setup");
channels = new GroupChannel[channelCount];
coordinators = new NonBlockingCoordinator[channelCount];
- threads = new Thread[channelCount];
+ Thread[] threads = new Thread[channelCount];
for ( int i=0; i<channelCount; i++ ) {
channels[i] = new GroupChannel();
coordinators[i] = new NonBlockingCoordinator();
@@ -57,21 +56,36 @@ public class TestNonBlockingCoordinator
}
};
}
- for ( int i=0; i<channelCount; i++ ) threads[i].start();
- for ( int i=0; i<channelCount; i++ ) threads[i].join();
+ for (int i = 0; i < channelCount; i++) {
+ threads[i].start();
+ }
+ for (int i = 0; i < channelCount; i++) {
+ threads[i].join();
+ }
Thread.sleep(1000);
}
@Test
public void testCoord1() throws Exception {
- for (int i=1; i<channelCount; i++ )
- assertEquals("Message count expected to be
equal.",channels[i-1].getMembers().length,channels[i].getMembers().length);
+ int expectedCount = channels[0].getMembers().length;
+ for (int i = 1; i < channelCount; i++) {
+ assertEquals("Message count expected to be equal.", expectedCount,
+ channels[i].getMembers().length);
+ }
Member member = coordinators[0].getCoordinator();
int cnt = 0;
- while ( member == null && (cnt++ < 100 ) ) try {Thread.sleep(100);
member = coordinators[0].getCoordinator();}catch ( Exception x){ /* Ignore */ }
- for (int i=0; i<channelCount; i++ )
assertEquals(member,coordinators[i].getCoordinator());
- System.out.println("Coordinator[1] is:"+member);
-
+ while (member == null && (cnt++ < 100)) {
+ try {
+ Thread.sleep(100);
+ member = coordinators[0].getCoordinator();
+ } catch (Exception x) {
+ /* Ignore */
+ }
+ }
+ for (int i = 0; i < channelCount; i++) {
+ assertEquals(member, coordinators[i].getCoordinator());
+ }
+ System.out.println("Coordinator[1] is:" + member);
}
@Test
@@ -88,10 +102,18 @@ public class TestNonBlockingCoordinator
}
int dead = index;
Thread.sleep(1000);
- if ( index == 0 ) index = 1; else index = 0;
+ if (index == 0) {
+ index = 1;
+ } else {
+ index = 0;
+ }
System.out.println("Member
count:"+channels[index].getMembers().length);
member = coordinators[index].getCoordinator();
- for (int i = 1; i < channelCount; i++) if ( i != dead )
assertEquals(member, coordinators[i].getCoordinator());
+ for (int i = 1; i < channelCount; i++) {
+ if (i != dead) {
+ assertEquals(member, coordinators[i].getCoordinator());
+ }
+ }
System.out.println("Coordinator[2b] is:" + member);
}
@@ -103,9 +125,4 @@ public class TestNonBlockingCoordinator
}
}
- public static void main(String[] args) throws Exception {
-
org.junit.runner.JUnitCore.main(TestNonBlockingCoordinator.class.getName());
- }
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
