From 2e941419945b757a3400c784aa3ce16cb34361b1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 16 Sep 2020 12:13:05 -0700 Subject: [PATCH] Use doAnser(..) instead of thenAnser(..) Mockito mock stubbing for getSubregions(..) and subregions(..) operations on mock Region. --- .../gemfire/tests/mock/GemFireMockObjectsSupport.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 104aedc..95ca6ce 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 @@ -2325,15 +2325,16 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { mockRegionDataAccessOperations(mockRegion, mockRegionAttributes); - when(mockRegion.getSubregion(anyString())).thenAnswer(invocation -> { + doAnswer(invocation -> { String subRegionPath = toRegionPath(invocation.getArgument(0)); String subRegionFullPath = String.format("%1$s%2$s", mockRegion.getFullPath(), subRegionPath); return regions.get(subRegionFullPath); - }); - when(mockRegion.subregions(anyBoolean())).thenAnswer(invocation -> { + }).when(mockRegion).getSubregion(anyString()); + + doAnswer(invocation -> { boolean recursive = invocation.getArgument(0); @@ -2342,7 +2343,8 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { .flatMap(subRegion -> subRegion.subregions(true).stream()) .collect(Collectors.toSet()) : subRegions; - }); + + }).when(mockRegion).subregions(anyBoolean()); return rememberMockedRegion(mockRegion); }