ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:11 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index cdd77b8..b87da8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -61,7 +61,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -119,7 +119,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             startGrid(1);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -139,7 +139,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             info("Caught expected exception: " + e);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -200,7 +200,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals(e1.version(), e2.version());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -255,7 +255,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assert v3.getClass().getClassLoader().getClass().getName().contains("GridDeploymentClassLoader");
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -279,7 +279,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals(keyCnt, cache2.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -307,7 +307,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assert waitCacheSize(cache2, keyCnt, getTestTimeout()) : "Actual cache size: " + cache2.size();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -357,7 +357,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals(cnt, cache2.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -381,7 +381,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assertEquals(cnt, cache2.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -466,7 +466,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             assert waitCacheSize(lastCache, cnt, 20 * 1000) : "Actual cache size: " + lastCache.size();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -481,7 +481,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             startGridsMultiThreaded(4);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -496,7 +496,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             startGridsMultiThreaded(4);
         }
         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/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
index 9f2d05f..caf7b05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
@@ -43,7 +43,7 @@ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommo
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index 28b59fb..e23b16b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -238,7 +238,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
                 info("Cache is empty after test.");
         }
         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/eviction/GridCacheConcurrentEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
index 172da23..48d5569 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
@@ -177,7 +177,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
                 ", duration=" + (System.currentTimeMillis() - start) + ']');
         }
         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/eviction/GridCacheDistributedEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
index a5fc5b4..727f61c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
@@ -108,7 +108,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         super.afterTest();
     }
@@ -259,7 +259,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
             throw t;
         }
         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/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index 60f5182..3eac4aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -181,7 +181,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
                     checkImplicitTx(cache);
                 }
                 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/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
index 56f48a1..6964184 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
@@ -325,7 +325,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -371,7 +371,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic
             }, 10);
         }
         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/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index ffbc85c..e1abd82 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -169,7 +169,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 3ea9090..32c2ffc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -140,7 +140,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
