ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:16 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
index 4d19bb1..fa0e348 100644
--- a/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.testframework.junits.common.*;
 /**
  * IgniteFs examples self test.
  */
-public class IgniteFsExamplesSelfTest extends GridAbstractExamplesTest {
+public class IgniteFsExamplesSelfTest extends AbstractExamplesTest {
     /** IgniteFs config with shared memory IPC. */
     private static final String IGNITEFS_SHMEM_CFG = "modules/core/src/test/config/ggfs-shmem.xml";
 
@@ -38,14 +38,14 @@ public class IgniteFsExamplesSelfTest extends GridAbstractExamplesTest {
         String configPath = U.isWindows() ? IGNITEFS_LOOPBACK_CFG : IGNITEFS_SHMEM_CFG;
 
         try {
-            startGrid("test1", configPath);
-            startGrid("test2", configPath);
-            startGrid("test3", configPath);
+            startIgnite("test1", configPath);
+            startIgnite("test2", configPath);
+            startIgnite("test3", configPath);
 
             IgniteFsExample.main(EMPTY_ARGS);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
index 4dafcbf..2811098 100644
--- a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
@@ -21,13 +21,13 @@ import org.apache.ignite.examples.misc.lifecycle.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * GridLifecycleExample self test.
+ * LifecycleExample self test.
  */
-public class LifecycleExamplesSelfTest extends GridAbstractExamplesTest {
+public class LifecycleExamplesSelfTest extends AbstractExamplesTest {
     /**
      * @throws Exception If failed.
      */
-    public void testGridLifecycleExample() throws Exception {
+    public void testLifecycleExample() throws Exception {
         LifecycleExample.main(EMPTY_ARGS);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
index 9a87f55..b643b6f 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
@@ -20,12 +20,12 @@ package org.apache.ignite.examples;
 import org.apache.ignite.examples.misc.client.memcache.*;
 
 /**
- * GridMemcacheRestExample multi-node self test.
+ * MemcacheRestExample multi-node self test.
  */
 public class MemcacheRestExamplesMultiNodeSelfTest extends MemcacheRestExamplesSelfTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration());
+            startIgnite("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
index ebb4071..f1c128f 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
@@ -21,21 +21,21 @@ import org.apache.ignite.examples.misc.client.memcache.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * GridMemcacheRestExample self test.
+ * MemcacheRestExample self test.
  */
-public class MemcacheRestExamplesSelfTest extends GridAbstractExamplesTest {
+public class MemcacheRestExamplesSelfTest extends AbstractExamplesTest {
     /**
      * @throws Exception If failed.
      */
     @Override protected void beforeTest() throws Exception {
         // Start up a cluster node.
-        startGrid("memcache-rest-examples", MemcacheRestExampleNodeStartup.configuration());
+        startIgnite("memcache-rest-examples", MemcacheRestExampleNodeStartup.configuration());
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testGridMemcacheRestExample() throws Exception {
+    public void testMemcacheRestExample() throws Exception {
         MemcacheRestExample.main(EMPTY_ARGS);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
index 2bafb0f..e6b994d 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
@@ -23,30 +23,30 @@ import org.apache.ignite.testframework.junits.common.*;
 /**
  * Messaging examples self test.
  */
-public class MessagingExamplesSelfTest extends GridAbstractExamplesTest {
+public class MessagingExamplesSelfTest extends AbstractExamplesTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        startGrid("companion", DFLT_CFG);
+        startIgnite("companion", DFLT_CFG);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testGridMessagingExample() throws Exception {
+    public void testMessagingExample() throws Exception {
         MessagingExample.main(EMPTY_ARGS);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testGridMessagingPingPongExample() throws Exception {
+    public void testMessagingPingPongExample() throws Exception {
         MessagingPingPongExample.main(EMPTY_ARGS);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testGridMessagingPingPongListenActorExample() throws Exception {
+    public void testMessagingPingPongListenActorExample() throws Exception {
         MessagingPingPongListenActorExample.main(EMPTY_ARGS);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
index 0c3bc38..f432a1a 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.examples;
 
 /**
- * GridPrimeExample multi-node self test.
+ * PrimeExample multi-node self test.
  */
 public class MonteCarloExamplesMultiNodeSelfTest extends MonteCarloExamplesSelfTest {
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
index c42fa9b..d7704df 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.examples.compute.montecarlo.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * Gridify examples self test. Excludes Gridify Spring tests.
+ * Ignite examples self test. Excludes Ignite Spring tests.
  *
  * <h1 class="header">AOP Configuration</h1>
  * In order for this test to execute, any of the following
@@ -64,7 +64,7 @@ import org.apache.ignite.testframework.junits.common.*;
  *      Classpath should contain the {@code ${IGNITE_HOME}/modules/tests/config/aop/aspectj} folder.
  * </li>
  */
-public class MonteCarloExamplesSelfTest extends GridAbstractExamplesTest {
+public class MonteCarloExamplesSelfTest extends AbstractExamplesTest {
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
index 45f4fbf..ce8bd7f 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
@@ -23,17 +23,17 @@ import org.apache.ignite.testframework.junits.common.*;
 /**
  *
  */
-public class ProjectionExampleSelfTest extends GridAbstractExamplesTest {
+public class ProjectionExampleSelfTest extends AbstractExamplesTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         // Start up a node.
-        startGrid("grid-projection-example", DFLT_CFG);
+        startIgnite("ignite-projection-example", DFLT_CFG);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testGridProjectionExample() throws Exception {
+    public void testProjectionExample() throws Exception {
         ComputeProjectionExample.main(EMPTY_ARGS);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
index 70c86c5..2a15aaa 100644
--- a/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
@@ -23,11 +23,11 @@ import org.apache.ignite.testframework.junits.common.*;
 /**
  * Spring bean examples self test.
  */
-public class SpringBeanExamplesSelfTest extends GridAbstractExamplesTest {
+public class SpringBeanExamplesSelfTest extends AbstractExamplesTest {
     /**
      * @throws Exception If failed.
      */
-    public void testGridSpringBeanHelloWorldExample() throws Exception {
+    public void testSpringBeanHelloWorldExample() throws Exception {
         SpringBeanExample.main(EMPTY_ARGS);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
index 42b7276..54d5ff6 100644
--- a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.common.*;
 /**
  * Hello world examples self test.
  */
-public class TaskExamplesSelfTest extends GridAbstractExamplesTest {
+public class TaskExamplesSelfTest extends AbstractExamplesTest {
     /**
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
index 11d7555..af69f5c 100644
--- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 /**
  * Examples test suite.
  * <p>
- * Contains only Spring gridify examples tests.
+ * Contains only Spring ignite examples tests.
  */
 public class IgniteExamplesSelfTestSuite extends TestSuite {
     /**
@@ -35,7 +35,7 @@ public class IgniteExamplesSelfTestSuite extends TestSuite {
      */
     public static TestSuite suite() throws Exception {
         System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
-            GridTestUtils.getNextMulticastGroup(IgniteExamplesSelfTestSuite.class));
+            TestUtils.getNextMulticastGroup(IgniteExamplesSelfTestSuite.class));
 
         TestSuite suite = new TestSuite("Ignite Examples Test Suite");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
index 6852ac9..f9b503d 100644
--- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
+++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
@@ -19,13 +19,13 @@ package org.apache.ignite.scalar.tests.examples
 
 import org.apache.ignite.scalar.examples._
 import org.apache.ignite.scalar.scalar
-import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest
+import org.apache.ignite.testframework.junits.common.AbstractExamplesTest
 import org.scalatest.junit.JUnitSuiteLike
 
 /**
  * Scalar examples self test.
  */
-class ScalarExamplesSelfTest extends GridAbstractExamplesTest with JUnitSuiteLike {
+class ScalarExamplesSelfTest extends AbstractExamplesTest with JUnitSuiteLike {
     /** */
     private def EMPTY_ARGS = Array.empty[String]
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
index 795c856..9684063 100644
--- a/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
+++ b/examples/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarExamplesSelfTestSuite.scala
@@ -17,10 +17,9 @@
 
 package org.apache.ignite.scalar.testsuites
 
-import org.apache.ignite.IgniteSystemProperties
 import org.apache.ignite.IgniteSystemProperties._
 import org.apache.ignite.scalar.tests.examples.{ScalarExamplesMultiNodeSelfTest, ScalarExamplesSelfTest}
-import org.apache.ignite.testframework.GridTestUtils
+import org.apache.ignite.testframework.TestUtils
 import org.junit.runner.RunWith
 import org.scalatest._
 import org.scalatest.junit.JUnitRunner
@@ -34,5 +33,5 @@ class ScalarExamplesSelfTestSuite extends Suites(
     new ScalarExamplesMultiNodeSelfTest
 ) {
     System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
-        GridTestUtils.getNextMulticastGroup(classOf[ScalarExamplesSelfTest]))
+        TestUtils.getNextMulticastGroup(classOf[ScalarExamplesSelfTest]))
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
index 6c2e85b..88e1056 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -423,7 +423,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
             assert rmtDepCnt.get() == 1 : "Invalid remote deployment count [expected=1, got=" + rmtDepCnt.get() + ']';
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
index dc83a57..ae024ef 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/BasicAopSelfTest.java
@@ -37,10 +37,11 @@ public class BasicAopSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testAop() throws Exception {
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     gridify();
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
index 0e5d5c1..40edf23 100644
--- a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
@@ -67,7 +67,7 @@ public class OptimizedMarshallerAopTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         assert G.allGrids().isEmpty();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
index d6c1210..9bbd884 100644
--- a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
+++ b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
@@ -45,7 +45,7 @@ public class IgniteAopSelfTestSuite extends TestSuite {
         suite.addTest(new TestSuite(ExternalNonSpringAopSelfTest.class));
 
         // Examples
-        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(IgniteAopSelfTestSuite.class));
+        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, TestUtils.getNextMulticastGroup(IgniteAopSelfTestSuite.class));
 
         return suite;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
index a2b207e..93c1f35 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
@@ -96,9 +96,10 @@ public class SingleSplitsLoadTest extends GridCommonAbstractTest {
 
         final GridLoadTestStatistics stats = new GridLoadTestStatistics();
 
-        GridTestUtils.runMultiThreaded(new Runnable() {
+        TestUtils.runMultiThreaded(new Runnable() {
             /** {@inheritDoc} */
-            @Override public void run() {
+            @Override
+            public void run() {
                 while (end - System.currentTimeMillis() > 0) {
                     long start = System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
index 5413932..1b2203a 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -118,8 +118,9 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
 
         final GridLoadTestStatistics stats = new GridLoadTestStatistics();
 
-        GridTestUtils.runMultiThreaded(new Runnable() {
-            @Override public void run() {
+        TestUtils.runMultiThreaded(new Runnable() {
+            @Override
+            public void run() {
                 while (end - System.currentTimeMillis() > 0) {
                     int levels = 3;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
index 9010f62..768fa96 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
@@ -204,12 +204,12 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi
     }
 
     /**
-     * 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)}.
      * Provides s3-specific timeouts.
      * @param assertion Closure with assertion inside.
      * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If was interrupted.
      */
     private void assertWithRetries(GridAbsClosureX assertion) throws IgniteInterruptedCheckedException {
-        GridTestUtils.retryAssert(log, 6, 5000, assertion);
+        TestUtils.retryAssert(log, 6, 5000, assertion);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
index 3f43c4f..5807b88 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
@@ -47,7 +47,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  *
@@ -228,7 +228,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java
index 695d6d2..ac43df1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java
@@ -75,7 +75,7 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest {
         clientCfg.setRestTcpSslClientAuth(checkClient);
         clientCfg.setRestTcpSslClientAuth(checkClient);
 
-        GridSslBasicContextFactory factory = (GridSslBasicContextFactory)GridTestUtils.sslContextFactory();
+        GridSslBasicContextFactory factory = (GridSslBasicContextFactory) TestUtils.sslContextFactory();
 
         factory.setTrustManagers(srvTrustMgr);
 
@@ -98,7 +98,7 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest {
         cfg.setServers(Arrays.asList(U.getLocalHost().getHostAddress() + ":" + REST_TCP_PORT));
         cfg.setBalancer(new GridClientRoundRobinBalancer());
 
-        GridSslBasicContextFactory factory = (GridSslBasicContextFactory)GridTestUtils.sslContextFactory();
+        GridSslBasicContextFactory factory = (GridSslBasicContextFactory) TestUtils.sslContextFactory();
 
         factory.setTrustManagers(clientTrustMgr);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java
index 973982c..d4d1ae8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java
@@ -41,6 +41,6 @@ public class ClientTcpSslMultiThreadedSelfTest extends ClientAbstractMultiThread
 
     /** {@inheritDoc} */
     @Override protected GridSslContextFactory sslContextFactory() {
-        return GridTestUtils.sslContextFactory();
+        return TestUtils.sslContextFactory();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
index f56b136..10fa60d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
@@ -48,7 +48,7 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -66,7 +66,7 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm
 
         cli.compute().execute(ClientTcpTask.class.getName(), Collections.singletonList("arg"));
 
-        stopAllGrids();
+        stopAllIgnites();
 
         startGrid();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java
index bb763ba..b70e7d0 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.common.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * Simple unit test for GridClientComputeImpl which checks method parameters.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java
index c40d5ee..e8e06c6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.concurrent.*;
 
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * Simple unit test for GridClientDataImpl which checks method parameters.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java
index 037d6a4..3809eba 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -201,10 +201,11 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr
             }
         }));
 
-        GridTestUtils.assertOneToOne(
+        TestUtils.assertOneToOne(
             nodes,
             new P1<GridClientNode>() {
-                @Override public boolean apply(GridClientNode node) {
+                @Override
+                public boolean apply(GridClientNode node) {
                     try {
                         return eqAddresses(getAllIps(), node) &&
                             Integer.valueOf(defaultRestPort()).equals(node.attribute(restPortAttributeName()));
@@ -215,7 +216,8 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr
                 }
             },
             new P1<GridClientNode>() {
-                @Override public boolean apply(GridClientNode node) {
+                @Override
+                public boolean apply(GridClientNode node) {
                     try {
                         return eqAddresses(getAllIps(), node) &&
                             Integer.valueOf(defaultRestPort() + 1).equals(node.attribute(restPortAttributeName()));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
index cfa0cc6..3f4495d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -156,7 +156,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
 
         TestCommunicationSpi spi = new TestCommunicationSpi();
 
-        spi.setLocalPort(GridTestUtils.getNextCommPort(getClass()));
+        spi.setLocalPort(TestUtils.getNextCommPort(getClass()));
 
         c.setCommunicationSpi(spi);
 
@@ -229,7 +229,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
     @Override protected void afterTestsStopped() throws Exception {
         info("Stopping grids.");
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -304,19 +304,21 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
             }
         };
 
-        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 dflt.projection(noneFilter).log(-1, -1);
             }
         }, GridServerUnreachableException.class, null);
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log(), new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return singleNodePrj.projection(second);
             }
         }, GridClientException.class, null);
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
+        TestUtils.assertThrows(log(), new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return singleNodePrj.projection(targetFilter);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
index e8a1769..150ce49 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.*;
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * Tests for Java client.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java
index 027088d..85df09a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java
@@ -51,7 +51,7 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTestsStopped() throws Exception {
         info("Stopping grids.");
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
index e724d27..d1676a6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
@@ -39,7 +39,7 @@ public class ClientTcpSslDirectMultiNodeSelfTest extends ClientAbstractMultiNode
 
     /** {@inheritDoc} */
     @Override protected GridSslContextFactory sslContextFactory() {
-        return GridTestUtils.sslContextFactory();
+        return TestUtils.sslContextFactory();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java
index 8832445..d72f1d7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java
@@ -44,7 +44,7 @@ public class ClientTcpSslDirectSelfTest extends ClientAbstractSelfTest {
 
     /** {@inheritDoc} */
     @Override protected GridSslContextFactory sslContextFactory() {
-        return GridTestUtils.sslContextFactory();
+        return TestUtils.sslContextFactory();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java
index 7f64c7e..73f3a1c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java
@@ -37,6 +37,6 @@ public class ClientTcpSslMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTe
 
     /** {@inheritDoc} */
     @Override protected GridSslContextFactory sslContextFactory() {
-        return GridTestUtils.sslContextFactory();
+        return TestUtils.sslContextFactory();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java
index f99cd69..bcfef92 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java
@@ -42,6 +42,6 @@ public class ClientTcpSslSelfTest extends ClientAbstractSelfTest {
 
     /** {@inheritDoc} */
     @Override protected GridSslContextFactory sslContextFactory() {
-        return GridTestUtils.sslContextFactory();
+        return TestUtils.sslContextFactory();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java
index 09717c4..8141fb9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java
@@ -57,7 +57,7 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         GridClientFactory.stopAll();
         GridRouterFactory.stopAllRouters();
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/client/router/TcpSslRouterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpSslRouterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpSslRouterSelfTest.java
index d6db6c5..31156b1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpSslRouterSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpSslRouterSelfTest.java
@@ -32,7 +32,7 @@ public class TcpSslRouterSelfTest extends TcpRouterAbstractSelfTest {
 
     /** {@inheritDoc} */
     @Override protected GridSslContextFactory sslContextFactory() {
-        return GridTestUtils.sslContextFactory();
+        return TestUtils.sslContextFactory();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
index baf100b..b44ef37 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -145,10 +145,11 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
     public void testFailedTask() throws Exception {
         latch = new CountDownLatch(2);
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     grid().compute().execute(new FailedTask(), null);
 
                     return null;
@@ -191,10 +192,11 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
     public void testTimedOutTask() throws Exception {
         latch = new CountDownLatch(2);
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     grid().compute().withTimeout(100).execute(new TimedOutTask(), null);
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index de4b559..95c6784 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -46,7 +46,7 @@ abstract class AbstractRestProcessorSelfTest 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/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index d9c7a26..69ebbcd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -67,7 +67,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -197,10 +197,11 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
         handlers.clear();
 
         try {
-            GridTestUtils.assertThrows(
+            TestUtils.assertThrows(
                 log,
                 new Callable<Object>() {
-                    @Override public Object call() throws Exception {
+                    @Override
+                    public Object call() throws Exception {
                         return client.cacheGet(null, "key");
                     }
                 },
@@ -578,7 +579,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
 
         file.delete();
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log(),
             new Callable<Object>() {
                 @Override

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index a996352..edd9e04 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -59,7 +59,7 @@ public class RestMemcacheProtocolSelfTest 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/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
index 92d625d..2041c40 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
@@ -49,7 +49,7 @@ public class RestProcessorMultiStartSelfTest extends GridCommonAbstractTest {
             stopGrid(0);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
index cb0a4ee..8052a22 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
@@ -82,7 +82,7 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc}*/
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -102,8 +102,9 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void doTest(final GridClientConfiguration cfg) throws Exception {
-        GridTestUtils.runAsync(new IgniteCallable<Object>() {
-            @Override public Object call() {
+        TestUtils.runAsync(new IgniteCallable<Object>() {
+            @Override
+            public Object call() {
                 try {
                     startGrid();
                 }
@@ -120,8 +121,9 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
         try {
             gridReady.await();
 
-            IgniteInternalFuture<GridClient> c = GridTestUtils.runAsync(new Callable<GridClient>() {
-                @Override public GridClient call() throws Exception {
+            IgniteInternalFuture<GridClient> c = TestUtils.runAsync(new Callable<GridClient>() {
+                @Override
+                public GridClient call() throws Exception {
                     return GridClientFactory.start(cfg);
                 }
             });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
index 7a224b3..6852fda 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
@@ -71,7 +71,7 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         System.clearProperty(IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
index 27c4a6f..14cec42 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
@@ -99,25 +99,31 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest {
 
         final String val = "value";
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
-                parser.decode(ses, rawPacket((byte)0x01, (byte)0x01, opaque, key.getBytes(), val.getBytes(), EXTRAS));
+        TestUtils.assertThrows(log(), new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
+                parser.decode(ses, rawPacket((byte) 0x01, (byte) 0x01, opaque, key.getBytes(), val.getBytes(), EXTRAS));
 
                 return null;
             }
         }, IOException.class, null);
 
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
-                parser.decode(ses, rawPacket(MEMCACHE_REQ_FLAG, (byte)0x01, opaque, key.getBytes(), val.getBytes(), null));
+        TestUtils.assertThrows(log(), new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
+                parser.decode(ses, rawPacket(MEMCACHE_REQ_FLAG, (byte) 0x01, opaque, key.getBytes(), val.getBytes(), null));
 
                 return null;
             }
         }, IOException.class, null);
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log(), new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
                 ByteBuffer fake = ByteBuffer.allocate(21);
 
                 fake.put(IGNITE_REQ_FLAG);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index e01143e..7849bd1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -97,7 +97,7 @@ public class JdbcComplexQuerySelfTest 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/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
index 733714e..0494b62 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
@@ -94,7 +94,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -154,10 +154,11 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
     public void testWrongCache() throws Exception {
         final String url = URL_PREFIX + HOST + "/wrongCacheName";
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     DriverManager.getConnection(url);
 
                     return null;
@@ -174,10 +175,11 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
     public void testWrongPort() throws Exception {
         final String url = URL_PREFIX + HOST + ":33333";
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     DriverManager.getConnection(url);
 
                     return null;
@@ -203,10 +205,11 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
 
         assert conn.isClosed();
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     conn.isValid(2);
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
index daac5f8..7863752 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
@@ -78,7 +78,7 @@ public class JdbcEmptyCacheSelfTest 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/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
index 244133f..46461d6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
@@ -97,7 +97,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 82a5a54..ace3240 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -92,7 +92,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index 5850f5a..fe783ef 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -107,7 +107,7 @@ public class JdbcPreparedStatementSelfTest 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/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index 9155742..65c12d8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@ -99,7 +99,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -508,10 +508,11 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
 
         assert rs.findColumn("id") == 1;
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     rs.findColumn("wrong");
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index 082f980..b71b4ac 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -91,7 +91,7 @@ public class JdbcStatementSelfTest 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/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index fabc45b..ba4ca71 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -821,7 +821,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             registerExecutorMBeans();
 
             // Lifecycle bean notifications.
-            notifyLifecycleBeans(AFTER_GRID_START);
+            notifyLifecycleBeans(AFTER_IGNITE_START);
         }
         catch (Throwable e) {
             IgniteSpiVersionCheckException verCheckErr = X.cause(e, IgniteSpiVersionCheckException.class);
@@ -1994,7 +1994,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             U.stopLifecycleAware(log, lifecycleAwares(cfg));
 
             // Lifecycle notification.
-            notifyLifecycleBeansEx(LifecycleEventType.AFTER_GRID_STOP);
+            notifyLifecycleBeansEx(LifecycleEventType.AFTER_IGNITE_STOP);
 
             // Clean internal class/classloader caches to avoid stopped contexts held in memory.
             IgniteOptimizedMarshaller.clearCache();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
index 71a005c..b3f68d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
@@ -33,7 +33,7 @@ import org.apache.ignite.*;
  *   annotation, you cannot use it yet.
  * </li>
  * <li>
- *   {@link LifecycleEventType#AFTER_GRID_START} invoked right after grid
+ *   {@link LifecycleEventType#AFTER_IGNITE_START} invoked right after grid
  *   has started. At this point, if you injected a grid instance via
  *   {@link org.apache.ignite.resources.IgniteInstanceResource} annotation, you can start using it. Note that
  *   you should not be using {@link org.apache.ignite.Ignition} to get grid instance from
@@ -46,7 +46,7 @@ import org.apache.ignite.*;
  *   you can use it.
  * </li>
  * <li>
- *   {@link LifecycleEventType#AFTER_GRID_STOP} invoked right after grid
+ *   {@link LifecycleEventType#AFTER_IGNITE_STOP} invoked right after grid
  *   has stopped. Note that grid is not available during this event.
  * </li>
  * </ul>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
index d7b7478..3b9eeb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
@@ -37,7 +37,7 @@ public enum LifecycleEventType {
      * Invoked after grid startup is complete. Grid is fully
      * initialized and fully functional.
      */
-    AFTER_GRID_START,
+    AFTER_IGNITE_START,
 
     /**
      * Invoked before grid stopping routine. Grid is fully functional
@@ -49,7 +49,7 @@ public enum LifecycleEventType {
      * Invoked after grid had stopped. Grid is stopped and
      * cannot be used.
      */
-    AFTER_GRID_STOP;
+    AFTER_IGNITE_STOP;
 
     /** Enumerated values. */
     private static final LifecycleEventType[] VALS = values();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 1c40c71..ea49a47 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -106,7 +106,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
             assertEquals(nodesCnt, members.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
index 28e5325..236b6e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
@@ -219,7 +219,7 @@ public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstr
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
index a3b1b72..3db6264 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
@@ -48,8 +48,9 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
 
         final AtomicBoolean finish = new AtomicBoolean();
 
-        IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new IgniteCallable<Void>() {
-            @Override public Void call() throws Exception {
+        IgniteInternalFuture<Long> fut = TestUtils.runMultiThreadedAsync(new IgniteCallable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 try {
                     ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
@@ -59,9 +60,8 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
                         if (cnt == 1) {
                             int key = rnd.nextInt(range);
 
-                            assertEquals((Integer)key, w.load(key));
-                        }
-                        else {
+                            assertEquals((Integer) key, w.load(key));
+                        } else {
                             Collection<Integer> keys = new HashSet<>(cnt);
 
                             for (int i = 0; i < cnt; i++)
@@ -70,7 +70,8 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
                             final Map<Integer, Integer> loaded = new HashMap<>();
 
                             w.loadAll(keys, new CI2<Integer, Integer>() {
-                                @Override public void apply(Integer k, Integer v) {
+                                @Override
+                                public void apply(Integer k, Integer v) {
                                     loaded.put(k, v);
                                 }
                             });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
index 691cf9d..592e2e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
@@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  *
@@ -75,7 +75,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
 
     /** {@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/fs/GridGgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
index 0b2e8d5..1d4c123 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
@@ -38,7 +38,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * Tests events, generated by {@link IgniteFs} implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
index 61cf721..d8f3b67 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerAbstractSelfTest.java
@@ -158,7 +158,7 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract
 
     /** {@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/fs/GridGgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
index 0756be1..aa2db76 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsFragmentizerSelfTest.java
@@ -240,8 +240,9 @@ public class GridGgfsFragmentizerSelfTest extends GridGgfsFragmentizerAbstractSe
 
         ggfs.awaitDeletesAsync().get();
 
-        GridTestUtils.retryAssert(log, 50, 100, new CA() {
-            @Override public void apply() {
+        TestUtils.retryAssert(log, 50, 100, new CA() {
+            @Override
+            public void apply() {
                 for (int i = 0; i < NODE_CNT; i++) {
                     IgniteEx g = grid(i);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsPathSelfTest.java
index 73d72bb..a768578 100644
--- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsPathSelfTest.java
@@ -138,8 +138,9 @@ public class GridGgfsPathSelfTest extends GridCommonAbstractTest {
                 paramTypes[i] = arg.getClass();
         }
 
-        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 {
                     Constructor<IgniteFsPath> constructor = IgniteFsPath.class.getConstructor(paramTypes);
 
@@ -150,7 +151,7 @@ public class GridGgfsPathSelfTest extends GridCommonAbstractTest {
 
                     // Unwrap invocation target exception.
                     if (cause instanceof Exception)
-                        throw (Exception)cause;
+                        throw (Exception) cause;
 
                     throw e;
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
index 975400e..c0e79e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
@@ -49,7 +49,7 @@ public class ClusterMetricsSelfTest 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/ClusterNodeMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 9b3b8ca..4c8ea61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -50,7 +50,7 @@ public class ClusterNodeMetricsSelfTest 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/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index f0cc104..d8b4c05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -74,7 +74,7 @@ public class GridAffinitySelfTest 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/GridCancelledJobsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
index 2b0e21f..81094dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
@@ -79,8 +79,9 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest {
         }
 
         // Wait to be sure that metrics were updated.
-        GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 return ignite.cluster().localNode().metrics().getTotalCancelledJobs() > 0;
             }
         }, 5000);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
index adbe08d..80bdb25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
@@ -44,7 +44,7 @@ public class GridContinuousJobSiblingsSelfTest extends GridCommonAbstractTest {
             ignite.compute().execute(TestTask.class, null);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -58,7 +58,7 @@ public class GridContinuousJobSiblingsSelfTest extends GridCommonAbstractTest {
             compute(ignite.cluster().forLocal()).execute(TestTask.class, null);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
index 5536a7a..2d2327c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
@@ -71,9 +71,10 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest {
             final Ignite ignite = startGrid(0);
             startGrid(1);
 
-            GridTestUtils.runMultiThreaded(new Runnable() {
+            TestUtils.runMultiThreaded(new Runnable() {
                 /** {@inheritDoc} */
-                @Override public void run() {
+                @Override
+                public void run() {
                     try {
                         IgniteCompute comp = ignite.compute().withAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
index 33d99a4..4dab463 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentMultiThreadedSelfTest.java
@@ -72,8 +72,9 @@ public class GridDeploymentMultiThreadedSelfTest extends GridCommonAbstractTest
                 }
             });
 
-            GridTestUtils.runMultiThreaded(new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.runMultiThreaded(new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     try {
                         for (int i = 0; i < EXEC_CNT; i++) {
                             barrier.await(2000, MILLISECONDS);
@@ -98,7 +99,7 @@ public class GridDeploymentMultiThreadedSelfTest extends GridCommonAbstractTest
             }, THREAD_CNT, "grid-load-test-thread");
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 


Mime
View raw message