From 859f5102009beea6d231b4f7464bba2b4464884b Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 9 Sep 2019 19:20:28 -0700 Subject: [PATCH] Switch clearing all Java, Apache Geode, Pivotal GemFire and Spring System Properties to after test class. --- .../integration/IntegrationTestsSupport.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java index 619f24f..1dd5a4d 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java @@ -103,16 +103,6 @@ public abstract class IntegrationTestsSupport { .or(GEODE_DOT_SYSTEM_PROPERTY_NAME_PREDICATE) .or(SPRING_DOT_SYSTEM_PROPERTY_NAME_PREDICATE); - @BeforeClass - public static void clearAllJavaGemFireGeodeAndSpringDotPrefixedSystemProperties() { - - List allSystemPropertyNames = System.getProperties().stringPropertyNames().stream() - .filter(ALL_SYSTEM_PROPERTIES_NAME_PREDICATE) - .collect(Collectors.toList()); - - allSystemPropertyNames.forEach(System::clearProperty); - } - @BeforeClass public static void closeAnyGemFireCacheInstanceBeforeTestExecution() { closeGemFireCacheWaitOnCloseEvent(); @@ -166,6 +156,16 @@ public abstract class IntegrationTestsSupport { GemfireBeanFactoryLocator.clear(); } + @AfterClass + public static void clearAllJavaGemFireGeodeAndSpringDotPrefixedSystemProperties() { + + List allSystemPropertyNames = System.getProperties().stringPropertyNames().stream() + .filter(ALL_SYSTEM_PROPERTIES_NAME_PREDICATE) + .collect(Collectors.toList()); + + allSystemPropertyNames.forEach(System::clearProperty); + } + @AfterClass public static void destroyAllGemFireMockObjects() { GemFireMockObjectsSupport.destroy();