ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [09/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:13 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
index 1df3e68..7d75b50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
@@ -133,8 +133,9 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
 
             tx = startTx(txMode);
 
-            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(key, new ExceptionProcessor(63));
 
                     return null;
@@ -297,8 +298,9 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
 
             assertNotNull("No result for " + key);
 
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     res.get();
 
                     return null;
@@ -368,8 +370,9 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
                 case 3: {
                     assertNotNull("No result for " + key);
 
-                    GridTestUtils.assertThrows(log, new Callable<Void>() {
-                        @Override public Void call() throws Exception {
+                    TestUtils.assertThrows(log, new Callable<Void>() {
+                        @Override
+                        public Void call() throws Exception {
                             res.get();
 
                             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/IgniteCachingProviderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
index 1d720fb..9eb8e28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
@@ -80,7 +80,7 @@ public class IgniteCachingProviderSelfTest extends IgniteCacheAbstractTest {
 
     /** {@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/IgniteTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
index c40d9e4..be0258a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
@@ -120,7 +120,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index 1e87898..3488332 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -397,8 +397,9 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
 
         info("Going to put: " + key);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).cache(null).put(key, 2);
 
                 return null;
@@ -430,10 +431,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
 
         info("Going to transform: " + key);
 
-        Throwable e = GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        Throwable e = TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).<Integer, Integer>jcache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() {
-                    @Override public Void process(MutableEntry<Integer, Integer> e, Object... args) {
+                    @Override
+                    public Void process(MutableEntry<Integer, Integer> e, Object... args) {
                         e.setValue(2);
 
                         return null;
@@ -485,8 +488,9 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
 
         info("Going to putAll: " + m);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).cache(null).putAll(m);
 
                 return null;
@@ -519,8 +523,9 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
 
         info("Going to remove: " + key);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).cache(null).remove(key);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index 3f3277f..c9afe0b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@ -501,7 +501,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             grid(0).compute().call(new PutOneEntryInTxJob());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -525,7 +525,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             assertEquals(GRID_CNT * RETRIES, grid(0).cache(null).get(CNTR_KEY));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -569,7 +569,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             printCounter();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -614,7 +614,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             assertEquals(GRID_CNT * RETRIES, grid(0).cache(null).get(CNTR_KEY));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -657,7 +657,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).peek(RMVD_CNTR_KEY));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -704,7 +704,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).peek(RMVD_CNTR_KEY));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -802,7 +802,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
             assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).peek(RMVD_CNTR_KEY));
         }
         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/IgniteTxMultiThreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
index be3a891..1c25bd2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
@@ -47,8 +47,10 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
      */
     protected void checkCommitMultithreaded(final IgniteTxConcurrency concurrency,
         final IgniteTxIsolation isolation) throws Exception {
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
                 Thread t = Thread.currentThread();
 
                 t.setName(t.getName() + "-id-" + t.getId());
@@ -76,8 +78,10 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
         final IgniteTxIsolation isolation) throws Exception {
         final ConcurrentMap<Integer, String> map = new ConcurrentHashMap<>();
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
                 Thread t = Thread.currentThread();
 
                 t.setName(t.getName() + "-id-" + t.getId());
@@ -222,8 +226,9 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
         List<IgniteInternalFuture<Collection<Long>>> futs = new ArrayList<>(THREADS);
 
         for (int i = 0; i < THREADS; i++) {
-            futs.add(GridTestUtils.runAsync(new Callable<Collection<Long>>() {
-                @Override public Collection<Long> call() throws Exception {
+            futs.add(TestUtils.runAsync(new Callable<Collection<Long>>() {
+                @Override
+                public Collection<Long> call() throws Exception {
                     Collection<Long> res = new ArrayList<>();
 
                     for (int i = 0; i < ITERATIONS; i++) {
@@ -239,7 +244,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
 
                                 break;
                             }
-                            catch(IgniteTxOptimisticCheckedException e) {
+                            catch (IgniteTxOptimisticCheckedException e) {
                                 log.info("Got error, will retry: " + e);
                             }
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
index 254cf5a..397226e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java
@@ -118,7 +118,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract
             assertEquals(expectedDistributedLockRequests(), commSpi.distributedLocks());
         }
         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/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
index c6ee449..20098d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
@@ -406,8 +406,9 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
 
         info("Going to put: " + key);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).cache(null).put(key, 2);
 
                 return null;
@@ -439,10 +440,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
 
         info("Going to transform: " + key);
 
-        Throwable e = GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        Throwable e = TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).<Integer, Integer>jcache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() {
-                    @Override public Void process(MutableEntry<Integer, Integer> e, Object... args) {
+                    @Override
+                    public Void process(MutableEntry<Integer, Integer> e, Object... args) {
                         e.setValue(2);
 
                         return null;
@@ -494,8 +497,9 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
 
         info("Going to putAll: " + m);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).cache(null).putAll(m);
 
                 return null;
@@ -528,8 +532,9 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
 
         info("Going to remove: " + key);
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 grid(0).cache(null).remove(key);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index bf25087..4a4cf5b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -91,7 +91,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -123,8 +123,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             String name = UUID.randomUUID().toString();
@@ -173,8 +174,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             Collection<String> names = new GridLeanSet<>(3);
@@ -252,8 +254,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             String name = UUID.randomUUID().toString();
@@ -301,8 +304,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             Collection<String> names = new GridLeanSet<>(3);
@@ -387,8 +391,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             String name = UUID.randomUUID().toString();
@@ -450,8 +455,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             Collection<String> names = new GridLeanSet<>(3);
@@ -545,8 +551,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
             CacheCountDownLatch s = cache().dataStructures().countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE,
                 false, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             String name = UUID.randomUUID().toString();
@@ -600,8 +607,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
             CacheCountDownLatch s = cache().dataStructures()
                 .countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE, false, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             Collection<String> names = new GridLeanSet<>(3);
@@ -685,8 +693,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
 
             s.put(1);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             String name = UUID.randomUUID().toString();
@@ -735,8 +744,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
 
             s.put(1);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             Collection<String> names = new GridLeanSet<>(3);
@@ -810,8 +820,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         String name = UUID.randomUUID().toString();
 
@@ -861,8 +872,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
 
         final AtomicInteger idx = new AtomicInteger(gridCount());
 
-        IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-            @Override public void apply() {
+        IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+            @Override
+            public void apply() {
                 int id = idx.getAndIncrement();
 
                 try {
@@ -912,8 +924,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
         try {
             CacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true);
 
-            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() {
-                @Override public void apply() {
+            IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(new CA() {
+                @Override
+                public void apply() {
                     try {
                         for (int i = 0; i < TOP_CHANGE_CNT; i++) {
                             Collection<String> names = new GridLeanSet<>(3);
@@ -970,8 +983,9 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
 
         cache().dataStructures().atomicLong(STRUCTURE_NAME, val, true);
 
-        GridTestUtils.runAsync(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runAsync(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 Ignite g = startGrid(NEW_GRID_NAME);
 
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
index 30bae26..c3313b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
@@ -65,7 +65,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -333,8 +333,9 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte
      */
     private IgniteInternalFuture<?> startNodeKiller(final AtomicBoolean stop, final AtomicInteger killCnt,
         final List<Integer> killIdxs) {
-        return GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        return TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                 while (!stop.get()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
index 12643d6..5d06d5e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
@@ -104,7 +104,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        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/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
index 2e163b7..c868fee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
@@ -106,7 +106,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
 
     /** {@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/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
index d3c7a29..8feffcf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java
@@ -60,7 +60,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
index d6051f7..f63320d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
@@ -56,7 +56,7 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridComm
 
     /** {@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/datastructures/GridCacheCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
index 00add7c..4947735 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
@@ -125,7 +125,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -152,9 +152,11 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
 
         assert latch.count() == 2;
 
-        IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
+        IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(
             new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
+                @Nullable
+                @Override
+                public Object call() throws Exception {
                     CacheCountDownLatch latch = grid(0).cache("local").dataStructures()
                         .countDownLatch("latch", 2, false, true);
 
@@ -219,9 +221,11 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
 
             @Nullable @Override public Object call() throws Exception {
                 // Test latch in multiple threads on each node.
-                IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
+                IgniteInternalFuture<?> fut = TestUtils.runMultiThreadedAsync(
                     new Callable<Object>() {
-                        @Nullable @Override public Object call() throws Exception {
+                        @Nullable
+                        @Override
+                        public Object call() throws Exception {
                             CacheCountDownLatch latch = ignite.cache(cacheName).dataStructures()
                                 .countDownLatch("latch", 2, false, true);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index 412f2e4..d4598c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -145,7 +145,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
             }
         }, 5000));
 
-        startGrid(killGridName);
+        startIgnite(killGridName);
 
         // Create queue again.
         queue = grid.cache(null).dataStructures().queue(QUEUE_NAME1, 0, false, true);
@@ -171,14 +171,15 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
         assertEquals(500, queue.size());
 
         // Check that items of removed queue are removed, items of new queue not.
-        assertTrue(GridTestUtils.waitForCondition(new PAX() {
+        assertTrue(TestUtils.waitForCondition(new PAX() {
             @SuppressWarnings("WhileLoopReplaceableByForEach")
-            @Override public boolean applyx() {
+            @Override
+            public boolean applyx() {
                 int cnt = 0;
 
                 for (int i = 0; i < gridCount(); i++) {
                     Iterator<GridCacheEntryEx<Object, Object>> entries =
-                        ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
+                        ((IgniteKernal) grid(i)).context().cache().internalCache().map().allEntries0().iterator();
 
                     while (entries.hasNext()) {
                         cnt++;
@@ -208,8 +209,9 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
      * @return Future completing when thread finishes.
      */
     private IgniteInternalFuture<?> startAddPollThread(final Ignite ignite, final AtomicBoolean stop, final String queueName) {
-        return GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        return TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, false, true);
 
                 assertEquals(0, queue.size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
index 95a84b9..e282089 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
@@ -55,7 +55,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
 
     /** {@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/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
index 84eee83..b241a06 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
@@ -68,7 +68,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -178,8 +178,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             final Ignite g = startGrid(GRID_CNT + 1);
 
-            IgniteInternalFuture<Object> fut1 = GridTestUtils.runAsync(new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            IgniteInternalFuture<Object> fut1 = TestUtils.runAsync(new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     info(">>> Executing put callable [node=" + g.cluster().localNode().id() +
                         ", thread=" + Thread.currentThread().getName() + ", aff=" +
                         F.nodeId8s(g.cache(null).affinity().mapKeyToPrimaryAndBackups(
@@ -209,9 +210,10 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             final Ignite g1 = startGrid(GRID_CNT + 2);
 
-            IgniteInternalFuture<Object> fut2 = GridTestUtils.runAsync(new Callable<Object>() {
+            IgniteInternalFuture<Object> fut2 = TestUtils.runAsync(new Callable<Object>() {
                 @SuppressWarnings("BusyWait")
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     try {
                         info(">>> Executing poll callable [node=" + g1.cluster().localNode().id() +
                             ", thread=" + Thread.currentThread().getName() + ", aff=" +
@@ -232,8 +234,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                                 cnt++;
 
                                 nullCnt = 0;
-                            }
-                            else {
+                            } else {
                                 if (nullCnt == 3)
                                     throw new Exception("Failed to poll non-null value within 3 attempts.");
 
@@ -371,8 +372,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
             for (int i = 0; i < GRID_CNT; i++) {
                 final int idx = i;
 
-                futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
-                    @Override public Void call() throws Exception {
+                futs.add(TestUtils.runMultiThreadedAsync(new Callable<Void>() {
+                    @Override
+                    public Void call() throws Exception {
                         GridCache cache = grid(idx).cache(null);
 
                         CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
@@ -442,8 +444,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
             for (int i = 0; i < GRID_CNT; i++) {
                 final int idx = i;
 
-                putFuts.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
-                    @Override public Void call() throws Exception {
+                putFuts.add(TestUtils.runMultiThreadedAsync(new Callable<Void>() {
+                    @Override
+                    public Void call() throws Exception {
                         GridCache cache = grid(idx).cache(null);
 
                         CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
@@ -460,8 +463,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
                     pollData.add(items);
 
-                    pollFuts.add(GridTestUtils.runAsync(new Callable<Void>() {
-                        @Override public Void call() throws Exception {
+                    pollFuts.add(TestUtils.runAsync(new Callable<Void>() {
+                        @Override
+                        public Void call() throws Exception {
                             GridCache cache = grid(idx).cache(null);
 
                             CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
index d76f29e..35928d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
@@ -61,7 +61,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
 
     /** {@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/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
index 44568eb..4abf5d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
@@ -70,7 +70,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         assert G.allGrids().isEmpty();
     }
@@ -178,8 +178,9 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
         assertTrue(grid(2).compute().call(new RemoveQueueJob(queueName)));
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 queue.poll();
 
                 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/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
index c79e61c..34163b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
@@ -56,7 +56,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
 
     /** {@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/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 723a7ab..204c9dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -97,11 +97,11 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
 
             GridCacheDataStructuresManager ds = grid.internalCache(null).context().dataStructures();
 
-            Map map = GridTestUtils.getFieldValue(ds, "setsMap");
+            Map map = TestUtils.getFieldValue(ds, "setsMap");
 
             assertEquals("Set not removed [grid=" + i + ", map=" + map + ']', 0, map.size());
 
-            map = GridTestUtils.getFieldValue(ds, "setDataMap");
+            map = TestUtils.getFieldValue(ds, "setDataMap");
 
             assertEquals("Set data not removed [grid=" + i + ", map=" + map + ']', 0, map.size());
         }
@@ -116,7 +116,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
 
             GridCacheQueryManager queries = grid.internalCache(null).context().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 " + i, 0, ((Map) obj).size());
@@ -676,8 +676,9 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         for (int i = 0; i < gridCount(); i++) {
             final int idx = i;
 
-            futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            futs.add(TestUtils.runMultiThreadedAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     GridCache cache = grid(idx).cache(null);
 
                     CacheSet<Integer> set = cache.dataStructures().set(SET_NAME, collocated, false);
@@ -777,8 +778,9 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         IgniteInternalFuture<?> fut;
 
         try {
-            fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            fut = TestUtils.runMultiThreadedAsync(new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     try {
                         while (!stop.get()) {
                             for (Set<Integer> set : sets)
@@ -821,8 +823,9 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         assertEquals("Found unexpected cache entries", 0, cnt);
 
         for (final Set<Integer> set : sets) {
-            GridTestUtils.assertThrows(log, new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     set.add(10);
 
                     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/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index eecb873..c460cb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -67,7 +67,7 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -220,8 +220,9 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT
      * @return Future completing when thread finishes.
      */
     private IgniteInternalFuture<?> startNodeKiller(final AtomicBoolean stop) {
-        return GridTestUtils.runAsync(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        return TestUtils.runAsync(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                 while (!stop.get()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index b1f97a8..666594f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@ -100,8 +100,9 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra
             final CountDownLatch latch1 = new CountDownLatch(1);
             //final CountDownLatch latch2 = new CountDownLatch(1);
 
-            IgniteInternalFuture<?> fut1 = GridTestUtils.runAsync(new Callable<Void>() {
-                @Override public Void call() throws IgniteCheckedException {
+            IgniteInternalFuture<?> fut1 = TestUtils.runAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws IgniteCheckedException {
                     Ignite ignite = grid(0);
 
                     CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP,
@@ -140,8 +141,9 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra
 
             //latch2.countDown();
 
-            IgniteInternalFuture<?> fut2 = GridTestUtils.runAsync(new Callable<Void>() {
-                @Override public Void call() throws IgniteCheckedException {
+            IgniteInternalFuture<?> fut2 = TestUtils.runAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws IgniteCheckedException {
                     Ignite ignite = grid(GRID_CNT);
 
                     CacheQueue<Integer> queue = ignite.cache(null).dataStructures().
@@ -157,8 +159,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra
                                 info(">>> Polled value: " + cnt);
 
                                 cnt++;
-                            }
-                            else {
+                            } else {
                                 info(">>> Waiting for value...");
 
                                 U.sleep(2000);
@@ -180,7 +181,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra
             fut2.get();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
index 335ce12..0d5ee8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
@@ -72,7 +72,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 98540b4..e59af22 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -116,7 +116,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -574,7 +574,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
                 throw err.get();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -724,7 +724,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
                 throw err.get();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -861,7 +861,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
                 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/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
index 4149d98..dfe853c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
@@ -75,7 +75,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs
 
     /** {@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/distributed/GridCacheAtomicTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
index 6d62a84..a004e42 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
@@ -82,7 +82,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest {
     }
 
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -97,8 +97,9 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest {
             commSpi.skipDhtRequest = false;
             commSpi.skipDhtResponse = false;
 
-            GridTestUtils.retryAssert(log, 10, 100, new CA() {
-                @Override public void apply() {
+            TestUtils.retryAssert(log, 10, 100, new CA() {
+                @Override
+                public void apply() {
                     assertTrue(grid.internalCache().context().mvcc().atomicFutures().isEmpty());
                 }
             });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
index a49a390..66af815 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
@@ -78,7 +78,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() 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/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
index 64243d8..7adf429 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
@@ -65,8 +65,9 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac
 
             final AtomicInteger cacheIdx = new AtomicInteger(0);
 
-            GridTestUtils.runMultiThreaded(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            TestUtils.runMultiThreaded(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     int idx = cacheIdx.getAndIncrement();
 
                     log.info("Use cache " + idx);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
index 45fcfd5..06bc67a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
@@ -47,7 +47,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -107,8 +107,9 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
 
         assertEquals("Expected all entries are preloaded.", KEYS_NUM, evts.size());
 
-        boolean rmv = GridTestUtils.waitForCondition(new PAX() {
-            @Override public boolean applyx() {
+        boolean rmv = TestUtils.waitForCondition(new PAX() {
+            @Override
+            public boolean applyx() {
                 return cache1.isEmpty();
             }
         }, 10_000);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index f83e151..41e4a26 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -110,7 +110,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -393,82 +393,87 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest {
         final CountDownLatch l1 = new CountDownLatch(1);
         final CountDownLatch l2 = new CountDownLatch(1);
 
-        IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    info("Before lock for keys.");
+        IgniteInternalFuture<?> fut1 = TestUtils.runMultiThreadedAsync(new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
+                info("Before lock for keys.");
 
-                    Lock lock = cache1.lockAll(keys);
+                Lock lock = cache1.lockAll(keys);
 
-                    lock.lock();
+                lock.lock();
 
-                    info("After lock for keys.");
+                info("After lock for keys.");
 
-                    try {
-                        for (Integer key : keys) {
-                            assert cache1.isLocalLocked(key, false);
-                            assert cache1.isLocalLocked(key, true);
-                        }
+                try {
+                    for (Integer key : keys) {
+                        assert cache1.isLocalLocked(key, false);
+                        assert cache1.isLocalLocked(key, true);
+                    }
 
-                        l1.countDown();
+                    l1.countDown();
 
-                        info("Let thread2 proceed.");
+                    info("Let thread2 proceed.");
 
-                        for (int i : keys) {
-                            info("Before put key: " + i);
+                    for (int i : keys) {
+                        info("Before put key: " + i);
 
-                            cache1.put(i, Integer.toString(i));
+                        cache1.put(i, Integer.toString(i));
 
-                            if (i % 50 == 0)
-                                info("Stored key pairs in cache: " + i);
-                        }
+                        if (i % 50 == 0)
+                            info("Stored key pairs in cache: " + i);
                     }
-                    finally {
-                        l2.await();
-
-                        info("Before unlock keys in thread 1: " + keys);
-
-                        lock.unlock();
+                }
+                finally {
+                    l2.await();
 
-                        info("Unlocked entry for keys.");
-                    }
+                    info("Before unlock keys in thread 1: " + keys);
 
-                    assert !locked(keys, 1);
+                    lock.unlock();
 
-                    return null;
+                    info("Unlocked entry for keys.");
                 }
-            }, 1, "TEST-THREAD-1");
 
-        IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    info("Waiting for latch1...");
+                assert !locked(keys, 1);
 
-                    try {
-                        l1.await();
+                return null;
+            }
+        }, 1, "TEST-THREAD-1");
 
-                        // This call should not acquire the lock since
-                        // other thread is holding it.
-                        assert !cache1.lockAll(keys).tryLock();
+        IgniteInternalFuture<?> fut2 = TestUtils.runMultiThreadedAsync(new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
+                info("Waiting for latch1...");
 
-                        info("Before unlock keys in thread 2: " + keys);
+                try {
+                    l1.await();
 
-                        GridTestUtils.assertThrows(null, new Callable<Object>() {
-                            @Override public Object call() throws Exception {
-                                cache1.lockAll(keys).unlock();
-                                return null;
-                            }
-                        }, IllegalStateException.class, null);
+                    // This call should not acquire the lock since
+                    // other thread is holding it.
+                    assert !cache1.lockAll(keys).tryLock();
 
-                        // The keys should still be locked.
-                        for (Integer key : keys)
-                            assert cache1.isLocalLocked(key, false);
-                    }
-                    finally {
-                        l2.countDown();
-                    }
+                    info("Before unlock keys in thread 2: " + keys);
 
-                    return null;
+                    TestUtils.assertThrows(null, new Callable<Object>() {
+                        @Override
+                        public Object call() throws Exception {
+                            cache1.lockAll(keys).unlock();
+                            return null;
+                        }
+                    }, IllegalStateException.class, null);
+
+                    // The keys should still be locked.
+                    for (Integer key : keys)
+                        assert cache1.isLocalLocked(key, false);
+                }
+                finally {
+                    l2.countDown();
                 }
-            }, 1, "TEST-THREAD-2");
+
+                return null;
+            }
+        }, 1, "TEST-THREAD-2");
 
         fut1.get();
         fut2.get();

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
index f82441f..eebd6c4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
@@ -91,7 +91,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         cache1 = null;
         cache2 = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
index 7681046..acadde7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
@@ -93,7 +93,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() 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/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index 023d576..584096f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@ -360,8 +360,9 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
         IgniteInternalFuture<?> killNodeFut = null;
 
         if (nodeKillProbability() > 0) {
-            killNodeFut = GridTestUtils.runAsync(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            killNodeFut = TestUtils.runAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     while (!stop.get()) {
                         U.sleep(ThreadLocalRandom.current().nextLong(killDelay().get1(), killDelay().get2()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index 89686fb..fa8fbb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -97,7 +97,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
      * @throws Exception If failed.
      */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         IGNITEs.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
index 98c7fee..f20a2ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
@@ -114,7 +114,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
index eb1900e..f081d56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
@@ -136,7 +136,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         map.clear();
 

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index b6a9e21..380f62d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -107,7 +107,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb
 
         lifecycleBean = null;
 
-        stopAllGrids();
+        stopAllIgnites();
     }
     /** {@inheritDoc} */
     @Override protected long getTestTimeout() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
index b87efea..5a6d39c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@ -132,7 +132,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
index fe38c41..98cb4fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
@@ -132,7 +132,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         ignites = null;
         ids = null;

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


Mime
View raw message