[geode] 01/01: GEODE-6143: remove PowerMock from RemotePutMessageTest

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhouxj pushed a commit to branch feature/GEODE-6143-6
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 1bb705871ff241e61777692578b24cdd36d2c247
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Wed Dec 12 09:43:41 2018 -0800

    GEODE-6143: remove PowerMock from RemotePutMessageTest
---
 .../internal/cache/tx/RemotePutMessageTest.java    | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
index f5a8c1f..575ecd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tx;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -22,27 +23,27 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
+import org.apache.geode.CancelCriterion;
 import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.CacheDistributionAdvisor;
 import org.apache.geode.internal.cache.DistributedRegion;
 import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.RemoteOperationException;
 
-@PowerMockIgnore("*.UnitTest")
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(RemotePutMessage.class)
 public class RemotePutMessageTest {
   @Test
   public void testDistributeNotFailWithRegionDestroyedException() throws RemoteOperationException {
     EntryEventImpl event = mock(EntryEventImpl.class);
+    EventID eventID = mock(EventID.class);
     DistributedRegion region = mock(DistributedRegion.class);
+    InternalDistributedSystem ids = mock(InternalDistributedSystem.class);
+    DistributionManager dm = mock(DistributionManager.class);
+    CancelCriterion cc = mock(CancelCriterion.class);
     CacheDistributionAdvisor advisor = mock(CacheDistributionAdvisor.class);
     InternalDistributedMember member = mock(InternalDistributedMember.class);
     Set<InternalDistributedMember> replicates = new HashSet<>(Arrays.asList(member));
@@ -50,16 +51,15 @@ public class RemotePutMessageTest {
     Object expectedOldValue = new Object();
 
     when(event.getRegion()).thenReturn(region);
+    when(event.getEventId()).thenReturn(eventID);
     when(region.getCacheDistributionAdvisor()).thenReturn(advisor);
     when(advisor.adviseInitializedReplicates()).thenReturn(replicates);
     when(response.waitForResult()).thenThrow(new RegionDestroyedException("", ""));
-
-    PowerMockito.mockStatic(RemotePutMessage.class);
-    PowerMockito
-        .when(RemotePutMessage.distribute(event, 1, false, false, expectedOldValue, false, false))
-        .thenCallRealMethod();
-    PowerMockito.when(RemotePutMessage.send(member, region, event, 1, false, false,
-        expectedOldValue, false, false, false)).thenReturn(response);
+    when(region.getSystem()).thenReturn(ids);
+    when(region.getDistributionManager()).thenReturn(dm);
+    when(ids.getDistributionManager()).thenReturn(dm);
+    when(dm.getCancelCriterion()).thenReturn(cc);
+    when(dm.putOutgoing(any())).thenReturn(null);
 
     RemotePutMessage.distribute(event, 1, false, false, expectedOldValue, false, false);
   }