ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:14 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index d9527b3..24faca5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -146,9 +146,10 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
 
         strLog.reset();
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
+        TestUtils.assertThrows(log, new Callable<Void>() {
             /** {@inheritDoc} */
-            @Override public Void call() throws Exception {
+            @Override
+            public Void call() throws Exception {
                 CU.checkAttributeMismatch(strLog, "cache", node, "cacheMode", "Cache mode", LOCAL, PARTITIONED, true);
                 return null;
             }
@@ -167,9 +168,10 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         assertTrue("No expected message in log: " + strLog.toString(),
             strLog.toString().contains("Cache mode mismatch"));
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
+        TestUtils.assertThrows(log, new Callable<Void>() {
             /** {@inheritDoc} */
-            @Override public Void call() throws Exception {
+            @Override
+            public Void call() throws Exception {
                 CU.checkAttributeMismatch(strLog, cfg1, cfg2, node, new T2<>("cacheMode", "Cache mode"), true);
                 return null;
             }
@@ -292,8 +294,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         cacheMode = PARTITIONED;
         depMode = CONTINUOUS;
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, null);
@@ -582,8 +585,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         // Check include neighbors.
         aff = new CacheConsistentHashAffinityFunction(true, 100);
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Affinity include neighbors mismatch");
@@ -593,8 +597,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         // Check backups.
         aff = new CacheConsistentHashAffinityFunction(false, 100);
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Affinity key backups mismatch");
@@ -604,8 +609,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         // Partitions count.
         aff = new CacheConsistentHashAffinityFunction(false, 1000);
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Affinity partitions count mismatch");
@@ -614,8 +620,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         aff = new CacheConsistentHashAffinityFunction(false, 100);
         ((CacheConsistentHashAffinityFunction)aff).setDefaultReplicas(1024);
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Affinity replicas mismatch");
@@ -624,8 +631,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         aff = new CacheConsistentHashAffinityFunction(false, 100);
         ((CacheConsistentHashAffinityFunction)aff).setReplicaCountAttributeName("attr_name");
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Affinity replica count attribute name mismatch");
@@ -637,8 +645,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
 
         aff = aff0;
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Partitioned cache affinity hash ID resolver class mismatch");
@@ -844,8 +853,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
             }
         };
 
-        GridTestUtils.assertThrows(log, new IgniteCallable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new IgniteCallable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 startGrid(2);
 
                 return null;
@@ -891,8 +901,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
             }
         };
 
-        GridTestUtils.assertThrows(log, new IgniteCallable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new IgniteCallable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 startGrid(2);
 
                 return null;
@@ -938,8 +949,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
             }
         };
 
-        GridTestUtils.assertThrows(log, new IgniteCallable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new IgniteCallable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 startGrid(2);
 
                 return null;
@@ -955,8 +967,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
 
         aff = new CachePartitionFairAffinity(); // Check cannot use CachePartitionFairAffinity.
 
-        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 startGrid(1);
             }
         }, IgniteCheckedException.class, null);
@@ -964,8 +977,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         aff = new CacheConsistentHashAffinityFunction(true); // Check cannot set 'excludeNeighbors' flag.
         backups = Integer.MAX_VALUE;
 
-        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 startGrid(1);
             }
         }, IgniteCheckedException.class, null);
@@ -977,8 +991,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
         // Try to start node with  different number of partitions.
         aff = new CacheConsistentHashAffinityFunction(false, 200);
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, "Affinity partitions count mismatch");
@@ -1021,8 +1036,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
 
         initCache = initCache2;
 
-        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 startGrid(2);
             }
         }, IgniteCheckedException.class, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
index 5f2f270..ab4627a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
@@ -128,7 +128,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -167,7 +167,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract
             startGrid(1);
         }
         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/GridCacheDaemonNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