index c6a7823..64b7497 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
@@ -156,7 +156,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             fail("Test failed, see logs for details.");
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -183,7 +183,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             assertEquals(0, cache.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -214,7 +214,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             assertEquals(0, cache.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -260,7 +260,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -307,7 +307,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             assertEquals(0, ((CacheFifoEvictionPolicy)plc).queue().size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -341,7 +341,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
             assertEquals(100, ((CacheFifoEvictionPolicy)plc).queue().size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
index a90e7c0..ed74999 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
@@ -90,8 +90,9 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst
             addKeysForNode(cache.affinity(), grid(1).localNode(), data);
             addKeysForNode(cache.affinity(), grid(2).localNode(), data);
 
-            fut = GridTestUtils.runAsync(new Callable<Void>() {
-                @Override public Void call() throws Exception {
+            fut = TestUtils.runAsync(new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
                     Random rnd = new Random();
 
                     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/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
index dfd3bd6..53880c4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java
@@ -152,7 +152,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
             info(p);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -179,7 +179,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
             assertEquals(max, p.getCurrentSize());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -227,7 +227,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
             assert curSize <= max : "curSize <= max [curSize=" + curSize + ", max=" + max + ']';
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -285,7 +285,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
             assertFalse(e5.isEvicted());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -351,7 +351,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends
             assert min >= plcMax : "Min cache size is too small: " + min;
         }
         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/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
index 60c7504..d509458 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java
@@ -332,7 +332,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
             assertFalse(e5.isEvicted());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -398,7 +398,7 @@ public class GridCacheLruEvictionPolicySelfTest extends
             assert min >= plcMax : "Min cache size is too small: " + min;
         }
         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/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
index 6a2e05a..5b900f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
@@ -130,7 +130,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
                     near(i).nearSize() <= EVICTION_MAX_SIZE);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index 6f60e56..9563bf2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@ -161,7 +161,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
                 near(0).nearSize() <= EVICTION_MAX_SIZE);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
index 2e95b08..610edcb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
@@ -53,7 +53,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
             assert g.cache(null).size() <= max;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -98,7 +98,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
             info(policy(0));
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -158,7 +158,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
             assertFalse(e5.isEvicted());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -209,7 +209,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
             info(policy(0));
         }
         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/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 6ce9554..4efada5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -64,7 +64,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         storeMap.clear();
     }
@@ -791,8 +791,9 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
      * @throws Exception If failed.
      */
     private void waitExpired(final Collection<Integer> keys) throws Exception {
-        GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 for (int i = 0; i < gridCount(); i++) {
                     for (Integer key : keys) {
                         Object val = jcache(i).localPeek(key);
@@ -871,8 +872,9 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
                 if (wait) {
                     final GridCacheEntryEx<Object, Object> e0 = e;
 
-                    GridTestUtils.waitForCondition(new PA() {
-                        @Override public boolean apply() {
+                    TestUtils.waitForCondition(new PA() {
+                        @Override
+                        public boolean apply() {
                             try {
                                 return e0.ttl() == ttl;
                             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
index 3ab9bf7..f00f2ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java
@@ -118,7 +118,7 @@ public abstract class IgniteCacheLoadAllAbstractTest extends IgniteCacheAbstract
 
         // Restart nodes with write-through disabled so that data in store does not change.
 
-        stopAllGrids();
+        stopAllIgnites();
 
         writeThrough = false;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
index 346dccd..1737f3d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
@@ -58,7 +58,7 @@ public class GridCacheDaemonNodeLocalSelfTest extends GridCacheDaemonNodeAbstrac
             }
         }
         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/local/GridCacheLocalMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
index a5f9402..de966fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
@@ -84,9 +84,10 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
      * @throws Exception If test fails.
      */
     public void testBasicLocks() throws Throwable {
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
             /** {@inheritDoc} */
-            @Override public Object call() throws Exception {
+            @Override
+            public Object call() throws Exception {
                 Lock lock = cache.lock(1);
 
                 assert lock.tryLock(1000L, TimeUnit.MILLISECONDS);
@@ -110,9 +111,10 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
      * @throws Exception If test fails.
      */
     public void testMultiLocks() throws Throwable {
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
             /** {@inheritDoc} */
-            @Override public Object call() throws Exception {
+            @Override
+            public Object call() throws Exception {
                 Set<Integer> keys = Sets.newHashSet(1, 2, 3);
 
                 Lock lock = cache.lockAll(keys);
@@ -140,9 +142,10 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
     public void testSlidingKeysLocks() throws Throwable {
         final AtomicInteger cnt = new AtomicInteger();
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
             /** {@inheritDoc} */
-            @Override public Object call() throws Exception {
+            @Override
+            public Object call() throws Exception {
                 int idx = cnt.incrementAndGet();
 
                 Set<Integer> keys = Sets.newHashSet(idx, idx + 1, idx + 2, idx + 3);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index 0040e75..2fbb874 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -123,7 +123,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -246,13 +246,15 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
     private void testMultithreaded(final GridCache cache, final int expCnt) throws Exception {
         log.info("Starting multithreaded queries.");
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
             @SuppressWarnings("unchecked")
-            @Override public Void call() throws Exception {
+            @Override
+            public Void call() throws Exception {
                 CacheQuery<Map.Entry<Key, Person>> qry = cache.queries().createScanQuery(
                     new IgniteBiPredicate<Key, Person>() {
-                        @Override public boolean apply(Key key, Person p) {
-                            assertEquals(key.id, (Integer)p.salary);
+                        @Override
+                        public boolean apply(Key key, Person p) {
+                            assertEquals(key.id, (Integer) p.salary);
 
                             return key.id % 2 == 0;
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 0eb851c..5140475 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -120,13 +120,14 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        GridTestUtils.waitForCondition(new PA() {
-            @Override public boolean apply() {
+        TestUtils.waitForCondition(new PA() {
+            @Override
+            public boolean apply() {
                 for (int i = 0; i < gridCount(); i++) {
                     if (grid(i).nodes().size() != gridCount())
                         return false;
@@ -203,10 +204,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
     public void testApi() throws Exception {
         final CacheContinuousQuery<Object, Object> q = grid(0).cache(null).queries().createContinuousQuery();
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.bufferSize(-1);
 
                     return null;
@@ -216,10 +218,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             null
         );
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.bufferSize(0);
 
                     return null;
@@ -229,10 +232,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             null
         );
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.timeInterval(-1);
 
                     return null;
@@ -242,10 +246,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             null
         );
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.execute();
 
                     return null;
@@ -261,10 +266,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             }
         });
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.execute(grid(0).forPredicate(F.<ClusterNode>alwaysFalse()));
 
                     return null;
@@ -276,12 +282,14 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
 
         q.execute();
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>>() {
-                        @Override public boolean apply(UUID uuid, Collection<CacheContinuousQueryEntry<Object, Object>> entries) {
+                        @Override
+                        public boolean apply(UUID uuid, Collection<CacheContinuousQueryEntry<Object, Object>> entries) {
                             return false;
                         }
                     });
@@ -293,10 +301,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             null
         );
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.remoteFilter(null);
 
                     return null;
@@ -306,10 +315,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             null
         );
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.bufferSize(10);
 
                     return null;
@@ -319,10 +329,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
             null
         );
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.timeInterval(10);
 
                     return null;
@@ -334,10 +345,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
 
         q.close();
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     q.execute();
 
                     return null;
@@ -1276,10 +1288,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
         CacheProjection<Integer, Integer> prj = cache.projection(new P1<CacheEntry<Integer, Integer>>() {
             @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
             @Override public boolean apply(final CacheEntry<Integer, Integer> e) {
-                GridTestUtils.assertThrows(
+                TestUtils.assertThrows(
                     log,
                     new Callable<Object>() {
-                        @Override public Object call() throws Exception {
+                        @Override
+                        public Object call() throws Exception {
                             e.set(1000);
 
                             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/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index 729db68..cd2c1e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -131,7 +131,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
 
     /** {@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/clock/GridTimeSyncProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
index b625492..fc645bb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
@@ -72,8 +72,9 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
             final IgniteKernal kernal = (IgniteKernal)grid(0);
 
             // Wait for latest time sync history.
-            GridTestUtils.waitForCondition(new PA() {
-                @Override public boolean apply() {
+            TestUtils.waitForCondition(new PA() {
+                @Override
+                public boolean apply() {
                     NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
                         .timeSyncHistory();
 
@@ -109,7 +110,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -133,8 +134,9 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
             assertEquals(6, kernal.localNode().order());
 
             // Wait for latest time sync history.
-            GridTestUtils.waitForCondition(new PA() {
-                @Override public boolean apply() {
+            TestUtils.waitForCondition(new PA() {
+                @Override
+                public boolean apply() {
                     NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
                         .timeSyncHistory();
 
@@ -170,7 +172,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
index d9de1f4..6ab03ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
@@ -81,7 +81,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -521,16 +521,19 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
             });
         }
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 g.compute().call(jobs, new IgniteReducer<Integer, Object>() {
-                    @Override public boolean collect(@Nullable Integer e) {
+                    @Override
+                    public boolean collect(@Nullable Integer e) {
                         fail("Expects failed jobs never call 'collect' method.");
 
                         return true;
                     }
 
-                    @Override public Object reduce() {
+                    @Override
+                    public Object reduce() {
                         return null;
                     }
                 });

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
index 0797c38..f279a6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
@@ -129,7 +129,7 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -295,8 +295,9 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest {
 
         send();
 
-        boolean s = GridTestUtils.waitForCondition(new PA() {
-            @Override public boolean apply() {
+        boolean s = TestUtils.waitForCondition(new PA() {
+            @Override
+            public boolean apply() {
                 return checkDeployedListeners(GRID_CNT);
             }
         }, 2000);
@@ -319,8 +320,9 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest {
 
         send(topic);
 
-        boolean s = GridTestUtils.waitForCondition(new PA() {
-            @Override public boolean apply() {
+        boolean s = TestUtils.waitForCondition(new PA() {
+            @Override
+            public boolean apply() {
                 return checkDeployedListeners(GRID_CNT);
             }
         }, 2000);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
index 603f592..4c46e56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
@@ -209,7 +209,7 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest {
             info("Finished performance test. Duration: " + duration + "ms.");
         }
         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/dataload/GridDataLoaderProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
index c4b5829..f2b53be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java
@@ -278,7 +278,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             assert s2 == 0 && s3 == 0 : "Incorrect entries count [s2=" + s2 + ", s3=" + s3 + ']';
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -311,7 +311,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             dataLdr.close(false);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -469,7 +469,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             info("Cache size on second grid: " + grid(nodesCntNoCache + 1).cache(null).primaryKeySet().size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -561,7 +561,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             ldr.future().get();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -675,7 +675,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             assertEquals(11, c.size());
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -710,7 +710,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             ldr.close(false);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -760,7 +760,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
             ldr.close(false);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
index 340bb4d..8ff4db7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
@@ -317,8 +317,9 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
     public void testRenameDifferentExcludeSettings() throws Exception {
         start();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfsPrimary.rename(FILE, FILE_RMT);
 
                 return null;
@@ -326,8 +327,9 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
         }, IgniteFsInvalidPathException.class, "Cannot move file to a path with different eviction exclude setting " +
             "(need to copy and remove)");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfsPrimary.rename(FILE_RMT, FILE);
 
                 return null;
@@ -457,8 +459,9 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
      * @throws Exception If failed.
      */
     public void checkMetrics(final long blocksRead, final long blocksReadRmt) throws Exception {
-        assert GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        assert TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 IgniteFsMetrics metrics = ggfsPrimary.metrics();
 
                 return metrics.blocksReadTotal() == blocksRead && metrics.blocksReadRemote() == blocksReadRmt;
@@ -475,8 +478,9 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
      * @param curBytes Current bytes.
      */
     private void checkEvictionPolicy(final int curBlocks, final long curBytes) throws IgniteInterruptedCheckedException {
-        assert GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        assert TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 return evictPlc.getCurrentBlocks() == curBlocks && evictPlc.getCurrentSize() == curBytes;
             }
         }, 5000) : "Unexpected counts [expectedBlocks=" + curBlocks + ", actualBlocks=" + evictPlc.getCurrentBlocks() +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
index efe6d17..a9198b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
@@ -605,8 +605,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
     public void testMoveRenameSourceDoesNotExist() throws Exception {
         create(ggfs, paths(DIR, DIR_NEW), null);
 
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.rename(SUBDIR, SUBDIR_NEW);
 
                 return null;
@@ -693,22 +694,24 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
 
         // We have different results for dual and non-dual modes.
         if (dual)
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     ggfs.delete(SUBDIR, false);
 
                     return null;
                 }
             }, IgniteCheckedException.class, "Failed to delete the path due to secondary file system exception:");
         else {
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     ggfs.delete(SUBDIR, false);
 
                     return null;
                 }
             }, GridGgfsDirectoryNotEmptyException.class, "Failed to remove directory (directory is not empty and " +
-                   "recursive flag is not set)");
+                "recursive flag is not set)");
         }
 
         checkExist(ggfs, ggfsSecondary, SUBDIR, SUBSUBDIR, FILE);
@@ -864,8 +867,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
     public void testOpenDoesNotExist() throws Exception {
         ggfsSecondary.delete(FILE, false);
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log(), new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 IgniteFsInputStream is = null;
 
                 try {
@@ -914,8 +918,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
     public void testCreateNoClose() throws Exception {
         create(ggfs, paths(DIR, SUBDIR), 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 {
                 IgniteFsOutputStream os1 = null;
                 IgniteFsOutputStream os2 = null;
 
@@ -985,8 +990,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
     public void testCreateDeleteNoClose() throws Exception {
         create(ggfs, paths(DIR, SUBDIR), 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 {
                 IgniteFsOutputStream os = null;
 
                 try {
@@ -1015,8 +1021,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
     public void testCreateDeleteParentNoClose() throws Exception {
         create(ggfs, paths(DIR, SUBDIR), 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 {
                 IgniteFsOutputStream os = null;
 
                 try {
@@ -1214,8 +1221,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
 
         createFile(ggfs, FILE, false);
 
-        GridTestUtils.assertThrowsInherited(log(), new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log(), new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 IgniteFsOutputStream os1 = null;
                 IgniteFsOutputStream os2 = null;
 
@@ -1291,8 +1299,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
 
         createFile(ggfs, FILE, false);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 IgniteFsOutputStream os = null;
 
                 try {
@@ -1323,8 +1332,9 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
 
         createFile(ggfs, FILE, false);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 IgniteFsOutputStream os = null;
 
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java
index 28d557f..ea84ae9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java
@@ -97,7 +97,7 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -112,16 +112,18 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest {
 
         assert CACHE_NAME.equals(g.caches().iterator().next().name());
 
-        GridTestUtils.assertThrows(log(), new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log(), new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 g.cache(META_CACHE_NAME);
 
                 return null;
             }
         }, IllegalStateException.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 {
                 g.cache(DATA_CACHE_NAME);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java
index e8d17d8..a457fc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java
@@ -40,7 +40,7 @@ import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * {@link GridGgfsDataManager} test case.
@@ -147,7 +147,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -189,7 +189,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
             fut.get(3000);
 
             for (int j = 0; j < NODES_CNT; j++) {
-                GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+                GridCacheContext<Object, Object> ctx = TestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
                     "ctx");
                 Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs();
 
@@ -277,7 +277,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
             fut.get(3000);
 
             for (int j = 0; j < NODES_CNT; j++) {
-                GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+                GridCacheContext<Object, Object> ctx = TestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
                     "ctx");
                 Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs();
 
@@ -357,7 +357,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
             fut.get(3000);
 
             for (int j = 0; j < NODES_CNT; j++) {
-                GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+                GridCacheContext<Object, Object> ctx = TestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
                     "ctx");
                 Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs();
 
@@ -552,8 +552,9 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
      * @param msg Expected failure message.
      */
     private void expectsStoreFail(final GridGgfsFileInfo reserved, final byte[] data, @Nullable String msg) {
-        GridTestUtils.assertThrows(log, new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable() {
+            @Override
+            public Object call() throws Exception {
                 GridGgfsFileAffinityRange range = new GridGgfsFileAffinityRange();
 
                 mgr.storeDataBlocks(reserved, reserved.length(), null, 0, ByteBuffer.wrap(data), false, range, null);
@@ -570,8 +571,9 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
      * @param msg Expected failure message.
      */
     private void expectsDeleteFail(final GridGgfsFileInfo fileInfo, @Nullable String msg) {
-        GridTestUtils.assertThrows(log, new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable() {
+            @Override
+            public Object call() throws Exception {
                 mgr.delete(fileInfo);
 
                 return null;
@@ -589,8 +591,9 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
      */
     private void expectsAffinityFail(final GridGgfsFileInfo info, final long start, final long len,
         @Nullable String msg) {
-        GridTestUtils.assertThrows(log, new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable() {
+            @Override
+            public Object call() throws Exception {
                 mgr.affinity(info, start, len);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java
index 13cf6b4..f6ac1d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java
@@ -1187,14 +1187,15 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT
         final IgniteFsInputStream in0 = in;
 
         // Try reading the second block. Should fail.
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 in0.seek(blockSize);
 
                 try {
                     in0.read(readBuf);
-                } finally {
+                }
+                finally {
                     U.closeQuiet(in0);
                 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileMapSelfTest.java
index f13240f..c3cbc7e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsFileMapSelfTest.java
@@ -250,32 +250,36 @@ public class GridGgfsFileMapSelfTest extends GridGgfsCommonAbstractTest {
         map.addRange(new GridGgfsFileAffinityRange(10, 19, affKey1));
         map.addRange(new GridGgfsFileAffinityRange(30, 39, affKey1));
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 map.updateRangeStatus(new GridGgfsFileAffinityRange(0, 5, affKey1), RANGE_STATUS_MOVING);
 
                 return null;
             }
         }, GridGgfsInvalidRangeException.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 {
                 map.updateRangeStatus(new GridGgfsFileAffinityRange(15, 19, affKey1), RANGE_STATUS_MOVING);
 
                 return null;
             }
         }, GridGgfsInvalidRangeException.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 {
                 map.updateRangeStatus(new GridGgfsFileAffinityRange(10, 19, affKey2), RANGE_STATUS_MOVING);
 
                 return null;
             }
         }, AssertionError.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 {
                 map.updateRangeStatus(new GridGgfsFileAffinityRange(10, 22, affKey1), RANGE_STATUS_MOVING);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java
index 67bcb85..e7a1c36 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java
@@ -36,7 +36,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.internal.processors.fs.GridGgfsFileInfo.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * {@link GridGgfsMetaManager} test case.
@@ -122,7 +122,7 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest {
 
     /** {@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/fs/GridGgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java
index 974070d..ba271b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java
@@ -95,7 +95,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -260,8 +260,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
         assertListDir("/", "ef", "ab", "cd");
         assertListDir("/ef", "1", "3");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.delete(path("/ef"), false);
 
                 return null;
@@ -291,8 +292,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
 
         info("Create directories: " + max);
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet())
                     ggfs.mkdirs(path(cur));
 
@@ -304,8 +306,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
 
         cnt.set(0); // Reset counter.
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet()) {
                     IgniteFsFile info = ggfs.info(path(cur));
 
@@ -321,8 +324,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
 
         cnt.set(0); // Reset counter.
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet())
                     ggfs.delete(path(cur), true);
 
@@ -370,8 +374,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
         assert paths.size() == 3 : "Unexpected paths: " + paths;
 
         // Delete.
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.delete(path("/"), false);
 
                 return null;
@@ -396,8 +401,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
 
         assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/"))));
 
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.delete(path("/"), false);
 
                 return null;
@@ -474,8 +480,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
             info("Entry in cache [key=" + key + ", val=" + metaCache.get(key) + ']');
 
         // Move under itself.
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.rename(path("/A/B1/C1"), path("/A/B1/C1/C2"));
 
                 return null;
@@ -483,8 +490,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
         }, IgniteFsException.class, null);
 
         // Move under itself.
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.rename(path("/A/B1/C1"), path("/A/B1/C1/D/C2"));
 
                 return null;
@@ -492,7 +500,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
         }, IgniteFsException.class, null);
 
         // Move under itself.
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 ggfs.rename(path("/A/B1/C1"), path("/A/B1/C1/D/E/C2"));
@@ -531,8 +539,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
             assertTrue("Entry: " + e, ggfs.exists(p2));
 
             // Test root rename.
-            GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     ggfs.rename(root, p1);
 
                     return null;
@@ -540,8 +549,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
             }, IgniteFsException.class, null);
 
             // Test root rename.
-            GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     ggfs.rename(p1, root);
 
                     return null;
@@ -550,8 +560,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
 
             // Test root rename.
             if (!root.equals(p2)) {
-                GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-                    @Override public Object call() throws Exception {
+                TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+                    @Override
+                    public Object call() throws Exception {
                         ggfs.rename(root, p2);
 
                         return null;
@@ -897,8 +908,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
     private void assertUpdatePropertiesFails(@Nullable final IgniteFsPath path,
         @Nullable final Map<String, String> props,
         Class<? extends Throwable> cls, @Nullable String msg) {
-        GridTestUtils.assertThrows(log, new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable() {
+            @Override
+            public Object call() throws Exception {
                 return ggfs.update(path, props);
             }
         }, cls, msg);
@@ -912,8 +924,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
      * @param msg Failure message if expected exception was not thrown.
      */
     private void assertCreateFails(final String path, final boolean overwrite, @Nullable String msg) {
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.create(path(path), overwrite);
 
                 return false;
@@ -929,8 +942,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
      * @param msg Failure message if expected exception was not thrown.
      */
     private void assertAppendFails(final String path, final boolean create, @Nullable String msg) {
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.append(path(path), create);
 
                 return false;
@@ -945,8 +959,9 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
      * @param msg Failure message if expected exception was not thrown.
      */
     private void assertOpenFails(final String path, @Nullable String msg) {
-        GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrowsInherited(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 ggfs.open(path(path));
 
                 return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java
index 15ccb08..e172b53 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java
@@ -99,7 +99,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
 
     /** {@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/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index faaa0a6..e9affb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -49,7 +49,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe
 
     /** {@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/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
index c6d9838..77244de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
@@ -36,8 +36,9 @@ public class GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest
      * @throws Exception If failed.
      */
     public void testShmemEndpointsRegistration() throws Exception {
-        Throwable e = GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        Throwable e = TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 IgniteConfiguration cfg = gridConfiguration();
 
                 cfg.setGgfsConfiguration(igniteFsConfiguration("shmem", IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT,


Mime
View raw message