From d1959de07be396601b8a78e1e5ae084c96f0289f Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 13 Oct 2022 14:20:17 -0700 Subject: [PATCH] Refactor forked Apache Geode server process (test) working directory cleanup. --- .../ClientCacheIndexingIntegrationTests.java | 23 ++++++++++++++----- .../ClientCachePoolIntegrationTests.java | 9 ++++++++ .../ClientCacheSecurityIntegrationTests.java | 9 ++++++++ ...CacheVariableLocatorsIntegrationTests.java | 9 ++++++++ ...tCacheVariableServersIntegrationTests.java | 8 +++++++ .../ClientSubRegionIntegrationTests.java | 9 ++++++++ .../DurableClientCacheIntegrationTests.java | 9 ++++++++ .../GemFireDataSourceIntegrationTest.java | 13 ++++------- .../GemFireDataSourceIntegrationTests.java | 9 ++++++++ ...nfiguredGemFireServerIntegrationTests.java | 6 +---- ...eClusterConfigurationIntegrationTests.java | 19 ++++++++++++++- ...nctionExecutionWithPdxIntegrationTest.java | 13 +++++++++-- ...wingFunctionExecutionIntegrationTests.java | 12 ++++++++-- .../execution/FunctionIntegrationTests.java | 9 ++++++++ ...onNamespaceRepositoryIntegrationTests.java | 15 +++++++++--- 15 files changed, 145 insertions(+), 27 deletions(-) diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingIntegrationTests.java index 04452d63..7455c331 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingIntegrationTests.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +35,7 @@ import org.apache.geode.cache.query.QueryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -57,22 +59,31 @@ import org.springframework.test.context.junit4.SpringRunner; @SuppressWarnings("unused") public class ClientCacheIndexingIntegrationTests extends ForkingClientServerIntegrationTestsSupport { - @Autowired - private ClientCache clientCache; - - @Autowired - private Index exampleIndex; + private static File serverWorkingDirectory; @BeforeClass public static void startGeodeServer() throws IOException { - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, + serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, asDirectoryName(ClientCacheIndexingIntegrationTests.class)), UUID.randomUUID().toString())); startGemFireServer(serverWorkingDirectory, ServerProcess.class, getServerContextXmlFileLocation(ClientCacheIndexingIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + + @Autowired + private ClientCache clientCache; + + @Autowired + private Index exampleIndex; + private Index getIndex(GemFireCache gemfireCache, String indexName) { QueryService queryService = gemfireCache instanceof ClientCache diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java index 4d2961bc..b245332e 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -68,6 +70,13 @@ public class ClientCachePoolIntegrationTests extends ForkingClientServerIntegrat getServerContextXmlFileLocation(ClientCachePoolIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Autowired @Qualifier("Factorials") private Region factorials; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityIntegrationTests.java index eda3c8c0..b252dec5 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityIntegrationTests.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,6 +38,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.ClassPathResource; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -78,6 +80,13 @@ public class ClientCacheSecurityIntegrationTests extends ForkingClientServerInte System.setProperty("javax.net.ssl.keyStore", trustedKeystore.getFile().getAbsolutePath()); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Autowired @Qualifier("Example") private Region example; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsIntegrationTests.java index 6169083b..1e48b6fa 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsIntegrationTests.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -74,6 +76,13 @@ public class ClientCacheVariableLocatorsIntegrationTests extends ForkingClientSe getServerContextXmlFileLocation(ClientCacheVariableLocatorsIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Autowired @Qualifier("Example") private Region example; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersIntegrationTests.java index 7593f6cd..0a38c2a6 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersIntegrationTests.java @@ -46,6 +46,7 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.data.gemfire.util.CollectionUtils; import org.springframework.test.context.ContextConfiguration; @@ -95,6 +96,13 @@ public class ClientCacheVariableServersIntegrationTests extends ForkingClientSer startGemFireServer(serverWorkingDirectory, ServerProcess.class, arguments.toArray(new String[0])); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @AfterClass public static void cleanup() { Arrays.asList("test.cache.server.port.one", "test.cache.server.port.two").forEach(System::clearProperty); diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java index be2963b9..6ac07f93 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java @@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +33,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -63,6 +65,13 @@ public class ClientSubRegionIntegrationTests extends ForkingClientServerIntegrat getServerContextXmlFileLocation(ClientSubRegionIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Autowired private ClientCache clientCache; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTests.java index cf207ac6..27ac9050 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTests.java @@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -57,6 +58,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.data.gemfire.util.DistributedSystemUtils; import org.springframework.test.annotation.DirtiesContext; @@ -111,6 +113,13 @@ public class DurableClientCacheIntegrationTests extends ForkingClientServerInteg getServerContextXmlFileLocation(DurableClientCacheIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + private static boolean isAfterDirtiesContext() { return dirtiesContext.get(); } diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java index 6c63ff50..e5f4c0fa 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java @@ -38,9 +38,9 @@ import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; import org.springframework.data.gemfire.tests.process.ProcessWrapper; +import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.FileSystemUtils; /** * Integration Tests with test cases testing the contract and functionality of the <gfe-data:datasource> element @@ -81,13 +81,10 @@ public class GemFireDataSourceIntegrationTest extends ForkingClientServerIntegra } @AfterClass - public static void stopGemFireServer() { - - if (Boolean.parseBoolean(System.getProperty("spring.gemfire.fork.clean", Boolean.TRUE.toString()))) { - getGemFireServerProcess() - .map(ProcessWrapper::getWorkingDirectory) - .ifPresent(workingDirectory -> FileSystemUtils.deleteRecursively(workingDirectory)); - } + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); } @Autowired diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java index 0a6fc93b..604a02c7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +36,7 @@ import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.data.gemfire.repository.sample.PersonRepository; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -68,6 +70,13 @@ public class GemFireDataSourceIntegrationTests extends ForkingClientServerIntegr getServerContextXmlFileLocation(GemFireDataSourceIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Autowired private ApplicationContext applicationContext; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTests.java index 920d9af9..e0c21d12 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTests.java @@ -133,12 +133,8 @@ public class GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTe public static void stopGemFireServer() { stop(gemfireServer); - System.clearProperty("CACHE_SERVER_PORT"); - - if (Boolean.parseBoolean(System.getProperty("spring.gemfire.fork.clean", String.valueOf(true)))) { - org.springframework.util.FileSystemUtils.deleteRecursively(gemfireServer.getWorkingDirectory()); - } + org.springframework.util.FileSystemUtils.deleteRecursively(gemfireServer.getWorkingDirectory()); } @Autowired diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java index d21d416f..e1027a1e 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java @@ -17,9 +17,12 @@ package org.springframework.data.gemfire.config.annotation; import static org.assertj.core.api.Assertions.assertThat; +import java.io.File; import java.util.Arrays; import java.util.Collections; +import java.util.UUID; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -44,6 +47,8 @@ import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.data.gemfire.config.admin.remote.RestHttpGemfireAdminTemplate; import org.springframework.data.gemfire.support.ConnectionEndpoint; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; +import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -80,7 +85,19 @@ public class EnableClusterConfigurationIntegrationTests extends ForkingClientSer @BeforeClass public static void startGemFireServer() throws Exception { - startGemFireServer(GeodeServerTestConfiguration.class); + + File serverWorkingDirectory = createDirectory(new File(new File( + org.springframework.data.gemfire.tests.util.FileSystemUtils.WORKING_DIRECTORY, + asDirectoryName(EnableClusterConfigurationIntegrationTests.class)), UUID.randomUUID().toString())); + + startGemFireServer(serverWorkingDirectory, GeodeServerTestConfiguration.class); + } + + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); } @Before diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java index c460b22d..d876521d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,6 +45,7 @@ import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.data.gemfire.function.sample.ApplicationDomainFunctionExecutions; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -77,10 +79,10 @@ import org.springframework.util.ObjectUtils; public class ClientCacheFunctionExecutionWithPdxIntegrationTest extends ForkingClientServerIntegrationTestsSupport { @Autowired - private ClientCache gemfireClientCache; + private ApplicationDomainFunctionExecutions functionExecutions; @Autowired - private ApplicationDomainFunctionExecutions functionExecutions; + private ClientCache gemfireClientCache; @BeforeClass public static void startGemFireServer() throws Exception { @@ -92,6 +94,13 @@ public class ClientCacheFunctionExecutionWithPdxIntegrationTest extends ForkingC getServerContextXmlFileLocation(ClientCacheFunctionExecutionWithPdxIntegrationTest.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + private PdxInstance toPdxInstance(Map pdxData) { PdxInstanceFactory pdxInstanceFactory = diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTests.java index 8610c87a..feab3017 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTests.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,11 +61,11 @@ import org.springframework.test.context.junit4.SpringRunner; @SuppressWarnings("unused") public class ExceptionThrowingFunctionExecutionIntegrationTests extends ForkingClientServerIntegrationTestsSupport { - private static ProcessWrapper gemfireServer; - @Autowired private ExceptionThrowingFunctionExecution exceptionThrowingFunctionExecution; + private static ProcessWrapper gemfireServer; + @BeforeClass public static void startGeodeServer() throws IOException { @@ -75,6 +76,13 @@ public class ExceptionThrowingFunctionExecutionIntegrationTests extends ForkingC getServerContextXmlFileLocation(ExceptionThrowingFunctionExecutionIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Test(expected = FunctionException.class) public void exceptionThrowingFunctionExecutionRethrowsException() { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java index f486edc3..fbd718da 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -36,6 +37,7 @@ import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.data.gemfire.function.annotation.RegionData; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.stereotype.Component; import org.springframework.test.context.ContextConfiguration; @@ -69,6 +71,13 @@ public class FunctionIntegrationTests extends ForkingClientServerIntegrationTest getServerContextXmlFileLocation(FunctionIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + @Autowired @Qualifier("TestRegion") private Region region; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/ClientRegionNamespaceRepositoryIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/ClientRegionNamespaceRepositoryIntegrationTests.java index f9dbc2d3..154c2dd9 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/ClientRegionNamespaceRepositoryIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/config/ClientRegionNamespaceRepositoryIntegrationTests.java @@ -17,6 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.util.UUID; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +31,7 @@ import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.data.gemfire.repository.sample.PersonRepository; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; import org.springframework.data.gemfire.tests.objects.geode.cache.RegionDataInitializingPostProcessor; +import org.springframework.data.gemfire.tests.process.ProcessWrapper; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -52,9 +54,6 @@ import org.springframework.test.context.junit4.SpringRunner; @SuppressWarnings("unused") public class ClientRegionNamespaceRepositoryIntegrationTests extends ForkingClientServerIntegrationTestsSupport { - @Autowired - private PersonRepository repository; - @BeforeClass public static void startGemFireServer() throws Exception { @@ -65,6 +64,16 @@ public class ClientRegionNamespaceRepositoryIntegrationTests extends ForkingClie getServerContextXmlFileLocation(ClientRegionNamespaceRepositoryIntegrationTests.class)); } + @AfterClass + public static void removeServerWorkingDirectory() { + getGemFireServerProcess() + .map(ProcessWrapper::getWorkingDirectory) + .ifPresent(FileSystemUtils::deleteRecursive); + } + + @Autowired + private PersonRepository repository; + @Test public void findAllAndCountMatch() {