geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [39/50] [abbrv] incubator-geode git commit: GEODE-77: removing references to GMSJoinLeave from the health monitor unit tests
Date Fri, 20 Nov 2015 21:02:33 GMT
GEODE-77: removing references to GMSJoinLeave from the health monitor unit tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/026d149d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/026d149d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/026d149d

Branch: refs/heads/develop
Commit: 026d149d415eadf39ff6c421fdd0452291ac5d75
Parents: f0c5ec2
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Mon Nov 9 08:44:00 2015 -0800
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Mon Nov 9 08:44:00 2015 -0800

----------------------------------------------------------------------
 .../gms/membership/fd/GMSHealthMonitorJUnitTest.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/026d149d/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/fd/GMSHealthMonitorJUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/fd/GMSHealthMonitorJUnitTest.java
index 1f0ccf0..4307bdd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/fd/GMSHealthMonitorJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/fd/GMSHealthMonitorJUnitTest.java
@@ -32,8 +32,9 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig;
 import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
 import com.gemstone.gemfire.distributed.internal.membership.gms.Services.Stopper;
 import com.gemstone.gemfire.distributed.internal.membership.gms.fd.GMSHealthMonitor;
+import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.JoinLeave;
+import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Manager;
 import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Messenger;
-import com.gemstone.gemfire.distributed.internal.membership.gms.membership.GMSJoinLeave;
 import com.gemstone.gemfire.distributed.internal.membership.gms.messages.HeartbeatMessage;
 import com.gemstone.gemfire.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
 import com.gemstone.gemfire.distributed.internal.membership.gms.messages.SuspectMembersMessage;
@@ -49,8 +50,9 @@ public class GMSHealthMonitorJUnitTest {
   private DistributionConfig mockDistConfig;
   private List<InternalDistributedMember> mockMembers;
   private Messenger messenger;
-  private GMSJoinLeave joinLeave;
+  private JoinLeave joinLeave;
   private GMSHealthMonitor gmsHealthMonitor;
+  private Manager manager;
   final long memberTimeout = 1000l;
   private int[] portRange= new int[]{0, 65535};
 
@@ -60,7 +62,8 @@ public class GMSHealthMonitorJUnitTest {
     mockDistConfig = mock(DistributionConfig.class);
     mockConfig = mock(ServiceConfig.class);
     messenger = mock(Messenger.class);
-    joinLeave = mock(GMSJoinLeave.class);
+    joinLeave = mock(JoinLeave.class);
+    manager = mock(Manager.class);
     services = mock(Services.class);
     Stopper stopper = mock(Stopper.class);
 
@@ -71,6 +74,7 @@ public class GMSHealthMonitorJUnitTest {
     when(services.getMessenger()).thenReturn(messenger);
     when(services.getJoinLeave()).thenReturn(joinLeave);
     when(services.getCancelCriterion()).thenReturn(stopper);
+    when(services.getManager()).thenReturn(manager);
     when(stopper.isCancelInProgress()).thenReturn(false);
     
 
@@ -182,7 +186,7 @@ public class GMSHealthMonitorJUnitTest {
 
     Assert.assertEquals(mockMembers.get(4), gmsHealthMonitor.getNextNeighbor());
   }
-
+  
   /***
    * checks whether member-check thread sends suspectMembers message
    */


Mime
View raw message