From e28b8c25bec291826eb529956d223d097999d70e Mon Sep 17 00:00:00 2001 From: Dan Berindei Date: Fri, 24 Feb 2017 18:20:17 +0200 Subject: [PATCH] ISPN-7530 InfinispanStoreRocksDBIT leaves files in the current directory --- .../as/InfinispanStoreRocksDBIT.java | 20 +++++++++++++++++-- .../src/test/resources/arquillian.xml | 5 ++++- .../test/cs/rocksdb/RocksDBCacheStoreIT.java | 16 +++++++-------- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/integrationtests/wildfly-modules/src/test/java/org/infinispan/test/integration/as/InfinispanStoreRocksDBIT.java b/integrationtests/wildfly-modules/src/test/java/org/infinispan/test/integration/as/InfinispanStoreRocksDBIT.java index 5af28a43a71b..e887b329265c 100644 --- a/integrationtests/wildfly-modules/src/test/java/org/infinispan/test/integration/as/InfinispanStoreRocksDBIT.java +++ b/integrationtests/wildfly-modules/src/test/java/org/infinispan/test/integration/as/InfinispanStoreRocksDBIT.java @@ -3,8 +3,11 @@ import static java.io.File.separator; import static org.junit.Assert.assertEquals; +import java.io.File; + import org.infinispan.Cache; import org.infinispan.Version; +import org.infinispan.commons.util.Util; import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.configuration.global.GlobalConfigurationBuilder; import org.infinispan.manager.DefaultCacheManager; @@ -19,6 +22,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +35,8 @@ */ @RunWith(Arquillian.class) public class InfinispanStoreRocksDBIT { + private static String dataDir = tmpDirectory(InfinispanStoreRocksDBIT.class) + File.separator + "rocksdb-testcache"; + private static String expiredDir = tmpDirectory(InfinispanStoreRocksDBIT.class) + File.separator + "rocksdb-expiredtestcache"; @Deployment public static Archive deployment() { @@ -42,6 +49,13 @@ private static Asset manifest() { return new StringAsset(manifest); } + @Before + @After + public void removeDataFilesIfExists() { + Util.recursiveFileRemove(dataDir); + Util.recursiveFileRemove(expiredDir); + } + /** * To avoid pulling in TestingUtil and its plethora of dependencies */ @@ -56,8 +70,10 @@ public void testCacheManager() { gcb.globalJmxStatistics().allowDuplicateDomains(true); ConfigurationBuilder builder = new ConfigurationBuilder(); - builder.persistence().addStore(RocksDBStoreConfigurationBuilder.class) - .location(tmpDirectory(this.getClass())); + builder.persistence() + .addStore(RocksDBStoreConfigurationBuilder.class) + .location(dataDir) + .expiredLocation(expiredDir); EmbeddedCacheManager cm = new DefaultCacheManager(gcb.build(), builder.build()); Cache cache = cm.getCache(); diff --git a/integrationtests/wildfly-modules/src/test/resources/arquillian.xml b/integrationtests/wildfly-modules/src/test/resources/arquillian.xml index 3cce3441f4ce..12751a904138 100644 --- a/integrationtests/wildfly-modules/src/test/resources/arquillian.xml +++ b/integrationtests/wildfly-modules/src/test/resources/arquillian.xml @@ -14,7 +14,10 @@ -Djgroups.bind_addr=127.0.0.1 -Djgroups.join_timeout=2000 - + + + + 10090 diff --git a/server/integration/testsuite/src/test/java/org/infinispan/server/test/cs/rocksdb/RocksDBCacheStoreIT.java b/server/integration/testsuite/src/test/java/org/infinispan/server/test/cs/rocksdb/RocksDBCacheStoreIT.java index f5875fa5c1ac..cf9fced6899a 100644 --- a/server/integration/testsuite/src/test/java/org/infinispan/server/test/cs/rocksdb/RocksDBCacheStoreIT.java +++ b/server/integration/testsuite/src/test/java/org/infinispan/server/test/cs/rocksdb/RocksDBCacheStoreIT.java @@ -26,6 +26,8 @@ import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -58,18 +60,15 @@ public class RocksDBCacheStoreIT { private final TestMarshaller clientMarshaller = new TestMarshaller(); - private void removeDataFilesIfExists() { - if (dataDir.exists()) { - Util.recursiveFileRemove(dataDir); - } - if (expiredDir.exists()) { - Util.recursiveFileRemove(expiredDir); - } + @Before + @After + public void removeDataFilesIfExists() { + Util.recursiveFileRemove(dataDir); + Util.recursiveFileRemove(expiredDir); } @Test public void testDataSurvivesRestart() throws Exception { - removeDataFilesIfExists(); controller.start(CONTAINER); RemoteInfinispanCacheManager managerJmx = server.getCacheManager("local"); RemoteInfinispanCache cacheJmx = managerJmx.getCache("testcache"); @@ -97,7 +96,6 @@ public void testDataSurvivesRestart() throws Exception { @Test public void testDataRetrievableViaRocksDbApi() throws Exception { - removeDataFilesIfExists(); controller.start(CONTAINER); RemoteInfinispanCacheManager managerJmx = server.getCacheManager("local"); RemoteInfinispanCache cacheJmx = managerJmx.getCache("testcache");