You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mi...@apache.org on 2019/10/18 15:47:25 UTC
[geode] branch revert-4178-feature/GEODE-7319 created (now cd2fca2)
This is an automated email from the ASF dual-hosted git repository.
mivanac pushed a change to branch revert-4178-feature/GEODE-7319
in repository https://gitbox.apache.org/repos/asf/geode.git.
at cd2fca2 Revert "GEODE-7319:Replace mock EntryEventImpl.class in problematic TCs"
This branch includes the following new commits:
new cd2fca2 Revert "GEODE-7319:Replace mock EntryEventImpl.class in problematic TCs"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode] 01/01: Revert "GEODE-7319:Replace mock EntryEventImpl.class
in problematic TCs"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mivanac pushed a commit to branch revert-4178-feature/GEODE-7319
in repository https://gitbox.apache.org/repos/asf/geode.git
commit cd2fca2db287b844899f8e6345f4a86499210868
Author: Mario Ivanac <48...@users.noreply.github.com>
AuthorDate: Fri Oct 18 17:46:51 2019 +0200
Revert "GEODE-7319:Replace mock EntryEventImpl.class in problematic TCs"
---
.../geode/internal/cache/BucketRegionTest.java | 96 +++++++---------------
1 file changed, 30 insertions(+), 66 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 f661920..2042557 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,18 +438,12 @@ 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.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, eventNew, false, false);
+ bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, event, false, false);
verify(partitionedRegion, never()).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY,
- eventNew, false, false);
+ event, false, false);
}
@Test
@@ -458,19 +452,14 @@ 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.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, eventNew, false, false);
+ bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, event, false, false);
verify(partitionedRegion, never()).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY,
- eventNew, false, false);
+ event, false, false);
}
@Test
@@ -478,18 +467,15 @@ 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(eventNew).when(bucketRegion).createEventForPR(eventNew);
+ doReturn(event).when(bucketRegion).createEventForPR(event);
- bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, eventNew, true, false);
+ bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, event, true, false);
- verify(partitionedRegion).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, eventNew,
+ verify(partitionedRegion).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, event,
true, false);
}
@@ -499,15 +485,12 @@ public class BucketRegionTest {
spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
cache, internalRegionArgs, disabledClock()));
doReturn(false).when(bucketRegion).isInitialized();
- final String key = "Object0";
- EntryEventImpl eventNew = new EntryEventImpl();
- eventNew.setGenerateCallbacks(false);
- eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+ doReturn(false).when(event).isGenerateCallbacks();
- bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, eventNew, false);
+ bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, event, false);
verify(partitionedRegion, never()).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
- eventNew, false);
+ event, false);
}
@Test
@@ -516,17 +499,14 @@ 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, eventNew, false);
+ bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, event, false);
verify(partitionedRegion, never()).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
- eventNew, false);
+ event, false);
}
@Test
@@ -535,19 +515,14 @@ public class BucketRegionTest {
spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
cache, internalRegionArgs, disabledClock()));
doReturn(false).when(bucketRegion).isInitialized();
- final String key = "Object0";
- EntryEventImpl eventNew = new EntryEventImpl();
- eventNew.setGenerateCallbacks(true);
- eventNew.setKeyInfo(new KeyInfo(key, null, 0));
-
+ doReturn(true).when(event).isGenerateCallbacks();
doReturn(true).when(partitionedRegion).isInitialized();
doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
- doReturn(eventNew).when(bucketRegion).createEventForPR(eventNew);
+ doReturn(event).when(bucketRegion).createEventForPR(event);
- bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, eventNew, true);
+ bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, event, true);
- verify(partitionedRegion).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE,
- eventNew,
+ verify(partitionedRegion).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, event,
true);
}
@@ -557,14 +532,11 @@ public class BucketRegionTest {
spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
cache, internalRegionArgs, disabledClock()));
doReturn(false).when(bucketRegion).isInitialized();
- final String key = "Object0";
- EntryEventImpl eventNew = new EntryEventImpl();
- eventNew.setGenerateCallbacks(false);
- eventNew.setKeyInfo(new KeyInfo(key, null, 0));
+ doReturn(false).when(event).isGenerateCallbacks();
- bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew, false, false);
+ bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, false, false);
- verify(partitionedRegion, never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew,
+ verify(partitionedRegion, never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event,
false, false);
}
@@ -574,17 +546,13 @@ public class BucketRegionTest {
spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
cache, internalRegionArgs, disabledClock()));
doReturn(false).when(bucketRegion).isInitialized();
- final String key = "Object0";
- EntryEventImpl eventNew = new EntryEventImpl();
- eventNew.setGenerateCallbacks(true);
- eventNew.setKeyInfo(new KeyInfo(key, null, 0));
-
+ doReturn(true).when(event).isGenerateCallbacks();
doReturn(false).when(partitionedRegion).isInitialized();
doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
- bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew, false, false);
+ bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, false, false);
- verify(partitionedRegion, never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew,
+ verify(partitionedRegion, never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event,
false, false);
}
@@ -594,18 +562,14 @@ public class BucketRegionTest {
spy(new BucketRegion(regionName, regionAttributes, partitionedRegion,
cache, internalRegionArgs, disabledClock()));
doReturn(false).when(bucketRegion).isInitialized();
- final String key = "Object0";
- EntryEventImpl eventNew = new EntryEventImpl();
- eventNew.setGenerateCallbacks(true);
- eventNew.setKeyInfo(new KeyInfo(key, null, 0));
-
+ doReturn(true).when(event).isGenerateCallbacks();
doReturn(true).when(partitionedRegion).isInitialized();
doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent();
- doReturn(eventNew).when(bucketRegion).createEventForPR(eventNew);
+ doReturn(event).when(bucketRegion).createEventForPR(event);
- bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew, true, false);
+ bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, true, false);
- verify(partitionedRegion).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, eventNew,
+ verify(partitionedRegion).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event,
true, false);
}
}