From 8eb2321dcaf52341b0564e897baf920d33c5cdad Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 19 Sep 2018 10:19:16 -0700 Subject: [PATCH] Fix unnecessary Region mocking when no Regions exist. --- .../data/gemfire/tests/mock/CacheMockObjects.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java index 0e918ca..7f2b5c0 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; +import java.util.Optional; import java.util.UUID; import org.apache.geode.cache.Cache; @@ -56,13 +57,16 @@ public abstract class CacheMockObjects { public static T mockGemFireCache(T mockGemFireCache, DistributedSystem distributedSystem, ResourceManager resourceManager, Region... regions) { - mockGemFireCache = mockGemFireCache != null ? mockGemFireCache : (T) mock(GemFireCache.class); + T theMockGemFireCache = mockGemFireCache != null ? mockGemFireCache : (T) mock(GemFireCache.class); - when(mockGemFireCache.getDistributedSystem()).thenReturn(distributedSystem); - when(mockGemFireCache.getResourceManager()).thenReturn(resourceManager); - when(mockGemFireCache.rootRegions()).thenReturn(asSet(regions)); + when(theMockGemFireCache.getDistributedSystem()).thenReturn(distributedSystem); + when(theMockGemFireCache.getResourceManager()).thenReturn(resourceManager); - return mockGemFireCache; + Optional.ofNullable(regions) + .filter(it -> it.length != 0) + .ifPresent(it -> when(theMockGemFireCache.rootRegions()).thenReturn(asSet(it))); + + return theMockGemFireCache; } public static ClientCache mockClientCache(DistributedSystem distributedSystem, ResourceManager resourceManager,