ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:12 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
index 6947926..79de60b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
@@ -149,15 +149,16 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri
 
         final Ignite txIgniteNode = G.ignite(txNode.id());
 
-        GridTestUtils.runAsync(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runAsync(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 GridCache<Integer, String> cache = txIgniteNode.cache(null);
 
                 assertNotNull(cache);
 
-                IgniteTxProxyImpl tx = (IgniteTxProxyImpl)cache.txStart();
+                IgniteTxProxyImpl tx = (IgniteTxProxyImpl) cache.txStart();
 
-                IgniteInternalTx txEx = GridTestUtils.getFieldValue(tx, "tx");
+                IgniteInternalTx txEx = TestUtils.getFieldValue(tx, "tx");
 
                 cache.putAll(map);
 
@@ -178,8 +179,9 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri
 
         info("Stopped grid, waiting for transactions to complete.");
 
-        boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        boolean txFinished = TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 for (IgniteKernal g : grids) {
                     GridCacheSharedContext<Object, Object> ctx = g.context().cache().context();
 
@@ -286,7 +288,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         ignoreMsgCls = null;
         ignoreMsgNodeId = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
index a937d09..31c85d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
@@ -173,8 +173,9 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
 
         final IgniteEx originatingNodeGrid = grid(originatingNode());
 
-        GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 GridCache<Integer, String> cache = originatingNodeGrid.cache(null);
 
                 assertNotNull(cache);
@@ -186,7 +187,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
 
                     info("Before commitAsync");
 
-                    tx = (IgniteTx)tx.withAsync();
+                    tx = (IgniteTx) tx.withAsync();
 
                     tx.commit();
 
@@ -212,13 +213,14 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
 
         info(">>> Stopped originating node: " + txNode.id());
 
-        boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        boolean txFinished = TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 for (IgniteKernal g : grids) {
                     GridCacheAdapter<?, ?> cache = g.internalCache();
 
                     IgniteTxManager txMgr = cache.isNear() ?
-                        ((GridNearCacheAdapter)cache).dht().context().tm() :
+                        ((GridNearCacheAdapter) cache).dht().context().tm() :
                         cache.context().tm();
 
                     int txNum = txMgr.idMapSize();
@@ -343,13 +345,14 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
                 tx.rollback();
         }
 
-        boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        boolean txFinished = TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 for (IgniteKernal g : grids) {
                     GridCacheAdapter<?, ?> cache = g.internalCache();
 
                     IgniteTxManager txMgr = cache.isNear() ?
-                        ((GridNearCacheAdapter)cache).dht().context().tm() :
+                        ((GridNearCacheAdapter) cache).dht().context().tm() :
                         cache.context().tm();
 
                     int txNum = txMgr.idMapSize();
@@ -474,7 +477,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         ignoreMsgCls = null;
         ignoreMsgNodeIds = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
index 3964cc7..52af955 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
@@ -53,7 +53,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -76,9 +76,11 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
 
         final AtomicInteger gridIdx = new AtomicInteger(1);
 
-        IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
+        IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(
             new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
+                @Nullable
+                @Override
+                public Object call() throws Exception {
                     int idx = gridIdx.getAndIncrement();
 
                     startGrid(idx);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
----------------------------------------------------------------------
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 65f3e98..5ed6870 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,7 +56,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         IGNITEs.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
index a9cc2e7..1fedce0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
@@ -76,8 +76,9 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
         cache().put("key1", 1);
         cache().put("key2", 2);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 cache().getAll(null).isEmpty();
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index e8aeaf7..58edb1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -90,7 +90,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 32c2f7a..6d29325 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -338,7 +338,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -416,7 +416,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             lock.unlock();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -443,7 +443,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -478,7 +478,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -518,7 +518,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -608,7 +608,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -693,7 +693,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -728,7 +728,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             checkStoreWithValues(F.asMap(k1, String.valueOf(k1), k2, String.valueOf(k2)));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -879,7 +879,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -905,7 +905,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             lock.unlock();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -949,7 +949,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
             lock2.unlock();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
index 551e01e..846aabf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
@@ -104,7 +104,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         caches = null;
         ignites = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
index 07c5cf1..2b1598a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
@@ -81,7 +81,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 5627a88..dedd455 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -111,7 +111,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index ed89efc..f6a0783 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -105,7 +105,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
index d5c76ea..c57d16c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
@@ -68,7 +68,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index cb554ea..dfc6465 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -86,7 +86,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
index a9fa59a..240050a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
@@ -69,7 +69,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index 5ac6b3a..b090662 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@ -147,7 +147,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -166,7 +166,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
                 private Ignite ignite;
 
                 @Override public void onLifecycleEvent(LifecycleEventType evt) {
-                    if (evt == LifecycleEventType.AFTER_GRID_START) {
+                    if (evt == LifecycleEventType.AFTER_IGNITE_START) {
                         IgniteCache<Integer, byte[]> c = ignite.jcache(null);
 
                         if (c.putIfAbsent(-1, new byte[1])) {
@@ -198,7 +198,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index 2434ee3..4744f8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -96,7 +96,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @throws Exception If failed. */
@@ -319,7 +319,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -332,7 +332,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
             startGrid(0);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -360,7 +360,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
             info(">>> Finished preloading of empty cache in " + (System.currentTimeMillis() - start) + "ms.");
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -417,8 +417,9 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
         if (caches.length < 2)
             return;
 
-        GridTestUtils.retryAssert(log, 50, 500, new CAX() {
-            @Override public void applyx() {
+        TestUtils.retryAssert(log, 50, 500, new CAX() {
+            @Override
+            public void applyx() {
                 info("Checking partition maps.");
 
                 for (int i = 0; i < caches.length; i++)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index e926e41..7cd23b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@ -163,7 +163,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -233,7 +233,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
             throw e;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index 61d9a3d..602121d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -85,7 +85,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
index 8770fa6..650de11 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
@@ -56,14 +56,17 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract
 
             final CountDownLatch stopLatch = new CountDownLatch(1);
 
-            GridTestUtils.runMultiThreadedAsync(
+            TestUtils.runMultiThreadedAsync(
                 new Callable<Object>() {
-                    @Nullable @Override public Object call() throws Exception {
+                    @Nullable
+                    @Override
+                    public Object call() throws Exception {
                         Ignite g = startGrid("first");
 
                         g.events().localListen(
                             new IgnitePredicate<IgniteEvent>() {
-                                @Override public boolean apply(IgniteEvent evt) {
+                                @Override
+                                public boolean apply(IgniteEvent evt) {
                                     stopLatch.countDown();
 
                                     return true;
@@ -84,9 +87,11 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract
                 "first"
             );
 
-            GridTestUtils.runMultiThreaded(
+            TestUtils.runMultiThreaded(
                 new Callable<Object>() {
-                    @Nullable @Override public Object call() throws Exception {
+                    @Nullable
+                    @Override
+                    public Object call() throws Exception {
                         startLatch.await();
 
                         startGrid("second");
@@ -99,7 +104,7 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract
             );
         }
         finally {
-            // Intentionally used this method. See startGrid(String, String).
+            // Intentionally used this method. See startIgnite(String, String).
             G.stopAll(false);
         }
     }
@@ -114,7 +119,7 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract
                     @Nullable @Override public Object call() throws Exception {
                         IgniteConfiguration cfg = loadConfiguration("modules/core/src/test/config/spring-multicache.xml");
 
-                        startGrid(Thread.currentThread().getName(), cfg);
+                        startIgnite(Thread.currentThread().getName(), cfg);
 
                         return null;
                     }
@@ -138,7 +143,7 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract
                     @Nullable @Override public Object call() throws Exception {
                         String gridName = "grid-" + Thread.currentThread().getName();
 
-                        startGrid(gridName, "modules/core/src/test/config/example-cache.xml");
+                        startIgnite(gridName, "modules/core/src/test/config/example-cache.xml");
 
                         // Immediately stop the grid.
                         stopGrid(gridName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
index c48e353..b107210 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -186,9 +186,11 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
 
             final AtomicBoolean done = new AtomicBoolean();
 
-            IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync(
+            IgniteInternalFuture fut1 = TestUtils.runMultiThreadedAsync(
                 new Callable<Object>() {
-                    @Nullable @Override public Object call() throws Exception {
+                    @Nullable
+                    @Override
+                    public Object call() throws Exception {
                         Ignite g2 = startGrid(2);
 
                         for (int i = 0; i < ITER_CNT; i++) {
@@ -222,9 +224,11 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
                 "reader"
             );
 
-            IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync(
+            IgniteInternalFuture fut2 = TestUtils.runMultiThreadedAsync(
                 new Callable<Object>() {
-                    @Nullable @Override public Object call() throws Exception {
+                    @Nullable
+                    @Override
+                    public Object call() throws Exception {
                         writeLatch.await();
 
                         Ignite g1 = startGrid(1);
@@ -269,7 +273,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
             fut2.get();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index e28246b..60f2898 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -340,7 +340,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
             throw e;
         } finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -602,7 +602,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
 
             throw e;
         } finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index 1f2186e..fbcf583 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -230,7 +230,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index f21f6db..204e7d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -137,7 +137,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
             waitForUnload(gridCnt, cnt, wait);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -177,7 +177,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -247,7 +247,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
             waitForUnload(gridCnt, cnt, wait);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -264,7 +264,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
                 private Ignite ignite;
 
                 @Override public void onLifecycleEvent(LifecycleEventType evt) {
-                    if (evt == LifecycleEventType.AFTER_GRID_START) {
+                    if (evt == LifecycleEventType.AFTER_IGNITE_START) {
                         IgniteCache<Integer, String> c = ignite.jcache(null);
 
                         if (c.putIfAbsent(-1, "true")) {
@@ -292,7 +292,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
         finally {
             lbean = null;
 
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
index 2deebe6..78f0e73 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java
@@ -116,8 +116,9 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid
 
         try (IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affinityKey), PESSIMISTIC, REPEATABLE_READ,
             0, 2)) {
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     UUID key1;
 
                     do {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index 9f89c8c..f942d36 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -207,7 +207,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
             startFut.get();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -290,7 +290,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
                 }
             }, EVT_NODE_JOINED);
 
-            // Now start new node. We do it in a separate thread since startGrid
+            // Now start new node. We do it in a separate thread since startIgnite
             // should block until partition exchange completes.
             IgniteInternalFuture startFut = multithreadedAsync(new Runnable() {
                 @Override public void run() {
@@ -356,7 +356,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
                 txFut.get(1000);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -503,7 +503,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
 
             U.sleep(1000);
 
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 1e83921..3f4a96e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -287,7 +287,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
index 1c257c7..45c7c4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
@@ -140,7 +140,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
index 0ea0852..4f114f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java
@@ -62,8 +62,9 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi
 
             info(">>>>>> Running iteration: " + r);
 
-            GridTestUtils.runMultiThreaded(new Runnable() {
-                @Override public void run() {
+            TestUtils.runMultiThreaded(new Runnable() {
+                @Override
+                public void run() {
                     try {
                         int rangeStart = rangeIdx.getAndIncrement() * range;
 
@@ -74,7 +75,7 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi
 
                             IgniteCache<Integer, Integer> cache = grid(idx).jcache(null);
 
-                            cache = ((IgniteCacheProxy<Integer, Integer>)cache).flagOn(FORCE_TRANSFORM_BACKUP);
+                            cache = ((IgniteCacheProxy<Integer, Integer>) cache).flagOn(FORCE_TRANSFORM_BACKUP);
 
                             cache.invoke(i, new Transformer(i));
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index fe75028..684d845 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -158,7 +158,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -178,7 +178,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
             assertEquals(1, affNodes.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
index e5d57f1..d7e5e93 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
@@ -120,8 +120,9 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest {
         startGrids(3);
 
         try {
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     grid(0).cache(null).get(nearKey());
 
                     return null;
@@ -129,7 +130,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest {
             }, IgniteCheckedException.class, null);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 7c5d965..ed62ac8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -102,7 +102,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
             assertEquals(0, near(0).nearSize());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -136,7 +136,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -167,8 +167,9 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
                 final Ignite g = grid(i);
 
                 // Repeatedly check cache sizes because of concurrent cache updates.
-                assertTrue(GridTestUtils.waitForCondition(new PA() {
-                    @Override public boolean apply() {
+                assertTrue(TestUtils.waitForCondition(new PA() {
+                    @Override
+                    public boolean apply() {
                         // Every node contains either near, backup, or primary.
                         return cnt == g.cache(null).size();
                     }
@@ -180,7 +181,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index a22458c..603ecbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -95,7 +95,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index d03f841..b4b48a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -133,7 +133,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         assert G.allGrids().isEmpty();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 25ba562..488f9fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -116,7 +116,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
                 assertFalse("For key: " + i, grid(0).cache(null).affinity().isPrimaryOrBackup(grid(0).localNode(), i));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -143,7 +143,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -177,16 +177,18 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
 
                 final int key = i;
 
-                GridTestUtils.assertThrows(log, new Callable<Object>() {
-                    @Override public Object call() throws Exception {
+                TestUtils.assertThrows(log, new Callable<Object>() {
+                    @Override
+                    public Object call() throws Exception {
                         return nearOnly.get(key);
                     }
                 }, ClusterTopologyCheckedException.class, null);
             }
 
             // Test optimistic transaction.
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     try (IgniteTx tx = nearOnly.txStart(OPTIMISTIC, REPEATABLE_READ)) {
                         nearOnly.putx("key", "val");
 
@@ -198,8 +200,9 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
             }, ClusterTopologyException.class, null);
 
             // Test pessimistic transaction.
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     try (IgniteTx tx = nearOnly.txStart(PESSIMISTIC, REPEATABLE_READ)) {
                         nearOnly.put("key", "val");
 
@@ -212,7 +215,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
 
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -228,7 +231,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index ed211c0..4316de6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -104,7 +104,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         grids = -1;
 
@@ -320,7 +320,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -363,7 +363,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index d37b1cb..6e8b5b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -171,7 +171,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -187,7 +187,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
             testReadersUpdate(PESSIMISTIC, REPEATABLE_READ);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
index 1dae0c9..03af40a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
@@ -155,7 +155,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
             return dur;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -248,7 +248,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
             return cnt;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
index abb106f..41c69a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
@@ -68,7 +68,7 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -85,8 +85,9 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm
 
         startGrid(0);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 startGrid(1);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 185f51e..0ae3a25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -92,7 +92,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -385,7 +385,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
     /** @throws Exception If failed. */
     @SuppressWarnings("BusyWait")
     private void waitTopologyUpdate() throws Exception {
-        GridTestUtils.waitTopologyUpdate(null, BACKUPS, log());
+        TestUtils.waitTopologyUpdate(null, BACKUPS, log());
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index f0a7bec..cd61bee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -75,7 +75,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         stores = null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
index 7447370..08f6910 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
@@ -75,7 +75,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @throws Exception If check failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
index 9ca86fe..dc3bfe8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
@@ -136,7 +136,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes
             assertEquals(cnt1, cnt2);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
index 5a79a5b..a0423b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
@@ -71,14 +71,16 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest
 
         final IgniteCache<Object, Object> cache = g0.jcache(null);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return cache.lock(1).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
             }
         }, CacheException.class, "Locks are not supported");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return cache.lockAll(Collections.singleton(1)).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
             }
         }, CacheException.class, "Locks are not supported");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 16584b5..0e8bd2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -190,7 +190,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
             checkNearAndPrimary(gridCnt, priThreads, nearThreads);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -210,7 +210,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
             checkNearAndPrimary(gridCnt, priThreads, nearThreads);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -520,7 +520,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
             checkNearAndPrimaryMultiNode(gridCnt);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -534,7 +534,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
             checkNearAndPrimaryMultiNode(gridCnt);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index 8ca1b93..c561f50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -94,7 +94,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
index 1ea53b6..355e748 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
@@ -84,7 +84,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
             @Override public void onLifecycleEvent(LifecycleEventType evt) {
                 try {
                     switch (evt) {
-                        case AFTER_GRID_START: {
+                        case AFTER_IGNITE_START: {
                             GridCache<Object, MyValue> c1 = ignite.cache("one");
                             GridCache<Object, MyValue> c2 = ignite.cache("two");
 
@@ -121,7 +121,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
 
                         case BEFORE_GRID_START:
                         case BEFORE_GRID_STOP:
-                        case AFTER_GRID_STOP: {
+                        case AFTER_IGNITE_STOP: {
                             info("Lifecycle event: " + evt);
 
                             break;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
index a8bba95..fc5689c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
@@ -92,7 +92,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -144,8 +144,9 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb
         final AtomicLong luceneCnt = new AtomicLong();
 
         // Start lucene query threads.
-        IgniteInternalFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        IgniteInternalFuture<?> futLucene = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 while (!done.get()) {
                     CacheQuery<Map.Entry<UUID, Person>> masters = cache0.queries().createFullTextQuery(
                         Person.class, "Master");
@@ -165,8 +166,9 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb
         final AtomicLong sqlCnt = new AtomicLong();
 
         // Start sql query threads.
-        IgniteInternalFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        IgniteInternalFuture<?> futSql = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 while (!done.get()) {
                     CacheQuery<Map.Entry<UUID, Person>> bachelors =
                         cache0.queries().createSqlQuery(Person.class, "degree = 'Bachelor'");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
index db7ace1..df7575e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
@@ -103,7 +103,7 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 32ac2c7..516061f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -105,7 +105,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
 
     @Override protected void afterTest() throws Exception {
         // Shutwodn the gird.
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
index ffe7c00..fca0662 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
@@ -99,7 +99,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index bd4b673..71a03d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -96,7 +96,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
index 6ecb75f..be023bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
@@ -93,9 +93,10 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe
         for (IgniteFuture<IgniteEvent> fut : futs)
             fut.get(3000);
 
-        boolean evicted = GridTestUtils.waitForCondition(new PA() {
-            @Override public boolean apply() {
-                for (int g = 0 ; g < gridCount(); g++) {
+        boolean evicted = TestUtils.waitForCondition(new PA() {
+            @Override
+            public boolean apply() {
+                for (int g = 0; g < gridCount(); g++) {
                     for (int i = 0; i < KEYS; i++) {
                         if (cache(g).peek(String.valueOf(i)) != null) {
                             log.info("Non-null value, will wait [grid=" + g + ", key=" + i + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
index 711a03e..9225380 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
@@ -104,7 +104,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
index 98b7064..c32be39 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
@@ -84,7 +84,7 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 6623569..b74fc23 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -85,7 +85,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
             @Override public void onLifecycleEvent(LifecycleEventType evt) {
                 try {
                     switch (evt) {
-                        case AFTER_GRID_START: {
+                        case AFTER_IGNITE_START: {
                             GridCache<Object, MyValue> c1 = ignite.cache("one");
                             GridCache<Object, MyValue> c2 = ignite.cache("two");
 
@@ -124,7 +124,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
 
                         case BEFORE_GRID_START:
                         case BEFORE_GRID_STOP:
-                        case AFTER_GRID_STOP: {
+                        case AFTER_IGNITE_STOP: {
                             info("Lifecycle event: " + evt);
 
                             break;


Mime
View raw message