Spring/spring-test-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing mock hostnameForClients return value.

Browse Source 
Prevent mocking for null ClientSubscriptionConfig and ServerLoadProbe objects.
This commit is contained in:
John Blum
2018-09-19 10:58:01 -07:00
parent 8eb2321dca
commit 9e51e631c7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheServerMockObjects.java
View File

@@ -50,7 +50,7 @@ public abstract class CacheServerMockObjects extends MockObjectsSupport {
// TODO mock ClientSessions and InterestRegistrationListeners
public static CacheServer mockCacheServer(String bindAddress, ClientSubscriptionConfig clientSubscriptionConfig,
String hostnameForClients, long loadPollInterval, ServerLoadProbe serverLoadProbe, int maxConnections,
int maxMessageCount, int maxTimeBetweenPings, int maxThreads, int messageTimeToLive, int port,
int maxMessageCount, int maxThreads, int maxTimeBetweenPings, int messageTimeToLive, int port,
boolean running, int socketBufferSize, boolean tcpNoDelay) throws Exception {
AtomicBoolean runningState = new AtomicBoolean(running);
@@ -58,7 +58,7 @@ public abstract class CacheServerMockObjects extends MockObjectsSupport {
CacheServer mockCacheServer = mock(CacheServer.class);
when(mockCacheServer.getBindAddress()).thenReturn(bindAddress);
when(mockCacheServer.getClientSubscriptionConfig()).thenReturn(clientSubscriptionConfig);
when(mockCacheServer.getHostnameForClients()).thenReturn(hostnameForClients);
when(mockCacheServer.getLoadPollInterval()).thenReturn(loadPollInterval);
when(mockCacheServer.getLoadProbe()).thenReturn(serverLoadProbe);
when(mockCacheServer.getMaxConnections()).thenReturn(maxConnections);
@@ -71,6 +71,11 @@ public abstract class CacheServerMockObjects extends MockObjectsSupport {
when(mockCacheServer.getSocketBufferSize()).thenReturn(socketBufferSize);
when(mockCacheServer.getTcpNoDelay()).thenReturn(tcpNoDelay);
Optional.ofNullable(clientSubscriptionConfig)
.ifPresent(it -> when(mockCacheServer.getClientSubscriptionConfig()).thenReturn(it));
Optional.ofNullable(serverLoadProbe).ifPresent(it -> when(mockCacheServer.getLoadProbe()).thenReturn(it));
doAnswer(invocation -> {
runningState.set(true);
Optional.ofNullable(mockCacheServer.getLoadProbe()).ifPresent(ServerLoadProbe::open);