You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/02/12 16:37:01 UTC
[2/2] ignite git commit: Unify code in test which cleans up
persistence directories - Fixes #3477.
Unify code in test which cleans up persistence directories - Fixes #3477.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0997b99
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0997b99
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0997b99
Branch: refs/heads/master
Commit: a0997b99c8ee099dcbbeb77b82b315aab6b618e9
Parents: c20a1f0
Author: EdShangGG <es...@gridgain.com>
Authored: Mon Feb 12 19:36:30 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Feb 12 19:36:30 2018 +0300
----------------------------------------------------------------------
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 2 +-
.../DummyPersistenceCompatibilityTest.java | 2 +-
.../FoldersReuseCompatibilityTest.java | 2 +-
...tingToWalV2SerializerWithCompactionTest.java | 2 +-
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 2 +-
...erActivateDeactivateTestWithPersistence.java | 4 +--
.../IgniteMarshallerCacheFSRestoreTest.java | 2 +-
.../cache/WalModeChangeAbstractSelfTest.java | 4 +--
.../cache/WalModeChangeAdvancedSelfTest.java | 4 +--
.../WalModeChangeCommonAbstractSelfTest.java | 9 ------
.../distributed/Cache64kPartitionsTest.java | 2 +-
.../distributed/CacheBaselineTopologyTest.java | 4 +--
...idCacheRebalancingPartitionCountersTest.java | 4 +--
.../PageEvictionMultinodeMixedRegionsTest.java | 4 +--
...eBaselineAffinityTopologyActivationTest.java | 4 +--
.../IgniteDataStorageMetricsSelfTest.java | 6 ++--
...tePdsBinaryMetadataOnClusterRestartTest.java | 2 +-
.../IgnitePdsBinarySortObjectFieldsTest.java | 6 ++--
...gnitePdsCacheAssignmentNodeRestartsTest.java | 4 +--
.../IgnitePdsCacheRebalancingAbstractTest.java | 5 ++--
.../IgnitePdsContinuousRestartTest.java | 13 ++------
.../IgnitePdsContinuousRestartTest2.java | 14 ++-------
.../persistence/IgnitePdsDynamicCacheTest.java | 13 ++------
.../IgnitePdsExchangeDuringCheckpointTest.java | 6 ++--
...MarshallerMappingRestoreOnNodeStartTest.java | 5 ++--
.../IgnitePdsMultiNodePutGetRestartTest.java | 6 ++--
.../persistence/IgnitePdsPageSizesTest.java | 7 ++---
...gnitePdsRecoveryAfterFileCorruptionTest.java | 13 ++------
.../IgnitePdsRemoveDuringRebalancingTest.java | 4 +--
...gnitePdsSingleNodePutGetPersistenceTest.java | 7 ++---
.../IgnitePersistentStoreCacheGroupsTest.java | 6 ++--
...IgnitePersistentStoreDataStructuresTest.java | 4 +--
...teAllBaselineNodesOnlineFullApiSelfTest.java | 2 +-
...gingBaselineDownCachePutAllFailoverTest.java | 8 ++---
...gingBaselineDownCacheRemoveFailoverTest.java | 8 ++---
...angingBaselineUpCachePutAllFailoverTest.java | 8 ++---
...angingBaselineUpCacheRemoveFailoverTest.java | 8 ++---
...gniteOfflineBaselineNodeFullApiSelfTest.java | 2 +-
...eOnlineNodeOutOfBaselineFullApiSelfTest.java | 4 +--
...teStableBaselineCachePutAllFailoverTest.java | 4 +--
...teStableBaselineCacheRemoveFailoverTest.java | 4 +--
.../db/IgnitePdsCacheRestoreTest.java | 4 +--
.../db/IgnitePdsDataRegionMetricsTest.java | 4 +--
.../db/IgnitePdsMultiNodePutGetRestartTest.java | 6 ++--
...PdsPageEvictionDuringPartitionClearTest.java | 6 ++--
.../db/IgnitePdsPageEvictionTest.java | 7 ++---
...tePdsRebalancingOnNotStableTopologyTest.java | 6 ++--
.../db/IgnitePdsTransactionsHangTest.java | 5 ++--
.../db/IgnitePdsWholeClusterRestartTest.java | 16 ++--------
...gniteCheckpointDirtyPagesForLowLoadTest.java | 4 +--
...faultPageSizeBackwardsCompatibilityTest.java | 14 ++-------
.../db/file/IgnitePdsCacheIntegrationTest.java | 7 ++---
.../db/file/IgnitePdsCheckpointSimpleTest.java | 2 +-
...ckpointSimulationWithRealCpDisabledTest.java | 13 ++------
.../file/IgnitePdsDiskErrorsRecoveringTest.java | 9 +++---
.../db/file/IgnitePdsEvictionTest.java | 14 ++-------
.../file/IgnitePdsNoActualWalHistoryTest.java | 7 ++---
.../file/IgnitePdsThreadInterruptionTest.java | 28 +++++-------------
.../IgniteUidAsConsistentIdMigrationTest.java | 11 +++----
.../db/wal/IgniteWalFlushFailoverTest.java | 13 ++------
...lFlushMultiNodeFailoverAbstractSelfTest.java | 15 ++--------
.../wal/IgniteWalHistoryReservationsTest.java | 12 ++------
.../db/wal/IgniteWalRecoveryPPCTest.java | 4 +--
.../IgniteWalRecoverySeveralRestartsTest.java | 6 ++--
.../db/wal/IgniteWalRecoveryTest.java | 4 +--
.../db/wal/IgniteWalSerializerVersionTest.java | 12 ++------
.../persistence/db/wal/WalCompactionTest.java | 4 +--
.../db/wal/WalRecoveryTxLogicalRecordsTest.java | 7 ++---
.../db/wal/reader/IgniteWalReaderTest.java | 2 +-
.../pagemem/PagesWriteThrottleSandboxTest.java | 8 ++---
.../pagemem/PagesWriteThrottleSmokeTest.java | 11 ++++---
.../AbstractNodeJoinTemplate.java | 6 ++--
.../IgniteChangeGlobalStateAbstractTest.java | 4 +--
.../IgniteStandByClusterTest.java | 6 ++--
.../extended/GridActivateExtensionTest.java | 4 +--
...gniteAbstractStandByClientReconnectTest.java | 5 ++--
.../database/IgniteDbAbstractTest.java | 4 +--
.../database/IgniteDbDynamicCacheSelfTest.java | 4 +--
.../IgniteDbPutGetWithCacheStoreTest.java | 4 +--
.../database/SwapPathConstructionSelfTest.java | 4 +--
.../ignite/testframework/GridTestUtils.java | 10 -------
.../junits/common/GridCommonAbstractTest.java | 31 +++++---------------
.../ignite/util/GridCommandHandlerTest.java | 11 ++-----
...CheckClusterStateBeforeExecuteQueryTest.java | 6 ++--
.../cache/IgniteErrorOnRebalanceTest.java | 2 +-
...leNodeWithIndexingPutGetPersistenceTest.java | 7 ++---
.../cache/index/LongIndexNameTest.java | 14 ++-------
.../index/OptimizedMarshallerIndexNameTest.java | 2 +-
...eDbSingleNodeWithIndexingWalRestoreTest.java | 7 ++---
...oreQueryWithMultipleClassesPerCacheTest.java | 13 ++------
.../IgnitePersistentStoreSchemaLoadTest.java | 13 ++------
...ckPartitionOnAffinityRunAtomicCacheTest.java | 8 ++---
...neLockPartitionOnAffinityRunTxCacheTest.java | 8 ++---
...ngBaselineCacheQueryNodeRestartSelfTest.java | 5 ++--
...StableBaselineBinObjFieldsQuerySelfTest.java | 9 +++---
...eBaselineCacheQueryNodeRestartsSelfTest.java | 4 +--
96 files changed, 213 insertions(+), 459 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
index f220b47..f4c0ca3 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
@@ -150,7 +150,7 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
private void cleanUpWorkingDir() throws Exception {
String workDir = U.defaultWorkDirectory();
- deleteRecursively(U.resolveWorkDirectory(workDir, "marshaller", false));
+ U.delete(U.resolveWorkDirectory(workDir, "marshaller", false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/DummyPersistenceCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/DummyPersistenceCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/DummyPersistenceCompatibilityTest.java
index b34c921..b36f563 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/DummyPersistenceCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/DummyPersistenceCompatibilityTest.java
@@ -53,7 +53,7 @@ public class DummyPersistenceCompatibilityTest extends IgnitePersistenceCompatib
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
index 06b96fc..5a64381 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
@@ -65,7 +65,7 @@ public class FoldersReuseCompatibilityTest extends IgnitePersistenceCompatibilit
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
index 0ca3833..d79790e 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
@@ -55,7 +55,7 @@ public class MigratingToWalV2SerializerWithCompactionTest extends IgnitePersiste
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "binary_meta", false));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
index 0f3bf9c..6ad977f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
@@ -53,7 +53,7 @@ public class PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "pagemem", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "pagemem", false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
index 76078bc..58511ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
@@ -45,14 +45,14 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
index ac15971..49f5311 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
@@ -110,7 +110,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest {
private void cleanUpWorkDir() throws Exception {
String workDir = U.defaultWorkDirectory();
- deleteRecursively(U.resolveWorkDirectory(workDir, "marshaller", false));
+ U.delete(U.resolveWorkDirectory(workDir, "marshaller", false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
index 048d720..a4e65aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
@@ -56,7 +56,7 @@ public abstract class WalModeChangeAbstractSelfTest extends WalModeChangeCommonA
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- deleteWorkFiles();
+ cleanPersistenceDir();
startGrid(config(SRV_1, false, filterOnCrd));
startGrid(config(SRV_2, false, false));
@@ -71,7 +71,7 @@ public abstract class WalModeChangeAbstractSelfTest extends WalModeChangeCommonA
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanReferences();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
index 44c5855..0fee748 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
@@ -47,7 +47,7 @@ public class WalModeChangeAdvancedSelfTest extends WalModeChangeCommonAbstractSe
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@@ -56,7 +56,7 @@ public class WalModeChangeAdvancedSelfTest extends WalModeChangeCommonAbstractSe
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
index 2e458f2..1c41386 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.IgniteClientReconnectAbstractTest;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.lang.IgniteInClosureX;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
@@ -43,7 +42,6 @@ import java.util.Collections;
import java.util.concurrent.Callable;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
/**
* Test dynamic WAL mode change.
@@ -317,13 +315,6 @@ public abstract class WalModeChangeCommonAbstractSelfTest extends GridCommonAbst
}
/**
- * @throws IgniteCheckedException If failed.
- */
- protected void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
- }
-
- /**
* Cache node filter.
*/
protected static class CacheNodeFilter implements IgnitePredicate<ClusterNode> {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
index 7d9df26..95e90c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
@@ -89,6 +89,6 @@ public class Cache64kPartitionsTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index e1ffc61..21aedf1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -87,7 +87,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@@ -96,7 +96,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
client = false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
index a02890e..1280e87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
@@ -70,13 +70,13 @@ public class GridCacheRebalancingPartitionCountersTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
index dc3d018..ab47ac4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
@@ -44,7 +44,7 @@ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinode
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
super.beforeTestsStarted();
@@ -55,6 +55,6 @@ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinode
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
index 1a9393a..6b6d666 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
@@ -80,14 +80,14 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids(false);
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
index 5609995..a752605 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
@@ -57,14 +57,14 @@ public class IgniteDataStorageMetricsSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@@ -104,7 +104,7 @@ public class IgniteDataStorageMetricsSelfTest extends GridCommonAbstractTest {
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index 73c269a..989626f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -629,7 +629,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
File baseDirFile = new File(baseDir);
for (File f : baseDirFile.listFiles())
- deleteRecursively(U.resolveWorkDirectory(baseDir, f.getName(), false));
+ U.delete(U.resolveWorkDirectory(baseDir, f.getName(), false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
index 7c8981e..70a0203 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
@@ -86,14 +86,14 @@ public class IgnitePdsBinarySortObjectFieldsTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@@ -113,7 +113,7 @@ public class IgnitePdsBinarySortObjectFieldsTest extends GridCommonAbstractTest
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
index 807f532..0b8f15a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
@@ -80,14 +80,14 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index bf20ee4..8139a36 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -54,7 +54,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
/**
@@ -158,14 +157,14 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
@Override protected void beforeTestsStarted() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
index fa89bf2..99614ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
@@ -41,8 +41,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -104,21 +102,14 @@ public class IgnitePdsContinuousRestartTest extends GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
- }
-
- /**
- * @throws IgniteCheckedException If failed.
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest2.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest2.java
index f45fc50..66b2047 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest2.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest2.java
@@ -25,7 +25,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -40,8 +39,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
* Cause by https://issues.apache.org/jira/browse/IGNITE-7278
*/
@@ -106,21 +103,14 @@ public class IgnitePdsContinuousRestartTest2 extends GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
- }
-
- /**
- * @throws IgniteCheckedException If failed.
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
index ba1933f..871cba3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
@@ -35,8 +35,6 @@ import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.internal.processors.database.IgniteDbDynamicCacheSelfTest;
import org.apache.ignite.internal.util.typedef.internal.U;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -71,7 +69,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@@ -80,7 +78,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
System.clearProperty(GridCacheDatabaseSharedManager.IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC);
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/**
@@ -193,13 +191,6 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
}
/**
- * @throws IgniteCheckedException If failed.
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
- }
-
- /**
*
*/
static class Value implements Serializable {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
index 2586a1f..37d55ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
@@ -30,8 +30,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -125,12 +123,12 @@ public class IgnitePdsExchangeDuringCheckpointTest extends GridCommonAbstractTes
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
index 0429d6b..27bfe28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.cache.affinity.AffinityKeyMapped;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
@@ -59,8 +60,8 @@ public class IgnitePdsMarshallerMappingRestoreOnNodeStartTest extends GridCommon
String tmpDir = System.getProperty("java.io.tmpdir");
- deleteRecursively(Paths.get(tmpDir, "srv0").toFile());
- deleteRecursively(Paths.get(tmpDir, "srv1").toFile());
+ U.delete(Paths.get(tmpDir, "srv0").toFile());
+ U.delete(Paths.get(tmpDir, "srv1").toFile());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
index 6a2c9b8..3eb17c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
@@ -42,8 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -110,7 +108,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
super.beforeTest();
}
@@ -119,7 +117,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
@Override protected void afterTest() throws Exception {
super.afterTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
index d2ec33a..556f376 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
@@ -28,12 +28,9 @@ import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -66,12 +63,12 @@ public class IgnitePdsPageSizesTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
index 8e20585..8f1009b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
@@ -53,8 +53,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -106,14 +104,14 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/**
@@ -394,11 +392,4 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
}
}
}
-
- /**
- *
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
index d2c157b..9c96f7f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
@@ -84,7 +84,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends GridCommonAbstractTest
@Override protected void beforeTestsStarted() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
U.delete(new File(U.getIgniteHome(), DFLT_STORE_DIR));
}
@@ -93,7 +93,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends GridCommonAbstractTest
@Override protected void afterTest() throws Exception {
G.stopAll(true);
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
U.delete(new File(U.getIgniteHome(), DFLT_STORE_DIR));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSingleNodePutGetPersistenceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSingleNodePutGetPersistenceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSingleNodePutGetPersistenceTest.java
index 59a6f84..53cbb54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSingleNodePutGetPersistenceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSingleNodePutGetPersistenceTest.java
@@ -18,9 +18,6 @@
package org.apache.ignite.internal.processors.cache.persistence;
import org.apache.ignite.internal.processors.database.IgniteDbSingleNodePutGetTest;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
/**
*
@@ -28,7 +25,7 @@ import static org.apache.ignite.internal.processors.cache.persistence.file.FileP
public class IgnitePdsSingleNodePutGetPersistenceTest extends IgniteDbSingleNodePutGetTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
super.beforeTest();
}
@@ -37,6 +34,6 @@ public class IgnitePdsSingleNodePutGetPersistenceTest extends IgniteDbSingleNode
@Override protected void afterTest() throws Exception {
super.afterTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
index 1e7ad1b..ef21bd6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
@@ -69,14 +69,14 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@@ -110,7 +110,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
index 301c0bc..53e014e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
@@ -63,14 +63,14 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
index c6aed7d..b2de1db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
@@ -26,7 +26,7 @@ public class IgniteAllBaselineNodesOnlineFullApiSelfTest extends IgniteBaselineA
@Override protected void beforeTestsStarted() throws Exception {
initStoreStrategy();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(gridCount());
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
index 16fa971..15384f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
@@ -60,12 +60,12 @@ public class IgniteChangingBaselineDownCachePutAllFailoverTest extends CachePutA
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(GRIDS_COUNT);
@@ -78,14 +78,14 @@ public class IgniteChangingBaselineDownCachePutAllFailoverTest extends CachePutA
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
index 86b5809..fa96e9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
@@ -82,12 +82,12 @@ public class IgniteChangingBaselineDownCacheRemoveFailoverTest extends GridCache
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(GRIDS_COUNT);
@@ -102,14 +102,14 @@ public class IgniteChangingBaselineDownCacheRemoveFailoverTest extends GridCache
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
index 44c8402..219a221 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
@@ -59,12 +59,12 @@ public class IgniteChangingBaselineUpCachePutAllFailoverTest extends CachePutAll
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(GRIDS_COUNT);
@@ -77,14 +77,14 @@ public class IgniteChangingBaselineUpCachePutAllFailoverTest extends CachePutAll
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
index 8391e0c..b2642e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
@@ -81,12 +81,12 @@ public class IgniteChangingBaselineUpCacheRemoveFailoverTest extends GridCacheAb
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(GRIDS_COUNT);
@@ -99,14 +99,14 @@ public class IgniteChangingBaselineUpCacheRemoveFailoverTest extends GridCacheAb
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
index 3fd4974..ee4f6b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
@@ -26,7 +26,7 @@ public class IgniteOfflineBaselineNodeFullApiSelfTest extends IgniteBaselineAbst
@Override protected void beforeTestsStarted() throws Exception {
initStoreStrategy();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(gridCount());
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
index 07c475b..6cb2b24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.ignite.internal.processors.cache.persistence.baseline;
-import org.apache.ignite.testframework.GridTestUtils;
-
/**
*
*/
@@ -26,7 +24,7 @@ public class IgniteOnlineNodeOutOfBaselineFullApiSelfTest extends IgniteBaseline
@Override protected void beforeTestsStarted() throws Exception {
initStoreStrategy();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(gridCount());
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
index 13f3489..b89415b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
@@ -84,7 +84,7 @@ public class IgniteStableBaselineCachePutAllFailoverTest extends CachePutAllFail
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(GRIDS_COUNT);
@@ -99,6 +99,6 @@ public class IgniteStableBaselineCachePutAllFailoverTest extends CachePutAllFail
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
index b3da12e..c07a9d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
@@ -80,7 +80,7 @@ public class IgniteStableBaselineCacheRemoveFailoverTest extends GridCacheAbstra
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
startGrids(GRIDS_COUNT);
@@ -95,7 +95,7 @@ public class IgniteStableBaselineCacheRemoveFailoverTest extends GridCacheAbstra
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
index 7da765b..525f36a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
@@ -78,14 +78,14 @@ public class IgnitePdsCacheRestoreTest extends GridCommonAbstractTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
index af65d1d..4b7d6ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
@@ -94,14 +94,14 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- GridTestUtils.deleteDbFiles();
+ cleanPersistenceDir();
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
index 615e108..690c9a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
@@ -42,8 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -95,7 +93,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
super.beforeTest();
}
@@ -104,7 +102,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
@Override protected void afterTest() throws Exception {
super.afterTest();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
index 3dfdc57..8858206 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
@@ -36,8 +36,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -89,7 +87,7 @@ public class IgnitePdsPageEvictionDuringPartitionClearTest extends GridCommonAbs
*/
public void testPageEvictionOnNodeStart() throws Exception {
for (int r = 0; r < 3; r++) {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
startGrids(2);
@@ -138,7 +136,7 @@ public class IgnitePdsPageEvictionDuringPartitionClearTest extends GridCommonAbs
finally {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
index 47d0cb2..931e0d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
@@ -33,14 +33,11 @@ import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -88,7 +85,7 @@ public class IgnitePdsPageEvictionTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
stopAllGrids();
@@ -99,7 +96,7 @@ public class IgnitePdsPageEvictionTest extends GridCommonAbstractTest {
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
index 893ecb5..9690174 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
@@ -36,8 +36,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.multijvm.IgniteProcessProxy;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
* We start writing to unstable cluster.
* After that we start killing node.
@@ -192,14 +190,14 @@ public class IgnitePdsRebalancingOnNotStableTopologyTest extends GridCommonAbstr
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
index bf8d984..de0b3bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
@@ -47,7 +47,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionIsolation;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -89,12 +88,12 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
index f52f446..dc6f0ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
@@ -32,12 +32,9 @@ import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.WALMode;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -87,24 +84,17 @@ public class IgnitePdsWholeClusterRestartTest extends GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
- }
-
- /**
- * @throws IgniteCheckedException If failed.
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ cleanPersistenceDir();
}
- /**
+ /**
* @throws Exception if failed.
*/
public void testRestarts() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
index c17f6cb..e5f4ac8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
@@ -83,8 +83,8 @@ public class IgniteCheckpointDirtyPagesForLowLoadTest extends GridCommonAbstract
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false));
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp", false));
+ cleanPersistenceDir();
+ U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp", false));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0997b99/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
index 9e01f7b..e0e277c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
@@ -26,14 +26,11 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -90,14 +87,14 @@ public class DefaultPageSizeBackwardsCompatibilityTest extends GridCommonAbstrac
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- deleteWorkFiles();
+ cleanPersistenceDir();
}
/**
@@ -136,11 +133,4 @@ public class DefaultPageSizeBackwardsCompatibilityTest extends GridCommonAbstrac
for (int i = 0; i < ENTRIES_COUNT; i++)
assertEquals((Integer)i, cache.get(i));
}
-
- /**
- * @throws IgniteCheckedException If failed.
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
- deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
- }
}