ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/3] incubator-ignite git commit: # Renaming
Date Mon, 08 Dec 2014 07:28:04 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
index 2500b0d..e1a1a93 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
@@ -50,7 +50,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
      * @param execId Execution ID.
      */
     private void checkTimedOutEvents(final IgniteUuid execId) {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         Collection<IgniteEvent> evts = ignite.events().localQuery(new PE() {
             @Override public boolean apply(IgniteEvent evt) {
@@ -65,7 +65,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testSynchronousTimeout() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskTimeoutTestTask.class, GridTaskTimeoutTestTask.class.getClassLoader());
 
@@ -90,7 +90,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testAsynchronousTimeout() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskTimeoutTestTask.class, GridTaskTimeoutTestTask.class.getClassLoader());
 
@@ -107,7 +107,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testSynchronousTimeoutMultithreaded() throws Exception {
-        final Ignite ignite = G.grid(getTestGridName());
+        final Ignite ignite = G.ignite(getTestGridName());
 
         final AtomicBoolean finish = new AtomicBoolean();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
index 292c7cc..5f04c09 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
@@ -34,7 +34,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
      */
     @SuppressWarnings({"deprecation"})
     public void testDifferentListeners() {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         for (int i = 0; i < 2000; i++) {
             P2<UUID, Object> l = new P2<UUID, Object>() {
@@ -63,7 +63,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
      */
     @SuppressWarnings({"deprecation"})
     public void testOneListener() {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         final AtomicBoolean stop = new AtomicBoolean();
 
@@ -98,7 +98,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
             MessageListeningTask t = new MessageListeningTask();
 
             try {
-                G.grid(getTestGridName()).compute().execute(t.getClass(), null);
+                G.ignite(getTestGridName()).compute().execute(t.getClass(), null);
             }
             catch (GridException e) {
                 assert false : "Failed to execute task [iteration=" + i + ", err=" + e.getMessage() + ']';

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index fe7436a..b736135 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3359,7 +3359,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
             if (node == null)
                 throw new GridException("Failed to map key.");
 
-            GridCache<String, Integer> cache = G.grid(node.id()).cache(null);
+            GridCache<String, Integer> cache = G.ignite(node.id()).cache(null);
 
             final GridCacheEntry<String, Integer> e = cache.entry("key");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 90aff88..fac0c2b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -64,7 +64,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
     /** */
     private static final IgnitePredicate<ClusterNode> serverNode = new P1<ClusterNode>() {
         @Override public boolean apply(ClusterNode n) {
-            String gridName = G.grid(n.id()).name();
+            String gridName = G.ignite(n.id()).name();
 
             return gridName != null && gridName.contains("server");
         }
@@ -73,7 +73,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
     /** */
     private static final IgnitePredicate<ClusterNode> clientNode = new P1<ClusterNode>() {
         @Override public boolean apply(ClusterNode n) {
-            String gridName = G.grid(n.id()).name();
+            String gridName = G.ignite(n.id()).name();
 
             return gridName != null && gridName.contains("client");
         }
@@ -195,7 +195,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
                     info("Affinity mapping [key=" + terminalId + ", nodeId=" + mappedId + ']');
 
                     for (int i = 1; i <= clientCnt; i++)
-                        clients.add(new Client(G.grid("client" + i), terminalId, srvrId));
+                        clients.add(new Client(G.ignite("client" + i), terminalId, srvrId));
 
                     info("Terminal ID: " + terminalId);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
index 3641952..9c81576 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
@@ -98,8 +98,8 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
             g1.cluster().forNodeIds(F.asList(g0.cluster().localNode().id(), g1.cluster().localNode().id()));
 
         for (int i = 0; i < 100; i++)
-            assertEquals(g0Pinned.grid().cluster().mapKeyToNode(null, i).id(),
-                g01Pinned.grid().cluster().mapKeyToNode(null, i).id());
+            assertEquals(g0Pinned.ignite().cluster().mapKeyToNode(null, i).id(),
+                g01Pinned.ignite().cluster().mapKeyToNode(null, i).id());
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
index 064d784..835f7d8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
@@ -118,7 +118,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac
      * @return DHT entry.
      */
     @Nullable private static GridCacheEntryEx<Object, Integer> dhtEntry(UUID nodeId, Object key) {
-        Ignite g = G.grid(nodeId);
+        Ignite g = G.ignite(nodeId);
 
         GridDhtCacheAdapter<Object, Integer> dht =
             ((GridKernal)g).<Object, Integer>internalCache().context().near().dht();
@@ -132,7 +132,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac
      * @return Near entry.
      */
     @Nullable private static GridCacheEntryEx<Object, Integer> nearEntry(UUID nodeId, Object key) {
-        Ignite g = G.grid(nodeId);
+        Ignite g = G.ignite(nodeId);
 
         GridNearCacheAdapter<Object, Integer> near = ((GridKernal)g).<Object, Integer>internalCache().context().near();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 0df49c2..f32f1e8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -872,6 +872,6 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
         error("Key: " + key);
         error("Partition: " + c.configuration().getAffinity().partition(key));
         error("Attempt: " + attempt);
-        error("Node: " + c.gridProjection().grid().cluster().localNode().id());
+        error("Node: " + c.gridProjection().ignite().cluster().localNode().id());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
index b834f4b..78dd8db 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
@@ -174,7 +174,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst
     protected GridCache<Object, Object> nearOnlyCache() {
         assert nearOnlyGridName != null;
 
-        return G.grid(nearOnlyGridName).cache(null);
+        return G.ignite(nearOnlyGridName).cache(null);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index 25a5b5f..57b08d0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@ -269,7 +269,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
 
                     ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
-                    Ignite ignite = G.grid(nodeName(0));
+                    Ignite ignite = G.ignite(nodeName(0));
 
                     GridCache<Integer, Integer> cache = ignite.cache(CACHE_NAME);
 
@@ -498,7 +498,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
         List<GridDhtCacheAdapter<Integer, Integer>> dhtCaches = null;
 
         for (int i = 0 ; i < dataNodes(); i++) {
-            GridCache<Integer, Integer> cache = G.grid(nodeName(i)).cache(CACHE_NAME);
+            GridCache<Integer, Integer> cache = G.ignite(nodeName(i)).cache(CACHE_NAME);
 
             assert cache != null;
 
@@ -583,7 +583,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
                 for (int i = 0; i < dataNodes(); i++) {
                     GridCacheEntry<Integer, Integer> cacheEntry = caches.get(i).entry(key);
 
-                    UUID nodeId = G.grid(nodeName(i)).cluster().localNode().id();
+                    UUID nodeId = G.ignite(nodeName(i)).cluster().localNode().id();
 
                     if (!F.eq(cacheEntry.get(), expVals.get(key)))
                         log.error("key=" + key + ", expVal=" + expVals.get(key) + ", cacheVal=" + cacheEntry.get() +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
index a23d41f..53db6fc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@ -309,6 +309,6 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
         error("Key: " + key);
         error("Partition: " + c.configuration().getAffinity().partition(key));
         error("Attempt: " + attempt);
-        error("Node: " + c.gridProjection().grid().cluster().localNode().id());
+        error("Node: " + c.gridProjection().ignite().cluster().localNode().id());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java
index f844ab7..a3dd944 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java
@@ -139,7 +139,7 @@ public abstract class GridCacheTxOriginatingNodeFailureAbstractSelfTest extends
         if (partial)
             ignoreMessages(grid(1).localNode().id(), ignoreMessageClass());
 
-        final Ignite txIgniteNode = G.grid(txNode.id());
+        final Ignite txIgniteNode = G.ignite(txNode.id());
 
         GridTestUtils.runAsync(new Callable<Object>() {
             @Override public Object call() throws Exception {
@@ -166,7 +166,7 @@ public abstract class GridCacheTxOriginatingNodeFailureAbstractSelfTest extends
 
         info("Stopping originating node " + txNode);
 
-        G.stop(G.grid(txNode.id()).name(), true);
+        G.stop(G.ignite(txNode.id()).name(), true);
 
         info("Stopped grid, waiting for transactions to complete.");
 
@@ -197,7 +197,7 @@ public abstract class GridCacheTxOriginatingNodeFailureAbstractSelfTest extends
             assertFalse(e.getValue().isEmpty());
 
             for (ClusterNode node : e.getValue()) {
-                compute(G.grid(node.id()).cluster().forNode(node)).call(new Callable<Void>() {
+                compute(G.ignite(node.id()).cluster().forNode(node)).call(new Callable<Void>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
index b8623fd..ec20f23 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
@@ -231,7 +231,7 @@ public abstract class GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTe
             for (ClusterNode node : e.getValue()) {
                 final UUID checkNodeId = node.id();
 
-                compute(G.grid(checkNodeId).cluster().forNode(node)).call(new Callable<Void>() {
+                compute(G.ignite(checkNodeId).cluster().forNode(node)).call(new Callable<Void>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite ignite;
@@ -319,7 +319,7 @@ public abstract class GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTe
             // Fail the node in the middle of transaction.
             info(">>> Stopping primary node " + primaryNode);
 
-            G.stop(G.grid(primaryNode.id()).name(), true);
+            G.stop(G.ignite(primaryNode.id()).name(), true);
 
             info(">>> Stopped originating node, finishing transaction: " + primaryNode.id());
 
@@ -362,7 +362,7 @@ public abstract class GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTe
             for (ClusterNode node : e.getValue()) {
                 final UUID checkNodeId = node.id();
 
-                compute(G.grid(checkNodeId).cluster().forNode(node)).call(new Callable<Void>() {
+                compute(G.ignite(checkNodeId).cluster().forNode(node)).call(new Callable<Void>() {
                     /** */
                     @IgniteInstanceResource
                     private Ignite ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index 73dcc14..d27844a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -616,8 +616,8 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
             checkEntry(grid(i), nearKey, 1, false, expReaders);
         }
 
-        GridCache<Integer, Integer> primaryCache = G.grid(
-            (String)aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null);
+        GridCache<Integer, Integer> primaryCache = G.ignite(
+            (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null);
 
         delay();
 
@@ -663,7 +663,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
         for (int i = 0; i < GRID_CNT; i++)
             checkEntry(grid(i), nearKey, null, i == 0);
 
-        Ignite primaryNode = G.grid((String)aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME));
+        Ignite primaryNode = G.ignite((String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME));
 
         delay();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
index 037fe12..e8cad96 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
@@ -130,7 +130,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
      * @return Grid.
      */
     private Ignite grid(UUID nodeId) {
-        return G.grid(nodeId);
+        return G.ignite(nodeId);
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index f46e632..0785439 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -135,7 +135,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
      * @return Grid for the given node.
      */
     private Ignite grid(ClusterNode node) {
-        return G.grid(node.id());
+        return G.ignite(node.id());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 5e49745..281cd77 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -129,7 +129,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
      * @return Grid for the given node.
      */
     private Ignite grid(ClusterNode node) {
-        return G.grid(node.id());
+        return G.ignite(node.id());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index 94debd3..cf8818c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -213,6 +213,6 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
      * @return Grid.
      */
     private Ignite grid(ClusterNode node) {
-        return G.grid(node.id());
+        return G.ignite(node.id());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index c4e438b..ba1d3c3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -304,7 +304,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
                             Collection<UUID> nodeIds = U.nodeIds(nodes);
 
                             assert nodeIds.contains(nodeId) : "Invalid affinity mapping [nodeId=" + nodeId +
-                                ", part=" + p + ", state=" + state + ", grid=" + G.grid(nodeId).name() +
+                                ", part=" + p + ", state=" + state + ", grid=" + G.ignite(nodeId).name() +
                                 ", affNames=" + U.nodes2names(nodes) + ", affIds=" + nodeIds + ']';
                         }
                     }
@@ -389,7 +389,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
      * @param keyCnt Key count.
      */
     private void checkCache(GridCache<String, Integer> c, int keyCnt) {
-        Ignite g = c.gridProjection().grid();
+        Ignite g = c.gridProjection().ignite();
 
         for (int i = 0; i < keyCnt; i++) {
             String key = Integer.toString(i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index 9c9e2f7..6586a82 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -119,7 +119,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
      * @param keyCnt Key count.
      */
     private void checkCache(GridCache<String, Integer> c, int keyCnt) {
-        Ignite g = c.gridProjection().grid();
+        Ignite g = c.gridProjection().ignite();
 
         for (int i = 0; i < keyCnt; i++) {
             String key = Integer.toString(i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index c156d08..b4fb65e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -614,7 +614,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
     private void checkKeys(GridCache<Integer, String> cache, int cnt, Iterable<Ignite> grids) throws GridException {
         GridCacheAffinity<Integer> aff = affinity(cache);
 
-        Ignite ignite = cache.gridProjection().grid();
+        Ignite ignite = cache.gridProjection().ignite();
 
         ClusterNode loc = ignite.cluster().localNode();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index 5f82c7f..c95716e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -248,7 +248,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
 
         boolean sync = isSync(c);
 
-        Ignite ignite = c.gridProjection().grid();
+        Ignite ignite = c.gridProjection().ignite();
 
         for (int i = 0; i < cnt; i++) {
             if (aff.mapPartitionToPrimaryAndBackups(aff.partition(i)).contains(ignite.cluster().localNode())) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index fab39af..6573322 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -273,7 +273,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
         assert n != null;
 
-        return G.grid(n.id());
+        return G.ignite(n.id());
     }
 
     /**
@@ -288,7 +288,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
         return F.viewReadOnly(backups,
             new C1<ClusterNode, Ignite>() {
                 @Override public Ignite apply(ClusterNode node) {
-                    return G.grid(node.id());
+                    return G.ignite(node.id());
                 }
             });
     }
@@ -347,7 +347,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
 
             assert ((Collection)n.meta("primary")).contains(key);
 
-            GridCache<Integer, String> dhtCache = dht(G.grid(n.id()));
+            GridCache<Integer, String> dhtCache = dht(G.ignite(n.id()));
 
             String s = dhtCache.peek(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 14c7e84..df7856d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -94,7 +94,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
 
         return F.view(super.affinityNodes(), new P1<ClusterNode>() {
             @Override public boolean apply(ClusterNode n) {
-                return !F.eq(G.grid(n.id()).name(), grid(nearIdx).name());
+                return !F.eq(G.ignite(n.id()).name(), grid(nearIdx).name());
             }
         });
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
index b062f48..96f2c6f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
@@ -152,8 +152,8 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest {
 
             ClusterNode primaryNode = F.first(affNodes);
 
-            if (F.eq(primaryNode, cache1.gridProjection().grid().cluster().localNode()) &&
-                affNodes.contains(cache3.gridProjection().grid().cluster().localNode()))
+            if (F.eq(primaryNode, cache1.gridProjection().ignite().cluster().localNode()) &&
+                affNodes.contains(cache3.gridProjection().ignite().cluster().localNode()))
                 break;
 
             key++;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index e3eeb6e..b8f37bd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -109,7 +109,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
      * @return Grid.
      */
     private Ignite grid(UUID nodeId) {
-        return G.grid(nodeId);
+        return G.ignite(nodeId);
     }
 
     /** @throws Exception If failed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index c979cb4..23a8ecf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -97,9 +97,9 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
             assert backupNode != otherNode;
             assert priNode != otherNode;
 
-            Ignite priIgnite = G.grid(priNode.id());
-            Ignite backupIgnite = G.grid(backupNode.id());
-            Ignite otherIgnite = G.grid(otherNode.id());
+            Ignite priIgnite = G.ignite(priNode.id());
+            Ignite backupIgnite = G.ignite(backupNode.id());
+            Ignite otherIgnite = G.ignite(otherNode.id());
 
             List<Ignite> ignites = F.asList(otherIgnite, priIgnite, backupIgnite);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index 4058d3c..18f3e83 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -83,7 +83,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT
      * @return Cache.
      */
     private GridCacheProjection<String, Integer> cache(ClusterNode node) {
-        return G.grid(node.id()).cache(null);
+        return G.ignite(node.id()).cache(null);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 846122e..6676c57 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -214,7 +214,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
         Collection<String> names = new ArrayList<>(nodeIds.size());
 
         for (UUID nodeId : nodeIds)
-            names.add(G.grid(nodeId).name());
+            names.add(G.ignite(nodeId).name());
 
         return names;
     }
@@ -246,7 +246,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
         assert first != null;
 
-        final Ignite pri = G.grid(first.id());
+        final Ignite pri = G.ignite(first.id());
 
         List<Ignite> nears = grids(gridCnt, pri);
 
@@ -495,8 +495,8 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
         for (Map.Entry<String, Integer> e : cntrs.entrySet())
             assertEquals("Counter check failed on grid [grid=" + e.getKey() +
-                ", dhtEntry=" + dht(G.grid(e.getKey())).peekEx(CNTR_KEY) +
-                ", nearEntry=" + near(G.grid(e.getKey())).peekExx(CNTR_KEY) + ']',
+                ", dhtEntry=" + dht(G.ignite(e.getKey())).peekEx(CNTR_KEY) +
+                ", nearEntry=" + near(G.ignite(e.getKey())).peekExx(CNTR_KEY) + ']',
                 exp, e.getValue().intValue());
 
         X.println("*** ");
@@ -541,7 +541,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
 
         assertEquals(1 + backups, affNodes.size());
 
-        Ignite pri = G.grid(F.first(affNodes).id());
+        Ignite pri = G.ignite(F.first(affNodes).id());
 
         // Initialize.
         pri.cache(null).put(CNTR_KEY, 0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 995b04a..237309f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -358,7 +358,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
 
         info("Node: " + node);
 
-        GridCache<String, Integer> cache = G.grid(node.id()).cache(null);
+        GridCache<String, Integer> cache = G.ignite(node.id()).cache(null);
 
         checkLockAsyncWithTimeoutEntry("key", cache);
     }
@@ -376,7 +376,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
 
         info("Node: " + node);
 
-        GridCache<String, Integer> cache = G.grid(node.id()).cache(null);
+        GridCache<String, Integer> cache = G.ignite(node.id()).cache(null);
 
         checkLockAsyncWithTimeoutEntry("key", cache);
     }
@@ -404,7 +404,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
 
         info("Node: " + node);
 
-        GridCache<String, Integer> cache = G.grid(node.id()).cache(null);
+        GridCache<String, Integer> cache = G.ignite(node.id()).cache(null);
 
         checkLockAsyncWithTimeoutEntry("key", cache);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
index 8bfee45..90d4866 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
@@ -55,11 +55,11 @@ public class GridCachePartitionedProjectionSelfTest extends GridCacheAbstractPro
             String key = "1";
             Integer val = Integer.valueOf(key);
 
-            Ignite primary = G.grid(cache(0).affinity().mapKeyToNode(key).id());
+            Ignite primary = G.ignite(cache(0).affinity().mapKeyToNode(key).id());
 
             Collection<ClusterNode> affNodes = cache(0).affinity().mapKeyToPrimaryAndBackups(key);
 
-            Ignite near = G.grid(F.first(F.view(grid(0).nodes(), F.notIn(affNodes))).id());
+            Ignite near = G.ignite(F.first(F.view(grid(0).nodes(), F.notIn(affNodes))).id());
 
             assert primary != null;
             assert near != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index 54ac3d6..d292d55 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -221,7 +221,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
 
             i.incrementAndGet();
 
-            String grid = entry.projection().gridProjection().grid().name();
+            String grid = entry.projection().gridProjection().ignite().name();
 
             boolean ret = !(entry.peek() instanceof Integer);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridMessageListenSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridMessageListenSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridMessageListenSelfTest.java
index bde3f24..be0a11c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridMessageListenSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridMessageListenSelfTest.java
@@ -448,7 +448,7 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest {
 
             X.println("Received message [nodeId=" + nodeId + ", locNodeId=" + ignite.cluster().localNode().id() + ']');
 
-            assertEquals(prj.grid().cluster().localNode().id(), nodeId);
+            assertEquals(prj.ignite().cluster().localNode().id(), nodeId);
             assertEquals(MSG, msg);
 
             nodes.add(locNodeId);
@@ -473,13 +473,13 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override protected void receive(UUID nodeId, Object msg) throws Throwable {
-            assertNotNull(grid());
+            assertNotNull(ignite());
 
-            UUID locNodeId = grid().cluster().localNode().id();
+            UUID locNodeId = ignite().cluster().localNode().id();
 
             X.println("Received message [nodeId=" + nodeId + ", locNodeId=" + locNodeId + ']');
 
-            assertEquals(prj.grid().cluster().localNode().id(), nodeId);
+            assertEquals(prj.ignite().cluster().localNode().id(), nodeId);
             assertEquals(MSG, msg);
 
             nodes.add(locNodeId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
index de65d6a..59497a4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
@@ -758,7 +758,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
     // TODO Enable after GG-8578.
     @SuppressWarnings("ConstantConditions")
     public void _testFormat() throws Exception {
-        GridKernal grid = (GridKernal)G.grid("grid");
+        GridKernal grid = (GridKernal)G.ignite("grid");
         GridCache cache = grid.internalCache("dataCache");
 
         if (dual)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
index 86a8c3d..4ce09bf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
@@ -737,7 +737,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
      * @return Data cache.
      */
     private GridCacheAdapter<GridGgfsBlockKey, byte[]> cache(UUID nodeId) {
-        return (GridCacheAdapter<GridGgfsBlockKey, byte[]>)((GridEx)G.grid(nodeId)).cachex(DATA_CACHE_NAME)
+        return (GridCacheAdapter<GridGgfsBlockKey, byte[]>)((GridEx)G.ignite(nodeId)).cachex(DATA_CACHE_NAME)
             .<GridGgfsBlockKey, byte[]>cache();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
index 1328035..637ec1b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
@@ -72,7 +72,7 @@ public final class GridSingleExecutionTest {
         }
 
         try {
-            Ignite ignite = G.grid();
+            Ignite ignite = G.ignite();
 
             IgniteCompute comp = ignite.compute().enableAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
index 453acba..86ca3c4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
@@ -102,7 +102,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe
      */
     private void executeFail(ClusterGroup g, IgnitePredicate<IgniteEvent> filter) {
         try {
-            g.grid().events(g).remoteQuery(filter, 0);
+            g.ignite().events(g).remoteQuery(filter, 0);
 
             assert false; // Exception must be thrown.
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
index 4d95752..aaecc4f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
@@ -123,7 +123,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr
      * @throws GridException if failed
      */
     private void checkTask(int num) throws InterruptedException, GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
index a4a7c85..1db2ae7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
@@ -122,7 +122,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract
      * @throws GridException If failed.
      */
     private void checkTask(int num) throws InterruptedException, GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
index a6b1b4e..1fe07ee 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
@@ -122,7 +122,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac
      * @throws GridException If failed.
      */
     private void checkTask(int num) throws InterruptedException, GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
index 038d2e9..e9d21ce 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
@@ -47,7 +47,7 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testCollisionSessionAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().execute(GridSessionTestTask.class, null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
index 86e165c..5661431 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
@@ -52,7 +52,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac
      * @throws Exception if failed.
      */
     public void testSetAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -66,7 +66,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac
      * @throws Exception if failed.
      */
     public void testMultiThreaded() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -101,7 +101,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws InterruptedException, GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         IgniteCompute comp = ignite.compute().enableAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
index 7233d11..56d3053 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
@@ -52,7 +52,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra
      * @throws Exception if failed.
      */
     public void testSetAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -66,7 +66,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra
      * @throws Exception if failed.
      */
     public void testMultiThreaded() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -101,7 +101,7 @@ public class GridSessionFutureWaitTaskAttributeSelfTest extends GridCommonAbstra
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws InterruptedException, GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), num);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
index b4c7d8c..f86e815 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
@@ -103,7 +103,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class.getName(), null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
index d35efa5..ca86b7c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
@@ -116,7 +116,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws InterruptedException, GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
index 80ed3e8..15b9b95 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
@@ -74,7 +74,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo
      * @throws Exception If failed.
      */
     public void testSetAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
index b9c7f59..d863dcd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
@@ -104,7 +104,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest {
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ComputeTaskFuture<?> fut = executeAsync(ignite.compute(), GridTaskSessionTestTask.class, num);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
index cd43362..901af85 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
@@ -68,7 +68,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb
      * @throws Exception If failed.
      */
     public void testSetAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
index 549b7ba..29440de 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
@@ -42,7 +42,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest
      * @throws Exception if failed.
      */
     public void testSetAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -54,7 +54,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest
      * @throws Exception if failed.
      */
     public void testMultiThreaded() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -86,7 +86,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         IgniteCompute comp = ignite.compute().enableAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
index ceedd49..1eb56b6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
@@ -42,7 +42,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT
      * @throws Exception if failed.
      */
     public void testSetAttribute() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -54,7 +54,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT
      * @throws Exception if failed.
      */
     public void testMultiThreaded() throws Exception {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         ignite.compute().localDeployTask(GridTaskSessionTestTask.class, GridTaskSessionTestTask.class.getClassLoader());
 
@@ -86,7 +86,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT
      * @throws GridException if failed.
      */
     private void checkTask(int num) throws GridException {
-        Ignite ignite = G.grid(getTestGridName());
+        Ignite ignite = G.ignite(getTestGridName());
 
         IgniteCompute comp = ignite.compute().enableAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
index 6da556a..9e2cf06 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
@@ -191,8 +191,8 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest {
     private void checkWaitAttributeMethod(WaitAttributeType type) throws Exception {
         assert type != null;
 
-        Ignite ignite1 = G.grid(getTestGridName() + '1');
-        Ignite ignite2 = G.grid(getTestGridName() + '2');
+        Ignite ignite1 = G.ignite(getTestGridName() + '1');
+        Ignite ignite2 = G.ignite(getTestGridName() + '2');
 
         assert ignite1 != null;
         assert ignite2 != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
index 2c4cad4..427cc9f 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -121,7 +121,7 @@ abstract class GridCacheAbstractLoadTest {
         info("Write threads: " + writeThreads());
         info("Test duration (ms): " + testDuration);
 
-        Ignite ignite = G.grid();
+        Ignite ignite = G.ignite();
 
         final GridCache<Integer, Integer> cache = ignite.cache(null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
index 017a864..7ce43ce 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
@@ -146,9 +146,9 @@ public class GridCacheAffinityTransactionsOffHeapTest {
      * @return Cache.
      */
     private static GridCache<Object, Integer> cache(long key) {
-        UUID id = Ignition.grid("grid-0").cache(null).affinity().mapKeyToNode(key).id();
+        UUID id = Ignition.ignite("grid-0").cache(null).affinity().mapKeyToNode(key).id();
 
-        return Ignition.grid(id).cache(null);
+        return Ignition.ignite(id).cache(null);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
index 737a0f1..bbae6bd 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java
@@ -93,7 +93,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
      */
     @SuppressWarnings({"ErrorNotRethrown", "InfiniteLoopStatement"})
     private void memoryTest() {
-        Ignite ignite = G.grid();
+        Ignite ignite = G.ignite();
 
         final GridCache<Integer, byte[]> cache = ignite.cache(null);
 
@@ -143,7 +143,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
             if (LOAD)
                 test.loadTest(test.writeClos, test.readClos);
 
-            G.grid().cache(null).clearAll();
+            G.ignite().cache(null).clearAll();
 
             System.gc();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
index a685f5f..85639e9 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
@@ -122,7 +122,7 @@ public class GridCachePutRemoveLoadTest {
             G.start(cfg);
         }
 
-        Ignite g = G.grid("g0");
+        Ignite g = G.ignite("g0");
 
         assert g != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
index dd18b81..36ead59 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
@@ -69,7 +69,7 @@ public class GridCacheSingleNodeLoadTest {
 
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Nullable @Override public Object call() throws Exception {
-                GridCache<Integer, Student> cache = G.grid().cache(null);
+                GridCache<Integer, Student> cache = G.ignite().cache(null);
 
                 assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
index 37b7373..60eb306 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java
@@ -62,7 +62,7 @@ public class GridTestMain {
     private static void colocateJobs() throws Exception {
         X.println("Collocating jobs...");
 
-        Ignite g = G.grid();
+        Ignite g = G.ignite();
 
         final GridCache<GridTestKey, Long> cache = g.cache("partitioned");
 
@@ -126,7 +126,7 @@ public class GridTestMain {
 
         long start = System.currentTimeMillis();
 
-        final GridCache<GridTestKey, Long> cache = G.grid().cache("partitioned");
+        final GridCache<GridTestKey, Long> cache = G.ignite().cache("partitioned");
 
         // Collocate computations and data.
         for (long i = 0; i < GridTestConstants.ENTRY_COUNT; i++) {
@@ -174,7 +174,7 @@ public class GridTestMain {
         ExecutorCompletionService<Object> execSvc =
             new ExecutorCompletionService<>(Executors.newFixedThreadPool(numThreads));
 
-        try (IgniteDataLoader<GridTestKey, Long> ldr = G.grid().dataLoader("partitioned")) {
+        try (IgniteDataLoader<GridTestKey, Long> ldr = G.ignite().dataLoader("partitioned")) {
             for (int i = 0; i < numThreads; i++) {
                 final int threadId = i;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
index 15b05f9..bb2cc04 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
@@ -85,7 +85,7 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest {
      * @throws Exception If task execution failed.
      */
     public void testLoad() throws Exception {
-        final Ignite ignite = G.grid(getTestGridName());
+        final Ignite ignite = G.ignite(getTestGridName());
 
         final long end = getTestDurationInMinutes() * 60 * 1000 + System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
index 119be9c..fcf935f 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
@@ -71,7 +71,7 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest {
      * @throws Exception If task execution failed.
      */
     public void testLoad() throws Exception {
-        final Ignite ignite = G.grid(getTestGridName());
+        final Ignite ignite = G.ignite(getTestGridName());
 
         deployTask(ignite);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
index e7a4aee..32c0f39 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
@@ -85,7 +85,7 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest {
      * @throws Exception If task execution failed.
      */
     public void testLoad() throws Exception {
-        final Ignite ignite = G.grid(getTestGridName());
+        final Ignite ignite = G.ignite(getTestGridName());
 
         final long end = getTestDurationInMinutes() * 60 * 1000 + System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java
index 9b3ac83..b0d134d 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java
@@ -53,7 +53,7 @@ public class GridSessionLoadTest extends GridCommonAbstractTest {
      */
     @SuppressWarnings("unchecked")
     public void testSessionLoad() throws Exception {
-        final Ignite ignite = G.grid(getTestGridName());
+        final Ignite ignite = G.ignite(getTestGridName());
 
         assert ignite != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
index d32c500..0095f16 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java
@@ -195,7 +195,7 @@ public class GridDsiClient implements Callable {
             Thread timer = null;
 
             try {
-                g = Ignition.grid("dsi");
+                g = Ignition.ignite("dsi");
 
                 int noThreads = Integer.parseInt(args[0]);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
index 89ac9d8..4eaae41 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
@@ -43,7 +43,7 @@ public class GridBenchmarkCacheGetLoadTest {
     public static void main(String[] args) throws Exception {
         Ignition.start("modules/core/src/test/config/load/dsi-49-server-production.xml");
 
-        GridCache<Long, Long> cache = Ignition.grid("dsi").cache("PARTITIONED_CACHE");
+        GridCache<Long, Long> cache = Ignition.ignite("dsi").cache("PARTITIONED_CACHE");
 
         stats();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
index 6d7a0e3..b40384f 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -145,7 +145,7 @@ public class GridSwapEvictAllBenchmark {
 
         long start = System.currentTimeMillis();
 
-        GridCache<Object, Object> cache = G.grid().cache(null);
+        GridCache<Object, Object> cache = G.ignite().cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57a26281/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
index c90b7df..9ef5a23 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
@@ -836,7 +836,7 @@ public final class GridTestUtils {
      * @return Cache context.
      */
     public static <K, V> GridCacheContext<K, V> cacheContext(GridCacheProjection<K, V> cache) {
-        return ((GridKernal)cache.gridProjection().grid()).<K, V>internalCache().context();
+        return ((GridKernal)cache.gridProjection().ignite()).<K, V>internalCache().context();
     }
 
     /**


Mime
View raw message