From 224f1485d81570d54db367a9cb79e99eeb5ff118 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Mar 2019 00:34:48 -0700 Subject: [PATCH] Modify the sslConfigurationIsEnabled test case method to spy on the SslEnvironmentPostProcessor and do nothing when postProcessEnvironment(..) is called. --- .../ssl/SslAutoConfigurationUnitTests.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java index 2042477a..6783208a 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/SslAutoConfigurationUnitTests.java @@ -16,7 +16,9 @@ package org.springframework.geode.boot.autoconfigure.security.ssl; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -25,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; +import org.springframework.boot.SpringApplication; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; import org.springframework.geode.boot.autoconfigure.SslAutoConfiguration; @@ -65,10 +68,19 @@ public class SslAutoConfigurationUnitTests { @Test public void sslConfigurationIsEnabled() { - SslEnvironmentPostProcessor environmentPostProcessor = new SslEnvironmentPostProcessor(); + SslEnvironmentPostProcessor environmentPostProcessor = spy(new SslEnvironmentPostProcessor()); + + doNothing().when(environmentPostProcessor) + .postProcessEnvironment(any(ConfigurableEnvironment.class), any(SpringApplication.class)); ConfigurableEnvironment mockEnvironment = mock(ConfigurableEnvironment.class); + when(mockEnvironment.containsProperty(eq("spring.boot.data.gemfire.security.ssl.keystore.name"))) + .thenReturn(true); + + when(mockEnvironment.getProperty("spring.boot.data.gemfire.security.ssl.keystore.name")) + .thenReturn("non-existing-trusted.keystore"); + when(mockEnvironment.getProperty(eq(SslAutoConfiguration.SECURITY_SSL_ENVIRONMENT_POST_PROCESSOR_ENABLED_PROPERTY), eq(Boolean.class), eq(true))) .thenReturn(true); @@ -81,6 +93,15 @@ public class SslAutoConfigurationUnitTests { verify(mockEnvironment, times(1)) .containsProperty(eq("spring.data.gemfire.security.ssl.keystore")); + + verify(mockEnvironment, times(3)) + .containsProperty(eq("spring.boot.data.gemfire.security.ssl.keystore.name")); + + verify(mockEnvironment, times(3)) + .getProperty(eq("spring.boot.data.gemfire.security.ssl.keystore.name")); + + verify(environmentPostProcessor, never()) + .postProcessEnvironment(eq(mockEnvironment), any(SpringApplication.class)); } @Test