From d07cff9b65b7bf4cbe20fcb579933c9c8954b705 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Wed, 14 Jul 2021 15:06:25 -0700
Subject: [PATCH] Fix mock Region to mock RegionAttributes association.

Mock RegionAttributes should be a 'Singleton' object, however, Region.getAttributes() was returning a new (mock) RegionAttributes on every invocation.
---
 .../data/gemfire/test/mock/GemFireMockObjectsSupport.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java
index 1c3fb2cc..a8a9f51f 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java
@@ -2036,15 +2036,17 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
 
 	@SuppressWarnings("unchecked")
 	public static <K, V> Region<K, V> mockRegion(RegionService regionService, String name,
-		RegionAttributes<K, V> regionAttributes) {
+			RegionAttributes<K, V> regionAttributes) {
 
 		Map<K, V> data = new ConcurrentHashMap<>();
 
 		Region<K, V> mockRegion = mock(Region.class, name);
 
+		RegionAttributes<K, V> mockRegionAttributes = mockRegionAttributes(mockRegion, regionAttributes);
+
 		Set<Region<?, ?>> subRegions = new CopyOnWriteArraySet<>();
 
-		when(mockRegion.getAttributes()).thenAnswer(invocation -> mockRegionAttributes(mockRegion, regionAttributes));
+		when(mockRegion.getAttributes()).thenReturn(mockRegionAttributes);
 		when(mockRegion.getFullPath()).thenReturn(toRegionPath(name));
 		when(mockRegion.getName()).thenReturn(toRegionName(name));
 		when(mockRegion.getRegionService()).thenReturn(regionService);