GEODE-2632: make GemFireCacheImpl.getRegion(String) non-final * mock getRegion(String) in ParallelQueueRemovalMessageJUnitTest
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a48be603 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a48be603 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a48be603 Branch: refs/heads/feature/GEODE-2852 Commit: a48be603dbd135eaac3f79080b6457ca221dfa11 Parents: 1fc0f0c Author: Kirk Lund <[email protected]> Authored: Wed Apr 26 11:16:57 2017 -0700 Committer: Kirk Lund <[email protected]> Committed: Thu Apr 27 13:45:50 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 5 +---- .../wan/parallel/ParallelQueueRemovalMessageJUnitTest.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/a48be603/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java index de7558c..a181054 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java @@ -3162,11 +3162,8 @@ public class GemFireCacheImpl } } - /** - * TODO: any changes to this method breaks ParallelQueueRemovalMessageJUnitTest - */ @Override - public final Region getRegion(String path) { + public Region getRegion(String path) { return getRegion(path, false); } http://git-wip-us.apache.org/repos/asf/geode/blob/a48be603/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java index b7ee5c8..1221b6e 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java @@ -121,7 +121,7 @@ public class ParallelQueueRemovalMessageJUnitTest { .thenReturn(Region.SEPARATOR + PartitionedRegionHelper.PR_ROOT_REGION_NAME); when(this.cache.getRegion(PartitionedRegionHelper.PR_ROOT_REGION_NAME, true)) .thenReturn(this.rootRegion); - when(this.cache.getRegion(getRegionQueueName(), false)).thenReturn(this.queueRegion); + when(this.cache.getRegion(getRegionQueueName())).thenReturn(this.queueRegion); } private void createBucketRegionQueue() {
