rdev/gossip-revisited
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GOSSIP-16 - whitespace and spelling changes.

Browse Source 
Squashed commit of the following:
  * Replace a few System.err calls with log messages.
  * Fix misspelling
  * Rename `getMemberList` -> `getLiveMembers`
This commit is contained in:
Gary Dusbabek
2016-07-18 13:20:32 -05:00
parent ae3c18499e
commit d2e8c62b29
9 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java
View File

@ -33,10 +33,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.Logger;
import org.junit.Test;
import org.apache.gossip.GossipMember;
import org.apache.gossip.GossipService;
import org.apache.gossip.GossipSettings;
import org.apache.gossip.RemoteGossipMember;
import org.apache.gossip.event.GossipListener;
import org.apache.gossip.event.GossipState;
@ -78,7 +74,7 @@ public class ShutdownDeadtimeTest {
public Integer call() throws Exception {
int total = 0;
for (int i = 0; i < clusterMembers; ++i) {
total += clients.get(i).get_gossipManager().getMemberList().size();
total += clients.get(i).get_gossipManager().getLiveMembers().size();
}
return total;
}}).afterWaitingAtMost(20, TimeUnit.SECONDS).isEqualTo(20);
@ -94,7 +90,7 @@ public class ShutdownDeadtimeTest {
public Integer call() throws Exception {
int total = 0;
for (int i = 0; i < clusterMembers; ++i) {
total += clients.get(i).get_gossipManager().getMemberList().size();
total += clients.get(i).get_gossipManager().getLiveMembers().size();
}
return total;
}}).afterWaitingAtMost(20, TimeUnit.SECONDS).isEqualTo(16);
@ -127,7 +123,7 @@ public class ShutdownDeadtimeTest {
public Integer call() throws Exception {
int total = 0;
for (int i = 0; i < clusterMembers; ++i) {
total += clients.get(i).get_gossipManager().getMemberList().size();
total += clients.get(i).get_gossipManager().getLiveMembers().size();
}
return total;
}}).afterWaitingAtMost(20, TimeUnit.SECONDS).isEqualTo(20);

8
src/test/java/org/apache/gossip/StartupSettingsTest.java
View File

@ -17,10 +17,6 @@
*/
package org.apache.gossip;
import org.apache.gossip.GossipMember;
import org.apache.gossip.GossipService;
import org.apache.gossip.GossipSettings;
import org.apache.gossip.StartupSettings;
import org.apache.log4j.Logger;
import org.json.JSONException;
import org.junit.Test;
@ -60,7 +56,7 @@ public class StartupSettingsTest {
TUnit.assertThat(new Callable<Integer> (){
public Integer call() throws Exception {
return firstService.get_gossipManager().getMemberList().size();
return firstService.get_gossipManager().getLiveMembers().size();
}}).afterWaitingAtMost(30, TimeUnit.SECONDS).isEqualTo(0);
final GossipService serviceUnderTest = new GossipService(
StartupSettings.fromJSONFile( settingsFile )
@ -68,7 +64,7 @@ public class StartupSettingsTest {
serviceUnderTest.start();
TUnit.assertThat(new Callable<Integer> (){
public Integer call() throws Exception {
return serviceUnderTest.get_gossipManager().getMemberList().size();
return serviceUnderTest.get_gossipManager().getLiveMembers().size();
}}).afterWaitingAtMost(10, TimeUnit.SECONDS).isEqualTo(1);
firstService.shutdown();
serviceUnderTest.shutdown();

6
src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java
View File

@ -32,10 +32,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.Logger;
import org.junit.Test;
import org.apache.gossip.GossipMember;
import org.apache.gossip.GossipService;
import org.apache.gossip.GossipSettings;
import org.apache.gossip.RemoteGossipMember;
import org.apache.gossip.event.GossipListener;
import org.apache.gossip.event.GossipState;
@ -84,7 +80,7 @@ public class TenNodeThreeSeedTest {
public Integer call() throws Exception {
int total = 0;
for (int i = 0; i < clusterMembers; ++i) {
total += clients.get(i).get_gossipManager().getMemberList().size();
total += clients.get(i).get_gossipManager().getLiveMembers().size();
}
return total;
}}).afterWaitingAtMost(20, TimeUnit.SECONDS).isEqualTo(20);

6
src/test/java/org/apache/gossip/manager/RandomGossipManagerBuilderTest.java
View File

@ -74,7 +74,7 @@ public class RandomGossipManagerBuilderTest {
.settings(new GossipSettings())
.gossipMembers(null).build();
Assert.assertNotNull(gossipManager.getMemberList());
Assert.assertNotNull(gossipManager.getLiveMembers());
}
@Test
@ -89,8 +89,8 @@ public class RandomGossipManagerBuilderTest {
.settings(new GossipSettings())
.uri(new URI("udp://localhost:8000"))
.gossipMembers(memberList).build();
Assert.assertEquals(1, gossipManager.getMemberList().size());
Assert.assertEquals(member.getId(), gossipManager.getMemberList().get(0).getId());
Assert.assertEquals(1, gossipManager.getLiveMembers().size());
Assert.assertEquals(member.getId(), gossipManager.getLiveMembers().get(0).getId());
}
}