index 2aad0d7..06607e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
@@ -111,7 +111,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
                 assertEquals(i, (int)cache.get(i));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -150,7 +150,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
                 assertEquals(i, (int)cache.get(i));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -183,7 +183,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
             }
         }
         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/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index c413403..cc80d59 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -138,7 +138,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             g0.compute().execute(cls, g2.cluster().localNode());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -173,7 +173,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             g0.compute().execute(cls, g2.cluster().localNode());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -218,7 +218,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             startGrid(3);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -264,7 +264,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             startGrid(3);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -321,7 +321,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             g0.compute().execute(task2Cls, g1.cluster().localNode());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -354,7 +354,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             startGrid(3);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -387,7 +387,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             startGrid(3);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -409,7 +409,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             startGrid(1);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -449,7 +449,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
             assertEquals("val1", cache.get(new CacheAffinityKey<>("key1", affKey)));
         }
         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/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
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 a1fe573..9cadc9c 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
@@ -142,7 +142,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
                 cache.entry(2).memorySize());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -164,7 +164,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
                 extrasSize(cache.entry(2)), cache.entry(2).memorySize());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -214,7 +214,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
                 extrasSize(cache(1).entry(keys[2])), cache(1).entry(keys[2]).memorySize());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -259,7 +259,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
             // Do not test other node since there are no backups.
         }
         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/GridCacheEntryVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
index 40ce6fb..ac5beaf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
@@ -153,7 +153,7 @@ public class GridCacheEntryVersionSelfTest 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/GridCacheExAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
index 1da816d..8dea9a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
@@ -88,8 +88,9 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra
                 ((GridCacheProjectionEx<String, Integer>)cache).getAllOutTx(F.asList("key" + key));
             }
 
