Repository: geode Updated Branches: refs/heads/feature/GEODE-2558 ee0ab010f -> a445ab541
GEODE-2622: Fix GMSMembershipManagerJUnitTest use of Mockito 2.7.11 - Fix 4 test failures in GMSMembershipManagerJUnitTest This closes #573 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a445ab54 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a445ab54 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a445ab54 Branch: refs/heads/feature/GEODE-2558 Commit: a445ab541b04112ef122d9673b13067e2ff2e3b8 Parents: ee0ab01 Author: Srikanth Manvi <[email protected]> Authored: Sun Jun 11 00:40:57 2017 -0400 Committer: Kirk Lund <[email protected]> Committed: Mon Jun 12 16:44:54 2017 -0700 ---------------------------------------------------------------------- .../membership/gms/mgr/GMSMembershipManagerJUnitTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/a445ab54/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java index 8c82a6f..45e2f6b 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java @@ -285,7 +285,7 @@ public class GMSMembershipManagerJUnitTest { Set<InternalDistributedMember> failures = manager.directChannelSend(recipients, m, null); assertTrue(failures == null); verify(dc).send(isA(GMSMembershipManager.class), isA(mockMembers.getClass()), - isA(DistributionMessage.class), anyInt(), anyInt()); + isA(DistributionMessage.class), anyLong(), anyLong()); } @Test @@ -300,7 +300,7 @@ public class GMSMembershipManagerJUnitTest { ConnectExceptions exception = new ConnectExceptions(); exception.addFailure(recipients[0], new Exception("testing")); when(dc.send(any(GMSMembershipManager.class), any(mockMembers.getClass()), - any(DistributionMessage.class), anyInt(), anyInt())).thenThrow(exception); + any(DistributionMessage.class), anyLong(), anyLong())).thenThrow(exception); failures = manager.directChannelSend(recipients, m, null); assertTrue(failures != null); assertEquals(1, failures.size()); @@ -334,7 +334,7 @@ public class GMSMembershipManagerJUnitTest { Set<InternalDistributedMember> failures = manager.directChannelSend(null, m, null); assertTrue(failures == null); verify(dc).send(isA(GMSMembershipManager.class), isA(mockMembers.getClass()), - isA(DistributionMessage.class), anyInt(), anyInt()); + isA(DistributionMessage.class), anyLong(), anyLong()); } @Test @@ -349,7 +349,7 @@ public class GMSMembershipManagerJUnitTest { ConnectExceptions exception = new ConnectExceptions(); exception.addFailure(recipients[0], new Exception("testing")); when(dc.send(any(GMSMembershipManager.class), any(mockMembers.getClass()), - any(DistributionMessage.class), anyInt(), anyInt())).thenThrow(exception); + any(DistributionMessage.class), anyLong(), anyLong())).thenThrow(exception); Assertions.assertThatThrownBy(() -> { manager.directChannelSend(recipients, m, null); }).isInstanceOf(DistributedSystemDisconnectedException.class);
