This is an automated email from the ASF dual-hosted git repository.
irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ae8c63d IGNITE-8558 Provide an opportunity to stop grids and cancel
tasks after execution all tests - Fixes #5477.
ae8c63d is described below
commit ae8c63da6d583fde5fe0524a2fd3ebffbc0093e8
Author: Rodion4ik <[email protected]>
AuthorDate: Wed Feb 13 13:39:48 2019 +0300
IGNITE-8558 Provide an opportunity to stop grids and cancel tasks after
execution all tests - Fixes #5477.
Signed-off-by: Ivan Rakov <[email protected]>
---
.../jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java | 5 -----
.../jdbc/thin/JdbcThinConnectionMvccEnabledSelfTest.java | 6 ------
.../apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java | 5 -----
.../jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java | 7 -------
.../thin/JdbcThinTransactionsAbstractComplexSelfTest.java | 7 -------
.../cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java | 5 -----
.../internal/processors/cache/CacheEventWithTxLabelTest.java | 7 -------
.../processors/cache/CacheGetsDistributionAbstractTest.java | 7 -------
.../processors/cache/GridCacheEntryMemorySizeSelfTest.java | 7 -------
.../processors/cache/IgniteDynamicCacheStartFailTest.java | 7 -------
.../internal/processors/cache/IgniteTxAbstractTest.java | 7 -------
.../GridCacheAbstractDistributedByteArrayValuesSelfTest.java | 4 ----
.../distributed/IgniteCacheSystemTransactionsSelfTest.java | 7 -------
.../cache/distributed/IgniteMvccTxTimeoutAbstractTest.java | 7 -------
.../distributed/IgniteOptimisticTxSuspendResumeTest.java | 5 -----
...iteTxCacheWriteSynchronizationModesMultithreadedTest.java | 7 -------
.../distributed/IgniteTxConcurrentRemoveObjectsTest.java | 2 --
.../cache/distributed/IgniteTxTimeoutAbstractTest.java | 7 -------
.../dht/GridCacheAbstractTransformWriteThroughSelfTest.java | 2 --
.../cache/distributed/near/NearCacheSyncUpdateTest.java | 7 -------
.../cache/distributed/near/NoneRebalanceModeSelfTest.java | 7 -------
.../cache/local/GridCacheLocalByteArrayValuesSelfTest.java | 2 --
.../processors/cache/mvcc/CacheMvccAbstractFeatureTest.java | 4 ----
.../processors/cache/mvcc/MvccUnsupportedTxModesTest.java | 7 -------
.../persistence/wal/AbstractWalDeltaConsistencyTest.java | 7 -------
.../CacheEntryProcessorExternalizableFailedTest.java | 7 -------
.../continuous/CacheEntryProcessorNonSerializableTest.java | 7 -------
.../cache/transactions/AtomicOperationsInTxTest.java | 7 -------
.../internal/processors/cache/transactions/TxLabelTest.java | 7 -------
.../stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java | 7 -------
.../tcp/GridTcpCommunicationSpiConfigSelfTest.java | 4 ----
.../tcp/TcpCommunicationSpiSkipMessageSendTest.java | 4 ----
.../apache/ignite/testframework/junits/GridAbstractTest.java | 2 +-
.../cache/CacheQueryAfterDynamicCacheStartFailureTest.java | 7 -------
.../processors/cache/GridCacheDynamicLoadOnClientTest.java | 7 -------
.../cache/index/ComplexSecondaryKeyUnwrapSelfTest.java | 7 -------
.../processors/cache/index/DynamicIndexAbstractSelfTest.java | 7 -------
.../SqlTransactionCommandsWithMvccDisabledSelfTest.java | 8 --------
.../SqlTransactionsCommandsWithMvccEnabledSelfTest.java | 7 -------
.../processors/cache/index/SqlTransactionsSelfTest.java | 7 -------
.../processors/query/IgniteSqlGroupConcatCollocatedTest.java | 5 -----
.../query/IgniteSqlGroupConcatNotCollocatedTest.java | 5 -----
.../processors/query/IgniteSqlQueryParallelismTest.java | 5 -----
.../query/h2/H2ResultSetIteratorNullifyOnEndSelfTest.java | 5 -----
.../internal/processors/query/h2/sql/ExplainSelfTest.java | 12 +++---------
.../h2/twostep/AndOperationExtractPartitionSelfTest.java | 5 -----
.../query/h2/twostep/CreateTableWithDateKeySelfTest.java | 2 --
.../h2/twostep/InOperationExtractPartitionSelfTest.java | 2 --
.../test/java/org/apache/ignite/sqltests/BaseSqlTest.java | 7 -------
.../ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java | 4 ----
.../ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java | 5 -----
.../inference/builder/IgniteDistributedModelBuilderTest.java | 5 -----
.../org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java | 5 -----
.../ml/nn/performance/MLPTrainerMnistIntegrationTest.java | 5 -----
.../scoring/cursor/CacheBasedLabelPairCursorTest.java | 5 -----
.../ignite/ml/selection/scoring/evaluator/EvaluatorTest.java | 5 -----
.../DecisionTreeClassificationTrainerIntegrationTest.java | 5 -----
.../tree/performance/DecisionTreeMNISTIntegrationTest.java | 5 -----
.../rest/protocols/http/jetty/RestSetupSimpleTest.java | 5 -----
59 files changed, 4 insertions(+), 333 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
index 8f000de..25f2014 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
@@ -51,11 +51,6 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest
extends JdbcThinAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
ignite(0).getOrCreateCache(cacheConfig());
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMvccEnabledSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMvccEnabledSelfTest.java
index d30e1f1..fa13ed7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMvccEnabledSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMvccEnabledSelfTest.java
@@ -79,12 +79,6 @@ public class JdbcThinConnectionMvccEnabledSelfTest extends
JdbcThinAbstractSelfT
startGridsMultiThreaded(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
-
/**
* @throws Exception If failed.
*/
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
index 4e05031..7d15e17 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
@@ -79,11 +79,6 @@ public class JdbcThinDataSourceSelfTest extends
JdbcThinAbstractSelfTest {
startGridsMultiThreaded(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java
index f345dd6..6f94313 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java
@@ -147,11 +147,4 @@ public class JdbcThinMetadataPrimaryKeysSelfTest extends
GridCommonAbstractTest
Arrays.asList(expPKFields), colNames);
}
}
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
index 2c30dc6..067ea39 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
@@ -190,13 +190,6 @@ public abstract class
JdbcThinTransactionsAbstractComplexSelfTest extends JdbcTh
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
execute("DELETE FROM \"Person\".Person");
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
index 9b1b638..f26cc49 100644
---
a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
@@ -50,11 +50,6 @@ public class GridCacheLoadOnlyStoreAdapterSelfTest extends
GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
grid(0).destroyCache(DEFAULT_CACHE_NAME);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEventWithTxLabelTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEventWithTxLabelTest.java
index a39ae2e..1165d93 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEventWithTxLabelTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEventWithTxLabelTest.java
@@ -130,13 +130,6 @@ public class CacheEventWithTxLabelTest extends
GridCommonAbstractTest {
Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10270",
MvccFeatureChecker.forcedMvcc());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* Check all cases for passing transaction label in cash event.
*
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetsDistributionAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetsDistributionAbstractTest.java
index 86ecf52..cf2ff1b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetsDistributionAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetsDistributionAbstractTest.java
@@ -76,13 +76,6 @@ public abstract class CacheGetsDistributionAbstractTest
extends GridCommonAbstra
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index f3959c1..c6f74cb 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -106,13 +106,6 @@ public class GridCacheEntryMemorySizeSelfTest extends
GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
grid(0).destroyCache(DEFAULT_CACHE_NAME);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailTest.java
index 888a458..206e1ac 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailTest.java
@@ -36,11 +36,4 @@ public class IgniteDynamicCacheStartFailTest extends
IgniteAbstractDynamicCacheS
awaitPartitionMapExchange();
}
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
index 93054ab..a6ca1b7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
@@ -100,13 +100,6 @@ abstract class IgniteTxAbstractTest extends
GridCommonAbstractTest {
startGridsMultiThreaded(gridCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @return Keys.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
index d1134c2..3b961f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
@@ -122,10 +122,6 @@ public abstract class
GridCacheAbstractDistributedByteArrayValuesSelfTest extend
@Override protected void afterTestsStopped() throws Exception {
caches = null;
mvccCaches = null;
-
- stopAllGrids();
-
- super.afterTestsStopped();
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
index 0d03f8b..3517d82 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
@@ -56,13 +56,6 @@ public class IgniteCacheSystemTransactionsSelfTest extends
GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (String cacheName : new String[] {DEFAULT_CACHE_NAME,
CU.UTILITY_CACHE_NAME}) {
IgniteKernal kernal = (IgniteKernal)ignite(0);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
index 82253be..bc21f37 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
@@ -55,13 +55,6 @@ public class IgniteMvccTxTimeoutAbstractTest extends
GridCommonAbstractTest {
startGridsMultiThreaded(GRID_COUNT, true);
}
- /**
- * @throws Exception If failed.
- */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
index cbf2445..f63f28a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
@@ -154,11 +154,6 @@ public class IgniteOptimisticTxSuspendResumeTest extends
GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids(true);
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (CacheConfiguration ccfg : cacheConfigurations())
ignite(0).destroyCache(ccfg.getName());
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
index cff41c6..829d9dc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
@@ -117,13 +117,6 @@ public class
IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-9470",
MvccFeatureChecker.forcedMvcc());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
index 42fcd1a..5a65e21 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
@@ -69,8 +69,6 @@ public class IgniteTxConcurrentRemoveObjectsTest extends
GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
System.setProperty(IGNITE_CACHE_REMOVED_ENTRIES_TTL,
Long.toString(oldIgniteCacheRmvEntriesTtl));
super.afterTestsStopped();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
index c94e00b..0e2b038 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
@@ -56,13 +56,6 @@ public class IgniteTxTimeoutAbstractTest extends
GridCommonAbstractTest {
startGridsMultiThreaded(GRID_COUNT);
}
- /**
- * @throws Exception If failed.
- */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
index 570cee9..f2457c7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
@@ -139,8 +139,6 @@ public abstract class
GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids(true);
-
stores.clear();
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
index 6653155..3669a36 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
@@ -47,13 +47,6 @@ public class NearCacheSyncUpdateTest extends
GridCommonAbstractTest {
startGridsMultiThreaded(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
index a510b6c..5b3d002 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
@@ -51,13 +51,6 @@ public class NoneRebalanceModeSelfTest extends
GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index 602db15..f0ba8fa 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -86,8 +86,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends
GridCacheAbstractByte
@Override protected void afterTestsStopped() throws Exception {
cache = null;
ignite = null;
-
- stopAllGrids();
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
index a032e42..353477d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
@@ -78,10 +78,6 @@ public abstract class CacheMvccAbstractFeatureTest extends
CacheMvccAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
-
node = null;
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java
index 1bc41e2..7120cee 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java
@@ -55,13 +55,6 @@ public class MvccUnsupportedTxModesTest extends
GridCommonAbstractTest {
.setAtomicityMode(TRANSACTIONAL_SNAPSHOT));
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/** */
@Test
public void testGetAndPutIfAbsent() {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
index 3b324d5..c99553a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalDeltaConsistencyTest.java
@@ -56,13 +56,6 @@ public abstract class AbstractWalDeltaConsistencyTest
extends GridCommonAbstract
return defaultCacheConfiguration().setName(name);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Check page memory on each checkpoint.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
index 43ea09c..f40eb9a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
@@ -101,13 +101,6 @@ public class CacheEntryProcessorExternalizableFailedTest
extends GridCommonAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
index 8a31cc5..0b64a2f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
@@ -97,13 +97,6 @@ public class CacheEntryProcessorNonSerializableTest extends
GridCommonAbstractTe
startGrid(getServerNodeCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @return Server nodes.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AtomicOperationsInTxTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AtomicOperationsInTxTest.java
index fea2fe0..8daaa13 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AtomicOperationsInTxTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/AtomicOperationsInTxTest.java
@@ -62,13 +62,6 @@ public class AtomicOperationsInTxTest extends
GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
index 4128f98..a00bc9a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxLabelTest.java
@@ -33,13 +33,6 @@ public class TxLabelTest extends GridCommonAbstractTest {
startGrid(0).getOrCreateCache(defaultCacheConfiguration());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Tests transaction labels.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
index 7d59bc8..3fd320d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
@@ -60,13 +60,6 @@ public class IoStatisticsMetricsLocalMXBeanImplSelfTest
extends GridCommonAbstra
ignite = startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* Simple test JMX bean for indexes IO stats.
*
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
index 98b4ec3..0aabf25 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
@@ -71,8 +71,4 @@ public class GridTcpCommunicationSpiConfigSelfTest extends
GridSpiAbstractConfig
startGrid(cfg);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiSkipMessageSendTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiSkipMessageSendTest.java
index 53a316b..0d4e685 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiSkipMessageSendTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiSkipMessageSendTest.java
@@ -320,8 +320,4 @@ public class TcpCommunicationSpiSkipMessageSendTest extends
GridCommonAbstractTe
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 3dc87c1..b5edfd9 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1778,7 +1778,7 @@ public abstract class GridAbstractTest extends
JUnit3TestLegacySupport {
}
if (isSafeTopology()) {
- stopAllGrids(false);
+ stopAllGrids(true);
if (stopGridErr) {
err = new RuntimeException("Not all Ignite instances has been
stopped. " +
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
index f28833e..3618468 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
@@ -40,13 +40,6 @@ public class CacheQueryAfterDynamicCacheStartFailureTest
extends IgniteAbstractD
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
protected CacheConfiguration createCacheConfiguration(String cacheName) {
CacheConfiguration cfg = new CacheConfiguration()
.setName(cacheName)
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java
index 8cc1707..d43149c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java
@@ -93,13 +93,6 @@ public class GridCacheDynamicLoadOnClientTest extends
GridCommonAbstractTest {
createAndFillServerCache();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Test from client node batch merge through JDBC.
*
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
index f4fc40d..e399512 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
@@ -41,13 +41,6 @@ public class ComplexSecondaryKeyUnwrapSelfTest extends
AbstractIndexingCommonTes
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* Test secondary index with complex PK. Columns for secondary and PK
indexes are intersect.
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
index 01c991e..1df9e90 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
@@ -78,13 +78,6 @@ public abstract class DynamicIndexAbstractSelfTest extends
AbstractSchemaSelfTes
/** Argument for simple SQL (2). */
protected static final int SQL_ARG_2 = 80;
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Create server configuration.
*
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java
index 40acf03..b396c7c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java
@@ -36,14 +36,6 @@ public class SqlTransactionCommandsWithMvccDisabledSelfTest
extends AbstractSche
"atomicity=transactional\"");
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
-
/**
* @throws Exception if failed.
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
index 2818677..5253f83 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java
@@ -57,13 +57,6 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest
extends AbstractSche
"atomicity=transactional_snapshot\"");
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Test that BEGIN opens a transaction.
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
index 569970e..f929b6e 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
@@ -59,13 +59,6 @@ public class SqlTransactionsSelfTest extends
AbstractSchemaSelfTest {
"atomicity=transactional_snapshot\"");
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Test that BEGIN opens a transaction.
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatCollocatedTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatCollocatedTest.java
index 5f52fda..5384779 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatCollocatedTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatCollocatedTest.java
@@ -96,11 +96,6 @@ public class IgniteSqlGroupConcatCollocatedTest extends
AbstractIndexingCommonTe
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
*
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatNotCollocatedTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatNotCollocatedTest.java
index f46d0f4..8d53874 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatNotCollocatedTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatNotCollocatedTest.java
@@ -80,11 +80,6 @@ public class IgniteSqlGroupConcatNotCollocatedTest extends
AbstractIndexingCommo
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
*
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlQueryParallelismTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlQueryParallelismTest.java
index 3475723..f7f8bb1 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlQueryParallelismTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlQueryParallelismTest.java
@@ -63,11 +63,6 @@ public class IgniteSqlQueryParallelismTest extends
AbstractIndexingCommonTest {
startGridsMultiThreaded(3, false);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param name Cache name.
* @param idxTypes Indexed types.
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIteratorNullifyOnEndSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIteratorNullifyOnEndSelfTest.java
index 90423d7..1dab0c2 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIteratorNullifyOnEndSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIteratorNullifyOnEndSelfTest.java
@@ -158,11 +158,6 @@ public class H2ResultSetIteratorNullifyOnEndSelfTest
extends AbstractIndexingCom
populateDataIntoPerson();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Cache.
*/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/ExplainSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/ExplainSelfTest.java
index c9b9ab5..886ffa5 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/ExplainSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/ExplainSelfTest.java
@@ -50,15 +50,9 @@ public class ExplainSelfTest extends
AbstractIndexingCommonTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- try {
- stopAllGrids();
- }
- finally {
- ignite = null;
- cache = null;
-
- super.afterTestsStopped();
- }
+ ignite = null;
+ cache = null;
+ super.afterTestsStopped();
}
/**
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AndOperationExtractPartitionSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AndOperationExtractPartitionSelfTest.java
index 58f64e7..de8fd19 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AndOperationExtractPartitionSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AndOperationExtractPartitionSelfTest.java
@@ -110,11 +110,6 @@ public class AndOperationExtractPartitionSelfTest extends
AbstractIndexingCommon
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/** */
@Test
public void testAlternativeUsageOfIn(){
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/CreateTableWithDateKeySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/CreateTableWithDateKeySelfTest.java
index e74915c..2bde2f9 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/CreateTableWithDateKeySelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/CreateTableWithDateKeySelfTest.java
@@ -56,8 +56,6 @@ public class CreateTableWithDateKeySelfTest extends
AbstractIndexingCommonTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
ignite = null;
initCache = null;
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/InOperationExtractPartitionSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/InOperationExtractPartitionSelfTest.java
index bcde303..cbfaec9 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/InOperationExtractPartitionSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/InOperationExtractPartitionSelfTest.java
@@ -111,8 +111,6 @@ public class InOperationExtractPartitionSelfTest extends
AbstractIndexingCommonT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
orgCache = null;
-
- stopAllGrids();
}
/** */
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
b/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
index 407a2b0..b1a8240 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
@@ -274,13 +274,6 @@ public class BaseSqlTest extends
AbstractIndexingCommonTest {
explain = locExp;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Result of sql query. Contains metadata and all values in memory.
*/
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java
index 0ab107e..40cf4a7 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetBuilderTest.java
@@ -47,10 +47,6 @@ public class CacheBasedDatasetBuilderTest extends
GridCommonAbstractTest {
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java
index 1205d53..74f4c73 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/ComputeUtilsTest.java
@@ -55,11 +55,6 @@ public class ComputeUtilsTest extends GridCommonAbstractTest
{
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() {
/* Grid instance. */
ignite = grid(NODE_COUNT);
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedModelBuilderTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedModelBuilderTest.java
index 2755dcd..ba097ad 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedModelBuilderTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/inference/builder/IgniteDistributedModelBuilderTest.java
@@ -40,11 +40,6 @@ public class IgniteDistributedModelBuilderTest extends
GridCommonAbstractTest {
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
index 45ec4ad..4e74756 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTrainerIntegrationTest.java
@@ -57,11 +57,6 @@ public class MLPTrainerIntegrationTest extends
GridCommonAbstractTest {
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
index 44719a8..3a30dd1 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/nn/performance/MLPTrainerMnistIntegrationTest.java
@@ -54,11 +54,6 @@ public class MLPTrainerMnistIntegrationTest extends
GridCommonAbstractTest {
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java
index c11d96a..c8ee569 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/cursor/CacheBasedLabelPairCursorTest.java
@@ -43,11 +43,6 @@ public class CacheBasedLabelPairCursorTest extends
GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() {
/* Grid instance. */
ignite = grid(NODE_COUNT);
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java
index 5388b60..97b1dcf 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/selection/scoring/evaluator/EvaluatorTest.java
@@ -69,11 +69,6 @@ public class EvaluatorTest extends GridCommonAbstractTest {
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java
index 59950a8..aa2fef6 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeClassificationTrainerIntegrationTest.java
@@ -44,11 +44,6 @@ public class
DecisionTreeClassificationTrainerIntegrationTest extends GridCommon
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
index 1ccc562..affa12f 100644
---
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
+++
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java
@@ -50,11 +50,6 @@ public class DecisionTreeMNISTIntegrationTest extends
GridCommonAbstractTest {
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
diff --git
a/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/RestSetupSimpleTest.java
b/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/RestSetupSimpleTest.java
index dc265f7..8952d7d 100644
---
a/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/RestSetupSimpleTest.java
+++
b/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/RestSetupSimpleTest.java
@@ -49,11 +49,6 @@ public class RestSetupSimpleTest extends
GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids(true);
- }
-
/**
* Runs version command using GridJettyRestProtocol.
*/