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 7455c331..3752d0df 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 @@ -17,11 +17,8 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; -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; @@ -35,8 +32,6 @@ 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; @@ -59,25 +54,12 @@ import org.springframework.test.context.junit4.SpringRunner; @SuppressWarnings("unused") public class ClientCacheIndexingIntegrationTests extends ForkingClientServerIntegrationTestsSupport { - private static File serverWorkingDirectory; - @BeforeClass public static void startGeodeServer() throws IOException { - - serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientCacheIndexingIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, getServerContextXmlFileLocation(ClientCacheIndexingIntegrationTests.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/ClientCachePoolIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java index b245332e..66b22cc4 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 @@ -18,10 +18,6 @@ package org.springframework.data.gemfire.client; 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; @@ -36,8 +32,6 @@ 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; import org.springframework.util.Assert; @@ -62,21 +56,10 @@ public class ClientCachePoolIntegrationTests extends ForkingClientServerIntegrat @BeforeClass public static void startGeodeServer() throws Exception { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientCachePoolIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, 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 b252dec5..c799c34c 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 @@ -17,13 +17,10 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.io.IOException; 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; @@ -38,8 +35,6 @@ 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; @@ -61,9 +56,6 @@ public class ClientCacheSecurityIntegrationTests extends ForkingClientServerInte @BeforeClass public static void startGeodeServer() throws IOException { - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientCacheSecurityIntegrationTests.class)), UUID.randomUUID().toString())); - List arguments = new ArrayList(); org.springframework.core.io.Resource trustedKeystore = new ClassPathResource("trusted.keystore"); @@ -75,18 +67,11 @@ public class ClientCacheSecurityIntegrationTests extends ForkingClientServerInte arguments.add(getServerContextXmlFileLocation(ClientCacheSecurityIntegrationTests.class)); - startGemFireServer(serverWorkingDirectory, ServerProcess.class, arguments.toArray(new String[arguments.size()])); + startGemFireServer(ServerProcess.class, arguments.toArray(new String[arguments.size()])); 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 1e48b6fa..a487d307 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 @@ -17,12 +17,9 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; 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; @@ -39,8 +36,6 @@ 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; @@ -69,20 +64,10 @@ public class ClientCacheVariableLocatorsIntegrationTests extends ForkingClientSe System.setProperty("spring.data.gemfire.locator.port", String.valueOf(locatorPort)); - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientCacheVariableLocatorsIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, 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 0a38c2a6..26ab616b 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 @@ -17,13 +17,11 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import org.junit.AfterClass; @@ -46,8 +44,6 @@ 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; import org.springframework.test.context.junit4.SpringRunner; @@ -84,23 +80,13 @@ public class ClientCacheVariableServersIntegrationTests extends ForkingClientSer System.setProperty("test.cache.server.port.one", String.valueOf(cacheServerPortOne)); System.setProperty("test.cache.server.port.two", String.valueOf(cacheServerPortTwo)); - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientCacheVariableServersIntegrationTests.class)), UUID.randomUUID().toString())); - List arguments = new ArrayList<>(); arguments.add(String.format("-Dtest.cache.server.port.one=%d", cacheServerPortOne)); arguments.add(String.format("-Dtest.cache.server.port.two=%d", cacheServerPortTwo)); arguments.add(getServerContextXmlFileLocation(ClientCacheVariableServersIntegrationTests.class)); - startGemFireServer(serverWorkingDirectory, ServerProcess.class, arguments.toArray(new String[0])); - } - - @AfterClass - public static void removeServerWorkingDirectory() { - getGemFireServerProcess() - .map(ProcessWrapper::getWorkingDirectory) - .ifPresent(FileSystemUtils::deleteRecursive); + startGemFireServer(ServerProcess.class, arguments.toArray(new String[0])); } @AfterClass 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 6ac07f93..6f44a2d7 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 @@ -17,10 +17,6 @@ package org.springframework.data.gemfire.client; 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; @@ -33,8 +29,6 @@ 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; @@ -57,19 +51,7 @@ public class ClientSubRegionIntegrationTests extends ForkingClientServerIntegrat @BeforeClass public static void startGeodeServer() throws Exception { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientSubRegionIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, - getServerContextXmlFileLocation(ClientSubRegionIntegrationTests.class)); - } - - @AfterClass - public static void removeServerWorkingDirectory() { - getGemFireServerProcess() - .map(ProcessWrapper::getWorkingDirectory) - .ifPresent(FileSystemUtils::deleteRecursive); + startGemFireServer(ServerProcess.class, getServerContextXmlFileLocation(ClientSubRegionIntegrationTests.class)); } @Autowired 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 27ac9050..0c88b704 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 @@ -18,7 +18,6 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; -import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -26,14 +25,12 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Properties; -import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; 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; @@ -58,8 +55,6 @@ 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; import org.springframework.test.context.ContextConfiguration; @@ -105,21 +100,10 @@ public class DurableClientCacheIntegrationTests extends ForkingClientServerInteg @BeforeClass public static void startGeodeServer() throws IOException { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(DurableClientCacheIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, 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 e5f4c0fa..c1d573aa 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 @@ -17,13 +17,10 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.io.IOException; 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,8 +34,6 @@ import org.springframework.context.ApplicationContext; 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; @@ -66,10 +61,6 @@ public class GemFireDataSourceIntegrationTest extends ForkingClientServerIntegra @BeforeClass public static void startGeodeServer() throws IOException { - File serverWorkingDirectory = createDirectory(new File(new File( - org.springframework.data.gemfire.tests.util.FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(GemFireDataSourceIntegrationTest.class)), UUID.randomUUID().toString())); - List arguments = new ArrayList<>(); arguments.add(String.format("-Dgemfire.name=%s", @@ -77,14 +68,7 @@ public class GemFireDataSourceIntegrationTest extends ForkingClientServerIntegra arguments.add(getServerContextXmlFileLocation(GemFireDataSourceIntegrationTest.class)); - startGemFireServer(serverWorkingDirectory, ServerProcess.class, arguments.toArray(new String[0])); - } - - @AfterClass - public static void removeServerWorkingDirectory() { - getGemFireServerProcess() - .map(ProcessWrapper::getWorkingDirectory) - .ifPresent(FileSystemUtils::deleteRecursive); + startGemFireServer(ServerProcess.class, arguments.toArray(new String[0])); } @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 604a02c7..71a6612d 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 @@ -14,13 +14,10 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.util.Arrays; 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; @@ -36,8 +33,6 @@ 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; @@ -62,21 +57,10 @@ public class GemFireDataSourceIntegrationTests extends ForkingClientServerIntegr @BeforeClass public static void startGeodeServer() throws Exception { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(GemFireDataSourceIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, 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/config/annotation/EnableClusterConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java index e1027a1e..f5378ee5 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 @@ -85,19 +85,7 @@ public class EnableClusterConfigurationIntegrationTests extends ForkingClientSer @BeforeClass public static void startGemFireServer() throws Exception { - - 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); + startGemFireServer(GeodeServerTestConfiguration.class); } @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 d876521d..d67968f9 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 @@ -17,15 +17,12 @@ package org.springframework.data.gemfire.function; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; 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; @@ -45,8 +42,6 @@ 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; import org.springframework.util.Assert; @@ -86,21 +81,10 @@ public class ClientCacheFunctionExecutionWithPdxIntegrationTest extends ForkingC @BeforeClass public static void startGemFireServer() throws Exception { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientCacheFunctionExecutionWithPdxIntegrationTest.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, 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 feab3017..6b47d9a2 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 @@ -17,11 +17,8 @@ package org.springframework.data.gemfire.function; import static org.assertj.core.api.Assertions.assertThat; -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; @@ -35,7 +32,6 @@ import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.function.sample.ExceptionThrowingFunctionExecution; 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,21 +64,10 @@ public class ExceptionThrowingFunctionExecutionIntegrationTests extends ForkingC @BeforeClass public static void startGeodeServer() throws IOException { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ExceptionThrowingFunctionExecutionIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, 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 fbd718da..1975b9c1 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 @@ -14,15 +14,12 @@ package org.springframework.data.gemfire.function.execution; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; 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; @@ -37,8 +34,6 @@ 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; import org.springframework.test.context.junit4.SpringRunner; @@ -63,19 +58,7 @@ public class FunctionIntegrationTests extends ForkingClientServerIntegrationTest @BeforeClass public static void startGemFireServer() throws Exception { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(FunctionIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, - getServerContextXmlFileLocation(FunctionIntegrationTests.class)); - } - - @AfterClass - public static void removeServerWorkingDirectory() { - getGemFireServerProcess() - .map(ProcessWrapper::getWorkingDirectory) - .ifPresent(FileSystemUtils::deleteRecursive); + startGemFireServer(ServerProcess.class, getServerContextXmlFileLocation(FunctionIntegrationTests.class)); } @Autowired 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 154c2dd9..b5b51b92 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 @@ -14,10 +14,6 @@ package org.springframework.data.gemfire.repository.config; 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; @@ -31,8 +27,6 @@ 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; @@ -56,21 +50,10 @@ public class ClientRegionNamespaceRepositoryIntegrationTests extends ForkingClie @BeforeClass public static void startGemFireServer() throws Exception { - - File serverWorkingDirectory = createDirectory(new File(new File(FileSystemUtils.WORKING_DIRECTORY, - asDirectoryName(ClientRegionNamespaceRepositoryIntegrationTests.class)), UUID.randomUUID().toString())); - - startGemFireServer(serverWorkingDirectory, ServerProcess.class, + startGemFireServer(ServerProcess.class, getServerContextXmlFileLocation(ClientRegionNamespaceRepositoryIntegrationTests.class)); } - @AfterClass - public static void removeServerWorkingDirectory() { - getGemFireServerProcess() - .map(ProcessWrapper::getWorkingDirectory) - .ifPresent(FileSystemUtils::deleteRecursive); - } - @Autowired private PersonRepository repository;