From a6fa87638e74f089b7e27e8bd77a1c4a422664ca Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 13 Sep 2021 13:22:56 -0700 Subject: [PATCH] Refer to Apache Geode properties by name using DistributionConfig constants. --- .../tests/mock/GemFireMockObjectsSupport.java | 12 +++++++++--- 1 file changed, 9 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 29d56e8..5fde07b 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 @@ -182,14 +182,18 @@ import org.springframework.util.StringUtils; /** * The {@link GemFireMockObjectsSupport} class is an abstract base class encapsulating factory methods for creating - * Apache Geode or VMware GemFire Mock Objects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, etc). + * Apache Geode or VMware (Pivotal) GemFire Mock Objects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, + * and so on). * * @author John Blum * @see java.io.File * @see java.io.InputStream * @see java.net.InetAddress + * @see java.net.InetSocketAddress * @see java.util.Objects + * @see java.util.Optional * @see java.util.Properties + * @see java.util.Random * @see java.util.UUID * @see org.apache.geode.cache.AttributesMutator * @see org.apache.geode.cache.Cache @@ -1592,12 +1596,14 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { DistributedMember mockDistributedMember = mock(DistributedMember.class); when(mockDistributedMember.getGroups()).thenAnswer(invocation -> - new ArrayList<>(StringUtils.commaDelimitedListToSet(gemfireProperties.get().getProperty("groups")))); + new ArrayList<>(StringUtils.commaDelimitedListToSet(gemfireProperties.get() + .getProperty(DistributionConfig.GROUPS_NAME)))); when(mockDistributedMember.getHost()) .thenReturn(ObjectUtils.doOperationSafely(() -> InetAddress.getLocalHost().getHostName(), null)); - when(mockDistributedMember.getName()).thenAnswer(invocation -> gemfireProperties.get().getProperty("name")); + when(mockDistributedMember.getName()).thenAnswer(invocation -> gemfireProperties.get() + .getProperty(DistributionConfig.NAME_NAME)); return mockDistributedMember; }