IGNITE-7626 Unify code in test which clean up persistence directories -

Fixes #3512. Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com>
apache · Feb 12, 2018 · 6f6f8dd · 6f6f8dd
1 parent a0997b9
commit 6f6f8dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/...ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java b/...ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
@@ -154,8 +154,8 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
     @Override protected void beforeTest() throws Exception {
         stopAllGrids();
 
-        deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
-        deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp", false));
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp", false));
     }
 
     /** {@inheritDoc} */

diff --git a/...ernal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java b/...ernal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
@@ -80,7 +80,7 @@ private DataStorageConfiguration createDbConfig() {
     @Override protected void beforeTestsStarted() throws Exception {
         super.beforeTestsStarted();
 
-        deleteWorkFiles();
+        cleanPersistenceDir();
     }
 
     /** {@inheritDoc} */
@@ -89,7 +89,7 @@ private DataStorageConfiguration createDbConfig() {
 
         stopAllGrids();
 
-        deleteWorkFiles();
+        cleanPersistenceDir();
     }
 
     /**
@@ -151,11 +151,4 @@ private void checkCacheSizes(Ignite client) {
             }
         }
     }
-
-    /**
-     * @throws IgniteCheckedException If fail.
-     */
-    private void deleteWorkFiles() throws IgniteCheckedException {
-        deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
-    }
 }