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

Add test suite setup logic to clear any existing Apache Geode/Pivotal GemFire network Socket configuration.

Browse Source 
Rename clearAllSpringPrefixedSystemProperties() to clearAllSpringDotPrefixedSystemProperties.
This commit is contained in:
John Blum
2018-05-29 19:20:03 -07:00
parent 363a146952
commit 8d91a2a31d
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
View File

@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.junit.BeforeClass;
import org.springframework.data.gemfire.GemfireUtils;
@@ -48,12 +49,7 @@ public abstract class IntegrationTestsSupport {
protected static final String TEST_GEMFIRE_LOG_LEVEL = "error";
@BeforeClass
public static void closeAnyExistingGemFireCacheInstanceBeforeTestExecution() {
closeGemFireCacheWaitOnCloseEvent();
}
@BeforeClass
public static void clearAllSpringPrefixedSystemProperties() {
public static void clearAllSpringDotPrefixedSystemProperties() {
List<String> springSystemProperties = System.getProperties().stringPropertyNames().stream()
.filter(it -> it.toLowerCase().startsWith("spring"))
@@ -62,6 +58,17 @@ public abstract class IntegrationTestsSupport {
springSystemProperties.forEach(System::clearProperty);
}
@BeforeClass
public static void closeAnyExistingGemFireCacheInstanceBeforeTestExecution() {
closeGemFireCacheWaitOnCloseEvent();
}
@BeforeClass
public static void closeAnyExistingSocketConfigurationBeforeTestExecution() {
SocketCreatorFactory.close();
//SSLConfigurationFactory.close();
}
public static void closeGemFireCacheWaitOnCloseEvent() {
closeGemFireCacheWaitOnCloseEvent(DEFAULT_WAIT_DURATION);
}