[geode] branch develop updated: GEODE-7319:Replace mock EntryEventImpl.class in problematic TCs

[mivanac]

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

mivanac pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new c977c52  GEODE-7319:Replace mock EntryEventImpl.class in problematic 
TCs
     new b2e26fa  Merge pull request #4178 from Nordix/feature/GEODE-7319
c977c52 is described below

commit c977c524451e6a39e92739fac87a77655a50f6a6
Author: mivanac <mario.iva...@est.tech>
AuthorDate: Fri Oct 18 12:33:59 2019 +0200

    GEODE-7319:Replace mock EntryEventImpl.class in problematic TCs
---
 .../geode/internal/cache/BucketRegionTest.java     | 96 +++++++++++++++-------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java
index 2042557..f661920 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java
@@ -438,12 +438,18 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(false).when(event).isGenerateCallbacks();
 
-    bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, 
event, false, false);
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(false);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+
+
+
+    bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, 
eventNew, false, false);
 
     verify(partitionedRegion, 
never()).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY,
-        event, false, false);
+        eventNew, false, false);
   }
 
   @Test
@@ -452,14 +458,19 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(true).when(event).isGenerateCallbacks();
     doReturn(false).when(partitionedRegion).isInitialized();
     doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
 
-    bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, 
event, false, false);
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(true);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+
+
+    bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, 
eventNew, false, false);
 
     verify(partitionedRegion, 
never()).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY,
-        event, false, false);
+        eventNew, false, false);
   }
 
   @Test
@@ -467,15 +478,18 @@ public class BucketRegionTest {
     BucketRegion bucketRegion =
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(true);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(true).when(event).isGenerateCallbacks();
     doReturn(true).when(partitionedRegion).isInitialized();
     doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
-    doReturn(event).when(bucketRegion).createEventForPR(event);
+    doReturn(eventNew).when(bucketRegion).createEventForPR(eventNew);
 
-    bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, 
event, true, false);
+    bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, 
eventNew, true, false);
 
-    
verify(partitionedRegion).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY,
 event,
+    
verify(partitionedRegion).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY,
 eventNew,
         true, false);
   }
 
@@ -485,12 +499,15 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(false).when(event).isGenerateCallbacks();
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(false);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
 
-    bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, 
event, false);
+    bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, 
eventNew, false);
 
     verify(partitionedRegion, 
never()).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
-        event, false);
+        eventNew, false);
   }
 
   @Test
@@ -499,14 +516,17 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(true).when(event).isGenerateCallbacks();
     doReturn(false).when(partitionedRegion).isInitialized();
     doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(true);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
 
-    bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, 
event, false);
+    bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, 
eventNew, false);
 
     verify(partitionedRegion, 
never()).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
-        event, false);
+        eventNew, false);
   }
 
   @Test
@@ -515,14 +535,19 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(true).when(event).isGenerateCallbacks();
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(true);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+
     doReturn(true).when(partitionedRegion).isInitialized();
     doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
-    doReturn(event).when(bucketRegion).createEventForPR(event);
+    doReturn(eventNew).when(bucketRegion).createEventForPR(eventNew);
 
-    bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, 
event, true);
+    bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, 
eventNew, true);
 
-    
verify(partitionedRegion).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
 event,
+    
verify(partitionedRegion).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
+        eventNew,
         true);
   }
 
@@ -532,11 +557,14 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(false).when(event).isGenerateCallbacks();
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(false);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
 
-    bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, 
false, false);
+    bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew, 
false, false);
 
-    verify(partitionedRegion, 
never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event,
+    verify(partitionedRegion, 
never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew,
         false, false);
   }
 
@@ -546,13 +574,17 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(true).when(event).isGenerateCallbacks();
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(true);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+
     doReturn(false).when(partitionedRegion).isInitialized();
     doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
 
-    bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, 
false, false);
+    bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew, 
false, false);
 
-    verify(partitionedRegion, 
never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event,
+    verify(partitionedRegion, 
never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew,
         false, false);
   }
 
@@ -562,14 +594,18 @@ public class BucketRegionTest {
         spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
             cache, internalRegionArgs, disabledClock()));
     doReturn(false).when(bucketRegion).isInitialized();
-    doReturn(true).when(event).isGenerateCallbacks();
+    final String key = "Object0";
+    EntryEventImpl eventNew = new EntryEventImpl();
+    eventNew.setGenerateCallbacks(true);
+    eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+
     doReturn(true).when(partitionedRegion).isInitialized();
     doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
-    doReturn(event).when(bucketRegion).createEventForPR(event);
+    doReturn(eventNew).when(bucketRegion).createEventForPR(eventNew);
 
-    bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, 
true, false);
+    bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew, 
true, false);
 
-    
verify(partitionedRegion).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, 
event,
+    
verify(partitionedRegion).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, 
eventNew,
         true, false);
   }
 }