From 028f9c16dac7010b35f392f00213b5434e0f5d66 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 15 Sep 2020 19:42:58 -0700 Subject: [PATCH] Use doAnswer(..) instead of thenAnser(..) Mockito mock stubbing for Map/Region.get(key). --- .../gemfire/tests/mock/GemFireMockObjectsSupport.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java index 18ee747..61795b8 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java @@ -2358,6 +2358,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { }).when(mockRegion).containsValueForKey(any()); + // Map.forEach(:BiConsumer) doAnswer(invocation -> { BiConsumer consumer = invocation.getArgument(0); @@ -2368,8 +2369,8 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { }).when(mockRegion).forEach(any(BiConsumer.class)); - // Region.get(key) - when(mockRegion.get(ArgumentMatchers.any())).thenAnswer(invocation -> { + // Map.get(key) / Region.get(key) + doAnswer(invocation -> { K key = invocation.getArgument(0); V value = invalidatedKeys.contains(key) ? null : data.get(key); @@ -2400,7 +2401,8 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { } return value; - }); + + }).when(mockRegion).get(ArgumentMatchers.any()); // Region.getEntry(key) when(mockRegion.getEntry(ArgumentMatchers.any())).thenAnswer(regionGetEntryInvocation ->