Conditionally (and recursively) remove the test directory of the forked GemFire/Geode server process.

Author: jxblum

spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java

@@ -36,7 +36,6 @@
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.data.gemfire.tests.process.ProcessWrapper;
-import org.springframework.data.gemfire.tests.util.FileSystemUtils;
 import org.springframework.data.gemfire.tests.util.SocketUtils;
 import org.springframework.data.gemfire.util.ArrayUtils;
 import org.springframework.lang.NonNull;
@@ -172,7 +171,7 @@ protected static boolean stop(@Nullable ProcessWrapper process, long duration) {
 				it.stop(duration);
 
 				if (it.isNotRunning() && isDeleteDirectoryOnExit()) {
-					FileSystemUtils.deleteRecursive(it.getWorkingDirectory());
+					removeRecursiveDirectory(it.getWorkingDirectory());
 				}
 
 				return it.isRunning();

spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java

@@ -55,8 +55,15 @@
  * and bootstrap Apache Geode or VMware GemFire Server {@link Cache} and {@link ClientCache} applications.
  *
  * @author John Blum
+ * @see java.io.File
+ * @see java.net.InetAddress
  * @see org.apache.geode.cache.Cache
  * @see org.apache.geode.cache.client.ClientCache
+ * @see org.springframework.context.ApplicationContext
+ * @see org.springframework.context.annotation.Bean
+ * @see org.springframework.context.annotation.Configuration
+ * @see org.springframework.context.event.ContextRefreshedEvent
+ * @see org.springframework.context.event.EventListener
  * @see org.springframework.data.gemfire.config.annotation.CacheServerApplication
  * @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
  * @see org.springframework.data.gemfire.config.annotation.EnablePdx
@@ -70,6 +77,8 @@
 @SuppressWarnings("unused")
 public abstract class ForkingClientServerIntegrationTestsSupport extends ClientServerIntegrationTestsSupport {
 
+	protected static final String REMOVE_TEST_DIRECTORY_PROPERTY = "spring.data.gemfire.test.directory.remove";
+
 	private static ProcessWrapper gemfireServer;
 
 	public static @NonNull ProcessWrapper startGemFireServer(@NonNull Class<?> gemfireServerMainClass,
@@ -222,7 +231,15 @@ protected static int setAndGetPoolPortProperty(int port) {
 
 	@AfterClass
 	public static void stopGemFireServer() {
+
 		getGemFireServerProcess().ifPresent(ForkingClientServerIntegrationTestsSupport::stop);
+
+		if (Boolean.parseBoolean(System.getProperty(REMOVE_TEST_DIRECTORY_PROPERTY, Boolean.TRUE.toString()))) {
+			getGemFireServerProcess()
+				.map(ProcessWrapper::getWorkingDirectory)
+				.ifPresent(IntegrationTestsSupport::removeRecursiveDirectory);
+		}
+
 		setGemFireServerProcess(null);
 	}
 
@@ -241,10 +258,8 @@ protected static synchronized Optional<ProcessWrapper> getGemFireServerProcess()
 	}
 
 	@EnablePdx
-	@ClientCacheApplication(logLevel = GEMFIRE_LOG_LEVEL)
-	public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration {
-
-	}
+	@ClientCacheApplication
+	public static class BaseGemFireClientConfiguration extends ClientServerIntegrationTestsConfiguration { }
 
 	@EnablePdx
 	@CacheServerApplication(name = "ForkingClientServerIntegrationTestsSupport", logLevel = GEMFIRE_LOG_LEVEL)