-            assertTrue(GridTestUtils.waitForCondition(new PA() {
-                @Override public boolean apply() {
+            assertTrue(TestUtils.waitForCondition(new PA() {
+                @Override
+                public boolean apply() {
                     info("Lock event count: " + lockEvtCnt.get());
 
                     return lockEvtCnt.get() == (nearEnabled() ? 4 : 2);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
index 0ef71a8..19e06d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
@@ -122,8 +122,9 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
 
         final AtomicLong start = new AtomicLong();
 
-        GridTestUtils.runMultiThreaded(new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable() {
+            @Override
+            public Object call() throws Exception {
                 if (barrier.await() == 0)
                     start.set(System.currentTimeMillis());
 
@@ -136,7 +137,8 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
                 IgniteInternalFuture<?> fut = grid.context().cache().context().partitionReleaseFuture(GRID_CNT + 1);
 
                 fut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
-                    @Override public void apply(IgniteInternalFuture<?> e) {
+                    @Override
+                    public void apply(IgniteInternalFuture<?> e) {
                         latch.countDown();
                     }
                 });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
index b72fb80..f93d08b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java
@@ -84,7 +84,7 @@ public class GridCacheGlobalClearAllSelfTest 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/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index 042a2bd..3828603 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
@@ -419,8 +419,9 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
         try {
             lockLatch.await();
 
-            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 = grid(0).transactions().txStartAffinity(null, affinityKey, concurrency,
                         READ_COMMITTED, 0, 1)) {
                         cache.put(key1, "val01");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
index e041ea4..b2ec515 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
@@ -275,7 +275,7 @@ public class GridCacheGroupLockFailoverSelfTest extends GridCommonAbstractTest {
             assertTrue(TEST_MAP_SIZE <= primaryCacheSize);
         }
         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/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
index e001f1f..b64e771 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
@@ -94,7 +94,7 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         grids = null;
     }
@@ -113,8 +113,9 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
         final AtomicBoolean stop = new AtomicBoolean();
         final AtomicReference<Throwable> error = new AtomicReference<>();
 
-        IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Runnable() {
-            @Override public void run() {
+        IgniteInternalFuture<Long> fut = TestUtils.runMultiThreadedAsync(new Runnable() {
+            @Override
+            public void run() {
                 try {
                     Random rnd = new Random();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index 8f1c3af..10d477b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -139,7 +139,7 @@ public class GridCacheLeakTest 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/GridCacheLuceneQueryIndexTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
index 63922a0..e56d06c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
@@ -86,7 +86,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        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/GridCacheMemoryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
index f70c8f0..fe48b5d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java
@@ -195,7 +195,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -263,6 +263,6 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest {
         info("offheap: " + c.offHeapEntriesCount());
         info("swap: " + c.swapKeys());
 
-        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/GridCacheMissingCommitVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
index b47df6d..f184f10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
@@ -89,8 +89,9 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes
 
         final AtomicInteger keyStart = new AtomicInteger();
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 int start = keyStart.getAndAdd(KEYS_PER_THREAD);
 
                 for (int i = 0; i < KEYS_PER_THREAD && failedKey == null; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
index 907e08a..27d1bd1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
@@ -80,8 +80,9 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT
 
             final AtomicBoolean finished = new AtomicBoolean();
 
-            IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new IgniteCallable<Object>() {
-                @Override public Object call() throws Exception {
+            IgniteInternalFuture<Long> fut = TestUtils.runMultiThreadedAsync(new IgniteCallable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     Random rnd = new Random();
 
                     int keys = 100;
@@ -146,7 +147,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT
             }
         }
         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/GridCacheMultiUpdateLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
index c58ce0a..e43c401 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
@@ -196,7 +196,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
             startFut.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/GridCacheMultinodeUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
index 24ca1a6..4d32700 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java
@@ -78,8 +78,9 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache
 
             final AtomicInteger gridIdx = new AtomicInteger();
 
-            GridTestUtils.runMultiThreaded(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            TestUtils.runMultiThreaded(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     int idx = gridIdx.incrementAndGet() - 1;
 
                     final IgniteCache<Integer, Integer> cache = grid(idx).jcache(null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
index ee298b1..dcb0cd8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
@@ -109,7 +109,7 @@ public class GridCacheMvccManagerSelfTest 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/GridCacheNestedTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
index d7df849..0842f5b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
@@ -78,7 +78,7 @@ public class GridCacheNestedTxAbstractTest 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/GridCacheObjectToStringSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
index 43b18f2..eb2c46c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
@@ -187,7 +187,7 @@ public class GridCacheObjectToStringSelfTest 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/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index 096f448..478236f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
@@ -95,8 +95,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = 10_000;
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);
@@ -139,8 +140,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);
@@ -185,8 +187,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);
@@ -229,8 +232,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);
@@ -273,8 +277,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        IgniteInternalFuture<Long> putFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        IgniteInternalFuture<Long> putFut = TestUtils.runMultiThreadedAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD; i++) {
                     if (i % 1000 == 0)
                         log.info("Put iteration " + i);
@@ -291,8 +296,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
         IgniteInternalFuture<Long> getFut;
 
         try {
-            getFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            getFut = TestUtils.runMultiThreadedAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     int cnt = 0;
 
                     while (!stop.get()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
index d7a1876..423c0ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java
@@ -64,8 +64,9 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 IgniteTransactions txs = ignite(0).transactions();
 
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
@@ -130,8 +131,9 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);
@@ -186,8 +188,9 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);
@@ -242,8 +245,9 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea
         final int THREADS = 5;
         final int ITERATIONS_PER_THREAD = iterations();
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) {
                     if (i % 500 == 0)
                         log.info("Iteration " + i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index bb8ae3c..435ed46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -169,7 +169,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
             assert success;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -273,7 +273,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -321,7 +321,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
             assert cache.isEmpty();
         }
         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/GridCacheOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
index 4f77b8d..1085f8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
@@ -199,7 +199,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -241,7 +241,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest {
             }, Runtime.getRuntime().availableProcessors());
         }
         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/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index b760af8..ec33e39 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@ -130,8 +130,9 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
     public void testPut() throws Exception {
         final GridCache<Integer, Object> cache = grid(0).cache(null);
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                 for (int i = 0; i < iterations(); i++) {
@@ -155,8 +156,9 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
     public void testRemove() throws Exception {
         final GridCache<Integer, Object> cache = grid(0).cache(null);
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                 for (int i = 0; i < iterations(); i++) {
@@ -183,8 +185,9 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
     public void testTransform() throws Exception {
         final IgniteCache<Integer, Object> cache = grid(0).jcache(null);
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                 for (int i = 0; i < iterations(); i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index e483ae5..eb1b540 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -133,7 +133,7 @@ public class GridCacheOffheapUpdateSelfTest 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/GridCacheOrderedPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
index f1d5ced..d995fc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
@@ -151,7 +151,7 @@ public class GridCacheOrderedPreloadingSelfTest 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/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
index 40bd1d2..02376ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -264,7 +264,7 @@ public class GridCacheP2PUndeploySelfTest 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/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index c9d3fa6..59a7896 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -109,7 +109,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @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/GridCachePartitionedProjectionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
index 30e381e..08ed9af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
@@ -78,7 +78,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @throws Exception If failed. */
@@ -113,6 +113,6 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
     /** @throws Exception If failed. */
     @SuppressWarnings("BusyWait")
     private void waitTopologyUpdate() throws Exception {
-        GridTestUtils.waitTopologyUpdate(null, BACKUPS, log());
+        TestUtils.waitTopologyUpdate(null, BACKUPS, log());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 4fdf767..131c242 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -174,7 +174,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
             checkCachesConsistency(ignite1, ignite2);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -190,8 +190,9 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
         throws IgniteInterruptedCheckedException {
         info("Sleeping...");
 
-        assertTrue(GridTestUtils.waitForCondition(new PA() {
-            @Override public boolean apply() {
+        assertTrue(TestUtils.waitForCondition(new PA() {
+            @Override
+            public boolean apply() {
                 int size1 = ignite1.cache(null).size();
                 return size1 != oldSize && size1 == ignite2.cache(null).size();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 006ed74..8b7b222 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -347,7 +347,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
             assertEquals(TEST_MAP_SIZE, primaryCacheSize);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -547,7 +547,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
             assertEquals(TEST_MAP_SIZE, primaryCacheSize);
         }
         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/GridCacheQueryIndexingDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
index 76a2997..831a122 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
@@ -48,7 +48,7 @@ public class GridCacheQueryIndexingDisabledSelfTest extends GridCacheAbstractSel
      * @param c Closure.
      */
     private void doTest(Callable<Object> c) {
-        GridTestUtils.assertThrows(log, c, IgniteCheckedException.class, "Indexing is disabled for cache: null");
+        TestUtils.assertThrows(log, c, IgniteCheckedException.class, "Indexing is disabled for cache: null");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
index f499ff5..cfb2769 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  *
@@ -85,7 +85,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(atomicLongCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -99,7 +99,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(atomicLongCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -111,7 +111,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(atomicLongCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -125,7 +125,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(oneAsyncOpCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -139,7 +139,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(oneAsyncOpCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -151,7 +151,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(oneAsyncOpCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -165,7 +165,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(severalAsyncOpsCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -179,7 +179,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(severalAsyncOpsCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -191,7 +191,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(severalAsyncOpsCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -205,7 +205,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(syncOpAsyncCommitCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -219,7 +219,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(syncOpAsyncCommitCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -231,7 +231,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(syncOpAsyncCommitCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -245,7 +245,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(asyncOpsAsyncCommitCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -259,7 +259,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(asyncOpsAsyncCommitCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -271,7 +271,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
             checkReferenceCleanup(asyncOpsAsyncCommitCallable());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -285,8 +285,9 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
 
             final Collection<WeakReference<Object>> refs = call.call();
 
-            GridTestUtils.retryAssert(log, 10, 1000, new CA() {
-                @Override public void apply() {
+            TestUtils.retryAssert(log, 10, 1000, new CA() {
+                @Override
+                public void apply() {
                     System.gc();
                     System.gc();
                     System.gc();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
index d37eab5..337ba94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
@@ -119,7 +119,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract
             assert cnt == ADDITION_CACHE_NUMBER;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -156,7 +156,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract
             fut.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/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 45d28ac..4edc20e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -166,7 +166,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
             failDeserialization = false;
         }
         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/GridCacheSlowTxWarnTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
index d546966..3971d38 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
@@ -95,7 +95,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {
             checkCache(g, "local", false, true);
         }
         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/GridCacheStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
index 468dd39..b2ff337 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java
@@ -73,7 +73,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -143,8 +143,9 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
             for (int j = 0; j < PUT_THREADS; j++) {
                 final int key = j;
 
-                putFuts.add(GridTestUtils.runAsync(new Callable<Void>() {
-                    @Override public Void call() throws Exception {
+                putFuts.add(TestUtils.runAsync(new Callable<Void>() {
+                    @Override
+                    public Void call() throws Exception {
                         if (startTx) {
                             try (IgniteTx tx = cache.txStart()) {
                                 cache.put(key, key);
@@ -155,8 +156,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
 
                                 tx.commit();
                             }
-                        }
-                        else {
+                        } else {
                             readyLatch.countDown();
 
                             stopLatch.await();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
index 94fd587..48ba4ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
@@ -64,7 +64,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest {
     @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/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index ea04a12..861280f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@ -123,7 +123,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals(ENTRY_CNT, size);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -216,7 +216,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
                     fut.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/GridCacheTestStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
index f46f9bb..2a016ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
@@ -329,7 +329,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> {
 
         assertTrue("Unexpected tx class: " + tx.getClass(), tx instanceof IgniteTxProxy);
 
-        IgniteInternalTx tx0 = GridTestUtils.getFieldValue(tx, "tx");
+        IgniteInternalTx tx0 = TestUtils.getFieldValue(tx, "tx");
 
         if (!tx0.local())
             throw new IgniteException("Tx is not local: " + tx);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
index 6b97f9a..759d6a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
@@ -73,7 +73,7 @@ public class GridCacheTtlManagerLoadTest extends GridCacheTtlManagerSelfTest {
             fut.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/GridCacheTtlManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
index 0145559..d5ce0d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
@@ -103,8 +103,9 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest {
 
             U.sleep(1100);
 
-            GridTestUtils.retryAssert(log, 10, 100, new CAX() {
-                @Override public void applyx() {
+            TestUtils.retryAssert(log, 10, 100, new CAX() {
+                @Override
+                public void applyx() {
                     // Check that no more entries left in the map.
                     assertNull(g.jcache(null).get(key));
 
@@ -114,7 +115,7 @@ public class GridCacheTtlManagerSelfTest 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/GridCacheUtilsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java
index 056081d..49ca783 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java
@@ -249,8 +249,9 @@ public class GridCacheUtilsSelfTest extends GridCommonAbstractTest {
      * @param key Cache key.
      */
     private void assertThrowsForInvalidKey(final Object key) {
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 CU.validateCacheKey(log, key);
 
                 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/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index a25c317..bf521ff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -77,7 +77,7 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
             checkByteArrays();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -93,7 +93,7 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
             checkByteArrays();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -109,7 +109,7 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
             checkByteArrays();
         }
         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/GridCacheVariableTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java
index 4fb357e..730d936 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java
@@ -78,7 +78,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        stopAllGrids();
+        stopAllIgnites();
 
         assert G.allGrids().isEmpty();
     }
@@ -117,12 +117,13 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest {
 
         final AtomicBoolean done = new AtomicBoolean();
 
-        IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CAX() {
+        IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CAX() {
             /** */
             private int cnt;
 
             @SuppressWarnings({"BusyWait"})
-            @Override public void applyx() throws IgniteCheckedException {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 while (cnt++ < txCnt && !done.get()) {
                     GridCache<Object, Object> cache = grid(0).cache(null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
index 45ad062..4c79c40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
@@ -64,8 +64,9 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(31, ver.dataCenterId());
 
         // Check overflow exception.
-        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 version(0x7FFFFFF + 1, 1);
             }
         }, IllegalArgumentException.class, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
index 735fc2a..edffa8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
@@ -108,7 +108,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
     @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/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index b27cf5d..2f02237 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -73,7 +73,7 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         storeMap.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index 4c34207..e8a3624 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -78,7 +78,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
         for (int i = 0; i < gridCount(); i++) {
             GridContinuousProcessor proc = ((IgniteKernal)grid(i)).context().continuous();
 
-            ConcurrentMap<?, ?> syncMsgFuts = GridTestUtils.getFieldValue(proc, "syncMsgFuts");
+            ConcurrentMap<?, ?> syncMsgFuts = TestUtils.getFieldValue(proc, "syncMsgFuts");
 
             assertEquals(0, syncMsgFuts.size());
         }
@@ -244,8 +244,9 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
 
             final AtomicBoolean done = new AtomicBoolean();
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            IgniteInternalFuture<?> fut = TestUtils.runAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     U.sleep(500);
 
                     stopGrid(grid.name());
@@ -287,8 +288,9 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
 
         final AtomicBoolean done = new AtomicBoolean();
 
-        IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        IgniteInternalFuture<?> fut = TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 assertFalse(done.get());
 
                 U.sleep(500);
@@ -540,8 +542,9 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
 
         cache.withExpiryPolicy(new ModifiedExpiryPolicy(new Duration(MILLISECONDS, 500))).putAll(newVals);
 
-        GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 for (Integer key : newVals.keySet()) {
                     if (primaryCache(key, cache.getName()).get(key) != null)
                         return false;
@@ -645,8 +648,9 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
         boolean rmv,
         boolean expire,
         boolean oldVal) throws Exception {
-        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.registerCacheEntryListener(lsnrCfg);
 
                 return null;


Mime
View raw message