ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:15 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index cc230d0..6779586 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -136,7 +136,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
             assertTrue(F.viewReadOnly(top2, NODE_2ID).contains(id3));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -202,7 +202,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
             assertFalse(F.viewReadOnly(top0, NODE_2ID).contains(id3));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -317,7 +317,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
             assertFalse(F.viewReadOnly(top7, NODE_2ID).contains(id4));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -371,7 +371,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
                 assertTrue(ids.contains(grid(i).localNode().id()));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -414,7 +414,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
                 throw err.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/GridEventStorageRuntimeConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
index bb6b116..4444ca8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
@@ -78,7 +78,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
             assertEquals(1, cnt.get());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -112,7 +112,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
             assertEquals(5, cnt.get());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -148,7 +148,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
             assertEquals(4, cnt.get());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -171,7 +171,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
                 assertFalse(evtType == EVT_CACHE_OBJECT_PUT);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -195,7 +195,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
         inclEvtTypes = new int[]{-13};
@@ -207,7 +207,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
             info("Caught expected exception: " + e);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -274,7 +274,7 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst
                 getEnabledEvents(1013, g, 20000, 30000));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
index 3b66ced..455e1ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java
@@ -60,7 +60,7 @@ public class GridEventStorageSelfTest 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/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
index 8645533..6283c13 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
@@ -69,7 +69,7 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
             G.start(c1);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
