ISPN-11806 AsyncStoreWithoutEvictionFunctionalTest remove data from core

infinispan · May 8, 2020 · 90ee91c · 90ee91c
1 parent f19be00
commit 90ee91c
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/...test/java/org/infinispan/persistence/support/AsyncStoreWithoutEvictionFunctionalTest.java b/...test/java/org/infinispan/persistence/support/AsyncStoreWithoutEvictionFunctionalTest.java
@@ -3,14 +3,11 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
-import java.io.File;
-
 import org.infinispan.Cache;
 import org.infinispan.commons.test.CommonsTestingUtil;
 import org.infinispan.commons.util.Util;
 import org.infinispan.configuration.cache.CacheMode;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
-import org.infinispan.configuration.cache.SingleFileStoreConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.persistence.file.SingleFileStore;
@@ -29,13 +26,13 @@
 /**
  *  @author mgencur@redhat.com
  */
-@Test(groups = "functional", testName = "persistence.decorators.AsyncStoreWithoutEvictionFunctionalTest")
+@Test(groups = "functional", testName = "persistence.support.AsyncStoreWithoutEvictionFunctionalTest")
 public class AsyncStoreWithoutEvictionFunctionalTest extends AbstractInfinispanTest {
 
    private EmbeddedCacheManager dcm;
 
    private boolean segmented;
-   private File tmpDirectory;
+   private String tmpDirectory;
 
    @AfterClass(alwaysRun = true)
    public void clearTempDir() {
@@ -62,31 +59,25 @@ protected String parameters() {
       return "segmented-" + segmented;
    }
 
-   private EmbeddedCacheManager configureCacheManager(boolean async) throws Exception {
+   private EmbeddedCacheManager configureCacheManager() {
 
-      tmpDirectory = new File(CommonsTestingUtil.tmpDirectory(this.getClass()));
+      tmpDirectory =CommonsTestingUtil.tmpDirectory(this.getClass());
       Util.recursiveFileRemove(tmpDirectory);
 
-      GlobalConfigurationBuilder glob = new GlobalConfigurationBuilder().nonClusteredDefault()
-                                                                        .defaultCacheName("cache");
+      GlobalConfigurationBuilder glob = new GlobalConfigurationBuilder().nonClusteredDefault().defaultCacheName("cache");
+      glob.globalState().persistentLocation(tmpDirectory);
       ConfigurationBuilder cacheb = new ConfigurationBuilder();
-      SingleFileStoreConfigurationBuilder sfsb = cacheb
-            .clustering().cacheMode(CacheMode.LOCAL)
+      cacheb.clustering().cacheMode(CacheMode.LOCAL)
             .transaction().transactionMode(TransactionMode.NON_TRANSACTIONAL)
-            .persistence().addSingleFileStore().segmented(segmented);
-
-      if (async) {
-         sfsb.async().enable().threadPoolSize(10).modificationQueueSize(1000);
-      } else {
-         sfsb.async().disable();
-      }
+            .persistence().addSingleFileStore().segmented(segmented)
+            .async().enable().threadPoolSize(10).modificationQueueSize(1000);
 
       return TestCacheManagerFactory.createCacheManager(glob, cacheb);
    }
 
    @BeforeClass
-   public void setUp() throws Exception {
-      dcm = configureCacheManager(true);
+   public void setUp() {
+      dcm = configureCacheManager();
    }
 
    @AfterClass