From 1dfdbada7ca1078df6acf33ddf908f4bfd93670c Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 May 2018 23:30:31 -0700 Subject: [PATCH] Clear all 'spring.*' prefixed System properties after integration tests. --- .../tests/integration/IntegrationTestsSupport.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java index 68cbdd2..44f80ee 100644 --- a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java +++ b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java @@ -16,12 +16,15 @@ package org.springframework.data.gemfire.tests.integration; +import java.util.List; import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.GemFireCache; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.springframework.data.gemfire.GemfireUtils; @@ -50,6 +53,16 @@ public abstract class IntegrationTestsSupport { closeGemFireCacheWaitOnCloseEvent(); } + @AfterClass + public static void clearSpringSystemProperties() { + + List springSystemProperties = System.getProperties().stringPropertyNames().stream() + .filter(it -> it.toLowerCase().startsWith("spring")) + .collect(Collectors.toList()); + + springSystemProperties.forEach(System::clearProperty); + } + public static void closeGemFireCacheWaitOnCloseEvent() { closeGemFireCacheWaitOnCloseEvent(DEFAULT_WAIT_DURATION); }