index c9454ef..6e891e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCheckpointCleanupSelfTest.java
@@ -68,7 +68,7 @@ public class GridJobCheckpointCleanupSelfTest extends GridCommonAbstractTest {
             taskIgnite.compute().execute(new CheckpointCountingTestTask(), jobIgnite.cluster().localNode());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
         assertEquals(cntr.get(), 0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
index 08380ac..13691fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
@@ -70,7 +70,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() 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/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
index 13f4910..070c650 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobStealingSelfTest.java
@@ -69,7 +69,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         ignite1 = null;
         ignite2 = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
index 8aa2d88..bd41b7a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java
@@ -56,7 +56,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         node1 = null;
         node2 = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
index 5cbdc66..02f49af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
@@ -58,21 +58,21 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
             assertEquals(IgniteState.STARTED, G.state(getTestGridName()));
 
             assertEquals(1, bean.count(BEFORE_GRID_START));
-            assertEquals(1, bean.count(AFTER_GRID_START));
+            assertEquals(1, bean.count(AFTER_IGNITE_START));
             assertEquals(0, bean.count(BEFORE_GRID_STOP));
-            assertEquals(0, bean.count(AFTER_GRID_STOP));
+            assertEquals(0, bean.count(AFTER_IGNITE_STOP));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
 
         assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
@@ -121,13 +121,13 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
             assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
         assertEquals(0, bean.count(BEFORE_GRID_START));
-        assertEquals(0, bean.count(AFTER_GRID_START));
+        assertEquals(0, bean.count(AFTER_IGNITE_START));
         assertEquals(0, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
@@ -135,7 +135,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkAfterStart(boolean gridErr) throws Exception {
-        bean = new LifeCycleExceptionBean(AFTER_GRID_START, gridErr);
+        bean = new LifeCycleExceptionBean(AFTER_IGNITE_START, gridErr);
 
         try {
             startGrid();
@@ -148,13 +148,13 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
             assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(0, bean.count(AFTER_GRID_START));
+        assertEquals(0, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
@@ -164,9 +164,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         checkOnStop(BEFORE_GRID_STOP, true);
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(0, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
@@ -176,33 +176,33 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         checkOnStop(BEFORE_GRID_STOP, false);
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(0, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testGridErrorAfterStop() throws Exception {
-        checkOnStop(AFTER_GRID_STOP, true);
+        checkOnStop(AFTER_IGNITE_STOP, true);
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(0, bean.count(AFTER_GRID_STOP));
+        assertEquals(0, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testOtherErrorAfterStop() throws Exception {
-        checkOnStop(AFTER_GRID_STOP, false);
+        checkOnStop(AFTER_IGNITE_STOP, false);
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(0, bean.count(AFTER_GRID_STOP));
+        assertEquals(0, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
@@ -223,7 +223,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         }
         finally {
             try {
-                stopAllGrids();
+                stopAllIgnites();
 
                 assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
index 341ce07..a349834 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
@@ -138,8 +138,9 @@ public class GridListenActorSelfTest extends GridCommonAbstractTest {
 
             grid().message().send(null, "REQUEST");
 
-            assert GridTestUtils.waitForCondition(new PA() {
-                @Override public boolean apply() {
+            assert TestUtils.waitForCondition(new PA() {
+                @Override
+                public boolean apply() {
                     return cnt.intValue() == 1;
                 }
             }, getTestTimeout());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
index b8c16db..43f4386 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
@@ -95,7 +95,7 @@ public class GridManagementJobSelfTest 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/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index ceb9cd8..55e82ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -132,8 +132,9 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
 
         final AtomicInteger resCnt = new AtomicInteger();
 
-        GridTestUtils.runMultiThreaded(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        TestUtils.runMultiThreaded(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 while (true) {
                     int cnt = jobsCnt.incrementAndGet();
 
@@ -159,7 +160,8 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
                         X.println("Submitted jobs: " + cnt);
 
                     fut.listenAsync(new CIX1<IgniteFuture<Boolean>>() {
-                        @Override public void applyx(IgniteFuture<Boolean> f) throws IgniteCheckedException {
+                        @Override
+                        public void applyx(IgniteFuture<Boolean> f) throws IgniteCheckedException {
                             try {
                                 assert f.get();
                             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
index 7de51ea..e6c3768 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
@@ -55,7 +55,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
     @Override protected void afterTest() throws Exception {
         ignite = null;
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -71,20 +71,21 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
 
         int threadsNum = 10;
 
-        GridTestUtils.runMultiThreaded(new Runnable() {
+        TestUtils.runMultiThreaded(new Runnable() {
             /** */
-            @Override public void run() {
+            @Override
+            public void run() {
                 try {
                     JobStealingResult res = ignite.compute().execute(JobStealingTask.class, null);
 
                     info("Task result: " + res);
 
-                    switch(res) {
-                        case NONE_STOLEN : {
+                    switch (res) {
+                        case NONE_STOLEN: {
                             noneStolen.addAndGet(2);
                             break;
                         }
-                        case ONE_STOLEN : {
+                        case ONE_STOLEN: {
                             noneStolen.addAndGet(1);
                             stolen.addAndGet(1);
                             break;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
index 5418bde..8bf63cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
@@ -55,7 +55,7 @@ public class GridNodeVisorAttributesSelfTest 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/GridNonHistoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
index 46f69f5..db80b74 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java
@@ -44,7 +44,7 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -81,8 +81,9 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest {
 
         latch.await();
 
-        GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 ClusterMetrics metrics = ignite.cluster().localNode().metrics();
 
                 return metrics.getTotalExecutedJobs() == 5;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
index 7deb9e8..908cf56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
@@ -101,7 +101,7 @@ public class GridProjectionForCachesSelfTest 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/GridReduceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
index 9407226..4d7784a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReduceSelfTest.java
@@ -71,7 +71,7 @@ public class GridReduceSelfTest extends GridCommonAbstractTest {
                 assertFalse("Closure #" + i + " is not interrupted.", closures.get(i).isFinished);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -117,7 +117,7 @@ public class GridReduceSelfTest extends GridCommonAbstractTest {
                 assertFalse("Closure #" + i + " is not interrupted.", closures.get(i).isFinished);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 158491b..05ea101 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -95,7 +95,7 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
             return;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
         fail("Exception has not been thrown.");
@@ -126,7 +126,7 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
             return;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
 
         fail("Exception has not been thrown.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
index 7830b42..e65716b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
@@ -45,7 +45,7 @@ public class GridSelfTest extends GridProjectionAbstractTest {
 
     /** {@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/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index 0601cc4..07fcaa6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -44,7 +44,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
-        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(GridStartStopSelfTest.class));
+        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, TestUtils.getNextMulticastGroup(GridStartStopSelfTest.class));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
index 1706a16..a65ab67 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
@@ -55,7 +55,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -101,10 +101,11 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
 
         final Ignite g = grid(0);
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     g.compute().withNoFailover().run(r);
 
                     return null;
@@ -123,10 +124,11 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
     public void testWithNoFailoverTask() throws Exception {
         final Ignite g = grid(0);
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     g.compute().withNoFailover().execute(new TestTask(true), null);
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
index 4021ef3..f4c2ccf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTopologyBuildVersionSelfTest.java
@@ -95,7 +95,7 @@ public class GridTopologyBuildVersionSelfTest 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/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index bdbdd86..1f7784b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -70,7 +70,7 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -110,7 +110,7 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
 
         final IgniteCompute comp = ignite(0).compute(empty);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
+        TestUtils.assertThrows(log, new Callable<Void>() {
             @Override
             public Void call() throws Exception {
                 comp.affinityRun(null, 1, new FailRunnable());
@@ -119,15 +119,16 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
             }
         }, ClusterGroupEmptyException.class, null);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 comp.apply(new FailClosure(), new Object());
 
                 return null;
             }
         }, ClusterGroupEmptyException.class, null);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
+        TestUtils.assertThrows(log, new Callable<Void>() {
             @Override
             public Void call() throws Exception {
                 comp.affinityCall(null, 1, new FailCallable());
@@ -136,8 +137,9 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
             }
         }, ClusterGroupEmptyException.class, null);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 comp.broadcast(new FailCallable());
 
                 return null;
@@ -153,8 +155,9 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
 
         assertNotNull(fut);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 fut.get();
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
index 7521e37..64112a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
@@ -59,7 +59,7 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest {
 
     /** */
     public GridManagerStopSelfTest() {
-        super(/*startGrid*/false);
+        super(/*startIgnite*/false);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index 1a320c8..4110334 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -262,7 +262,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -744,13 +744,13 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
     }
 
     /**
-     * Wrapper around {@link GridTestUtils#retryAssert(org.apache.ignite.IgniteLogger, int, long, GridAbsClosure)}.
+     * Wrapper around {@link org.apache.ignite.testframework.TestUtils#retryAssert(org.apache.ignite.IgniteLogger, int, long, GridAbsClosure)}.
      * For the given closure provides count of retries, configured by {@link #retries} attribute.
      * @param assertion Closure with assertion inside.
      */
     private static void assertWithRetries(GridAbsClosureX assertion) {
         try {
-            GridTestUtils.retryAssert(null, retries, 5000, assertion);
+            TestUtils.retryAssert(null, retries, 5000, assertion);
         }
         catch (IgniteInterruptedCheckedException e) {
             throw new IgniteException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index 177982b..7c2b059 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -108,7 +108,7 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
         assert grid(1).cache(CACHE_NAME).isEmpty() : grid(1).cache(CACHE_NAME).entrySet();
         assert grid(2).cache(CACHE_NAME).isEmpty() : grid(2).cache(CACHE_NAME).entrySet();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 1e00277..8ddada3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -85,7 +85,7 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
             doSend();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -101,7 +101,7 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
             doSend();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 1d29e2a..73852ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -75,8 +75,9 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testSendIfOneOfNodesIsLocalAndTopicIsEnum() throws 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 {
                 new GridIoManager(ctx).send(F.asList(locNode, rmtNode), GridTopic.TOPIC_CACHE, new Message(),
                     GridIoPolicy.P2P_POOL);
 
@@ -89,8 +90,9 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testSendIfOneOfNodesIsLocalAndTopicIsObject() throws 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 {
                 new GridIoManager(ctx).send(F.asList(locNode, rmtNode), new Object(), new Message(),
                     GridIoPolicy.P2P_POOL);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 7be98ab..1c56391 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -115,7 +115,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
                 assertEquals(0, spi.deploymentMessageCount());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -156,7 +156,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
                 assertEquals(0, spi.deploymentMessageCount());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 8e61cc5..d8341c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -114,7 +114,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
 
     /** {@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/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index e85e33f..59aed4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -97,7 +97,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
             startGrid(2);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -120,7 +120,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -144,7 +144,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -165,7 +165,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
index 3548e97..6f639ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -40,7 +40,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() 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/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 5d3877d..bfc9f89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -99,7 +99,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -117,8 +117,9 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
         assertEquals(NODES_CNT * 2, grid1.nodes().size());
         assertEquals(NODES_CNT * 2, grid2.nodes().size());
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid1.cache(CACHE_NAME);
 
                 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/GridCacheAbstractByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
index 18e7ca4..c60f2af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
@@ -63,7 +63,7 @@ public abstract class GridCacheAbstractByteArrayValuesSelfTest extends GridCommo
 
     /** {@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/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index a0f5334..045296a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -103,7 +103,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -256,8 +256,9 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
 
         final int half = ENTRY_CNT / 2;
 
-        IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-            @Override public void apply() {
+        IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+            @Override
+            public void apply() {
                 info("Run topology change.");
 
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 7584d59a..889e22a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -73,8 +73,9 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
      * @throws Exception In case of error.
      */
     private void runTest(final IgniteInClosure<GridCache<String, Integer>> c) throws Exception {
-        final IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        final IgniteInternalFuture<?> fut1 = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 while (true) {
                     int i = cnt.getAndIncrement();
 
@@ -91,8 +92,9 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
             }
         }, WRITE_THREAD_CNT, WRITE_THREAD_NAME);
 
-        IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new CA() {
-            @Override public void apply() {
+        IgniteInternalFuture<?> fut2 = TestUtils.runMultiThreadedAsync(new CA() {
+            @Override
+            public void apply() {
                 GridCache<String, Integer> cache = cache();
 
                 while (!fut1.isDone())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index a4d7c3a..86755b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -47,7 +47,7 @@ import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.GridCachePeekMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 import static org.apache.ignite.transactions.IgniteTxState.*;
@@ -467,8 +467,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         if (tx != null)
             tx.commit();
 
-        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;
@@ -538,8 +539,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         c.add("key1");
         c.add(null);
 
-        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(c);
 
                 return null;
@@ -666,8 +668,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         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().getAllAsync(null);
 
                 return null;
@@ -983,16 +986,18 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
     public void testTransformAllWithNulls() throws Exception {
         final IgniteCache<String, Integer> cache = jcache();
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
-                cache.invokeAll((Set<String>)null, INCR_PROCESSOR);
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
+                cache.invokeAll((Set<String>) null, INCR_PROCESSOR);
 
                 return null;
             }
         }, NullPointerException.class, null);
 
-        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.invokeAll(F.asSet("key1"), null);
 
                 return null;
@@ -1005,16 +1010,18 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             keys.add("key1");
             keys.add(null);
 
-            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.invokeAll(keys, INCR_PROCESSOR);
 
                     return null;
                 }
             }, NullPointerException.class, null);
 
-            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.invokeAll(F.asSet("key1"), null);
 
                     return null;
@@ -1334,8 +1341,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             }
         };
 
-        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.invoke("k1", errProcessor);
 
                 return null;
@@ -1717,7 +1725,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         for (int i = 0; i < 100; i++) {
             final String key = "key-" + i;
 
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
+            TestUtils.assertThrows(log, new Callable<Void>() {
                 public Void call() throws Exception {
                     IgniteTransactions txs = grid(0).transactions();
 
@@ -1739,7 +1747,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             assertEquals(1, (int) cache.get(key));
 
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
+            TestUtils.assertThrows(log, new Callable<Void>() {
                 public Void call() throws Exception {
                     IgniteTransactions txs = grid(0).transactions();
 
@@ -1761,7 +1769,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             assertEquals(2, (int)cache.get(key));
 
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
+            TestUtils.assertThrows(log, new Callable<Void>() {
                 public Void call() throws Exception {
                     IgniteTransactions txs = grid(0).transactions();
 
@@ -1806,7 +1814,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             m.put("key1", 1);
             m.put(null, 2);
 
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
+            TestUtils.assertThrows(log, new Callable<Void>() {
                 @Override
                 public Void call() throws Exception {
                     cache.putAll(m);
@@ -1826,7 +1834,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             m.put("key3", 3);
             m.put("key4", null);
 
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
+            TestUtils.assertThrows(log, new Callable<Void>() {
                 @Override
                 public Void call() throws Exception {
                     cache.putAll(m);
@@ -2697,7 +2705,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         c.add("key1");
         c.add(null);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
+        TestUtils.assertThrows(log, new Callable<Void>() {
             @Override
             public Void call() throws Exception {
                 cache.removeAll(c);
@@ -2706,32 +2714,36 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             }
         }, NullPointerException.class, null);
 
-        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.removeAll(null);
 
                 return null;
             }
         }, NullPointerException.class, null);
 
-        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.remove(null);
 
                 return null;
             }
         }, NullPointerException.class, null);
 
-        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.getAndRemove(null);
 
                 return null;
             }
         }, NullPointerException.class, null);
 
-        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.remove("key1", null);
 
                 return null;
@@ -4526,22 +4538,22 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         // Avoid reloading from store.
         map.remove(key);
 
-        assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicateX() {
+        assertTrue(TestUtils.waitForCondition(new GridAbsPredicateX() {
             @SuppressWarnings("unchecked")
-            @Override public boolean applyx() throws IgniteCheckedException {
+            @Override
+            public boolean applyx() throws IgniteCheckedException {
                 try {
                     if (c.get(key) != null)
                         return false;
 
                     // Get "cache" field from GridCacheProxyImpl.
-                    GridCacheAdapter c0 = GridTestUtils.getFieldValue(c, "cache");
+                    GridCacheAdapter c0 = TestUtils.getFieldValue(c, "cache");
 
                     if (!c0.context().deferredDelete()) {
                         GridCacheEntryEx e0 = c0.peekEx(key);
 
                         return e0 == null || (e0.rawGet() == null && e0.valueBytes() == null);
-                    }
-                    else
+                    } else
                         return true;
                 }
                 catch (GridCacheEntryRemovedException e) {
@@ -5325,7 +5337,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
      */
     protected List<String> primaryKeysForCache(IgniteCache<String, Integer> cache, int cnt)
         throws IgniteCheckedException {
-        CacheProjection<String, Integer> prj = GridTestUtils.getFieldValue(cache, "delegate");
+        CacheProjection<String, Integer> prj = TestUtils.getFieldValue(cache, "delegate");
 
         return primaryKeysForCache(prj, cnt);
     }
@@ -5397,8 +5409,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         iter.remove();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Void call() throws Exception {
                 iter.remove();
 
                 return null;
@@ -5465,7 +5478,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             GridCacheQueryManager queries = context(j).queries();
 
-            Map map = GridTestUtils.getFieldValue(queries, GridCacheQueryManager.class, "qryIters");
+            Map map = TestUtils.getFieldValue(queries, GridCacheQueryManager.class, "qryIters");
 
             for (Object obj : map.values())
                 assertEquals("Iterators not removed for grid " + j, 0, ((Map) obj).size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
index 021a736..db1c2a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
@@ -94,15 +94,17 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
         for (int i = 0; i < gridCount(); i++)
             cache(i).removeAll();
 
-        final IgniteInternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        final IgniteInternalFuture<?> putFut = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 for (int i = 0; i < entryCount(); i++)
                     cache().put(KEY_PREFIX + i, i);
             }
         }, 1, "put-thread");
 
-        GridTestUtils.runMultiThreaded(new CA() {
-            @Override public void apply() {
+        TestUtils.runMultiThreaded(new CA() {
+            @Override
+            public void apply() {
                 while (!putFut.isDone()) {
                     for (CacheEntry<String, Integer> entry : cache()) {
                         assert entry != null;
@@ -173,15 +175,17 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
         for (int i = 0; i < gridCount(); i++)
             cache(i).removeAll();
 
-        final IgniteInternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        final IgniteInternalFuture<?> putFut = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 for (int i = 0; i < entryCount(); i++)
                     cache().put(KEY_PREFIX + i, i);
             }
         }, 1, "put-thread");
 
-        GridTestUtils.runMultiThreaded(new CA() {
-            @Override public void apply() {
+        TestUtils.runMultiThreaded(new CA() {
+            @Override
+            public void apply() {
                 while (!putFut.isDone()) {
                     for (CacheEntry<String, Integer> entry : cache().entrySet()) {
                         assert entry != null;
@@ -262,15 +266,17 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
         for (int i = 0; i < gridCount(); i++)
             cache(i).removeAll();
 
-        final IgniteInternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        final IgniteInternalFuture<?> putFut = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 for (int i = 0; i < entryCount(); i++)
                     cache().put(KEY_PREFIX + i, i);
             }
         }, 1, "put-thread");
 
-        GridTestUtils.runMultiThreaded(new CA() {
-            @Override public void apply() {
+        TestUtils.runMultiThreaded(new CA() {
+            @Override
+            public void apply() {
                 while (!putFut.isDone()) {
                     for (String key : cache().keySet()) {
                         assert key != null;
@@ -330,15 +336,17 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
         for (int i = 0; i < gridCount(); i++)
             cache(i).removeAll();
 
-        final IgniteInternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new CAX() {
-            @Override public void applyx() throws IgniteCheckedException {
+        final IgniteInternalFuture<?> putFut = TestUtils.runMultiThreadedAsync(new CAX() {
+            @Override
+            public void applyx() throws IgniteCheckedException {
                 for (int i = 0; i < entryCount(); i++)
                     cache().put(KEY_PREFIX + i, i);
             }
         }, 1, "put-thread");
 
-        GridTestUtils.runMultiThreaded(new CA() {
-            @Override public void apply() {
+        TestUtils.runMultiThreaded(new CA() {
+            @Override
+            public void apply() {
                 while (!putFut.isDone()) {
                     for (Integer value : cache().values())
                         assert value != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index 831063f..269da48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -823,7 +823,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
         // Avoid reloading from store.
         map.remove(key);
 
-        assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicateX() {
+        assertTrue(TestUtils.waitForCondition(new GridAbsPredicateX() {
             @SuppressWarnings("unchecked")
             @Override
             public boolean applyx() throws IgniteCheckedException {
@@ -832,7 +832,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
                         return false;
 
                     // Get "cache" field from GridCacheProxyImpl.
-                    GridCacheAdapter c0 = GridTestUtils.getFieldValue(c, "cache");
+                    GridCacheAdapter c0 = TestUtils.getFieldValue(c, "cache");
 
                     if (!c0.context().deferredDelete()) {
                         GridCacheEntryEx e0 = c0.peekEx(key);
@@ -840,7 +840,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
                         return e0 == null || (e0.rawGet() == null && e0.valueBytes() == null);
                     } else
                         return true;
-                } catch (GridCacheEntryRemovedException e) {
+                }
+                catch (GridCacheEntryRemovedException e) {
                     throw new RuntimeException(e);
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 3daa5ad..fa24115 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -97,7 +97,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -120,8 +120,9 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
         // Expected values in cache.
         final Map<Integer, GridTuple<Integer>> expVals = new ConcurrentHashMap8<>();
 
-        IgniteInternalFuture<?> updateFut = GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        IgniteInternalFuture<?> updateFut = TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                 while (!stop.get()) {
@@ -136,8 +137,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
                                     sndCache0.put(key, i);
 
                                     expVals.put(key, F.t(i));
-                                }
-                                else {
+                                } else {
                                     sndCache0.remove(key);
 
                                     expVals.put(key, F.<Integer>t(null));
@@ -169,8 +169,9 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra
             }
         });
 
-        IgniteInternalFuture<?> killFut = GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        IgniteInternalFuture<?> killFut = TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 while (!stop.get()) {
                     U.sleep(random(KILL_DELAY.get1(), KILL_DELAY.get2()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 0dedc8b..95780d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -81,7 +81,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         map.clear();
     }
@@ -110,10 +110,11 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
 
                     assertTrue(
                         "Cache is not empty: " + cache(i).entrySet(),
-                        GridTestUtils.waitForCondition(
+                        TestUtils.waitForCondition(
                             // Preloading may happen as nodes leave, so we need to wait.
                             new GridAbsPredicateX() {
-                                @Override public boolean applyx() throws IgniteCheckedException {
+                                @Override
+                                public boolean applyx() throws IgniteCheckedException {
                                     GridCache<String, Integer> cache = cache(fi);
 
                                     cache.removeAll();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
index 0b23669..d8f1111 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
@@ -179,7 +179,7 @@ public class GridCacheAtomicMessageCountSelfTest 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/GridCacheBasicStoreMultithreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
index 1c0f479..c2ad9e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
@@ -51,7 +51,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC
         if (cache != null)
             cache.clearAll();
 
-        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/GridCacheClearAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
index 3764fc5..330956d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java
@@ -118,7 +118,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         cachesLoc = null;
         cachesPartitioned = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index a5518cd..df72404 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -67,7 +67,7 @@ public class GridCacheConcurrentMapSelfTest 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/GridCacheConcurrentMapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
index 9cc6f1a..7f4cc4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java
@@ -58,7 +58,7 @@ public class GridCacheConcurrentMapTest 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/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index caa7875..34dfbe5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -223,7 +223,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
             Thread.sleep(Long.MAX_VALUE);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 


Mime
View raw message