http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index 65833e3..5c214bc 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -119,14 +119,14 @@ public abstract class 
GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
 
         startGrid(gridCount());
 
-        GridCache<String, Organization> orgCache = 
((IgniteKernal)grid(0)).cache(null);
+        GridCache<String, Organization> orgCache = 
((IgniteKernal)grid(0)).getCache(null);
 
         assert orgCache != null;
 
         assert orgCache.putx("o1", new Organization(1, "A"));
         assert orgCache.putx("o2", new Organization(2, "B"));
 
-        GridCache<CacheAffinityKey<String>, Person> personCache = 
((IgniteKernal)grid(0)).cache(null);
+        GridCache<CacheAffinityKey<String>, Person> personCache = 
((IgniteKernal)grid(0)).getCache(null);
 
         assert personCache != null;
 
@@ -162,7 +162,7 @@ public abstract class 
GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
      */
     public void testNoDataInCache() throws Exception {
         CacheQuery<List<?>> qry = ((IgniteKernal)grid(0))
-            .cache(null).queries().createSqlFieldsQuery("select age from 
Person where orgId = 999");
+            .getCache(null).queries().createSqlFieldsQuery("select age from 
Person where orgId = 999");
 
         Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new 
AverageRemoteReducer()).get();
 
@@ -173,7 +173,7 @@ public abstract class 
GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
      * @throws Exception If failed.
      */
     public void testAverageQuery() throws Exception {
-        CacheQuery<List<?>> qry = 
((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery("select age 
from Person");
+        CacheQuery<List<?>> qry = 
((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery("select 
age from Person");
 
         Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new 
AverageRemoteReducer()).get();
 
@@ -184,7 +184,7 @@ public abstract class 
GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
      * @throws Exception If failed.
      */
     public void testAverageQueryWithArguments() throws Exception {
-        CacheQuery<List<?>> qry = 
((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> qry = 
((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery(
             "select age from Person where orgId = ?");
 
         Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new 
AverageRemoteReducer(), 1).get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
index 3837537..a5aee10 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
@@ -44,7 +44,7 @@ public class GridCacheReduceFieldsQueryPartitionedSelfTest 
extends GridCacheAbst
      * @throws Exception If failed.
      */
     public void testIncludeBackups() throws Exception {
-        CacheQuery<List<?>> qry = 
((IgniteKernal)grid(0)).cache(null).queries().createSqlFieldsQuery("select age 
from Person");
+        CacheQuery<List<?>> qry = 
((IgniteKernal)grid(0)).getCache(null).queries().createSqlFieldsQuery("select 
age from Person");
 
         qry.includeBackups(true);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02dcd388/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
index 0a7a39c..12a9801 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.processors.query.h2;
 
-import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.query.annotations.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
@@ -157,8 +156,8 @@ public class GridH2IndexRebuildTest extends 
GridCacheAbstractSelfTest {
 
         cache().queries().rebuildAllIndexes().get();
 
-        GridCache<Integer, TestValue1> cache1 = 
((IgniteKernal)grid(0)).cache(null);
-        GridCache<Integer, TestValue2> cache2 = 
((IgniteKernal)grid(0)).cache(null);
+        GridCache<Integer, TestValue1> cache1 = 
((IgniteKernal)grid(0)).getCache(null);
+        GridCache<Integer, TestValue2> cache2 = 
((IgniteKernal)grid(0)).getCache(null);
 
         for (int i = 0; i < ENTRY_CNT; i++) {
             cache1.put(i, new TestValue1(i, "val2-" + i, i, i));
@@ -203,25 +202,25 @@ public class GridH2IndexRebuildTest extends 
GridCacheAbstractSelfTest {
     public void testRebuildInterrupted() throws Exception {
         spi.sleepInRebuild = true;
 
-        GridCache<Integer, TestValue1> cache1 = 
((IgniteKernal)grid(0)).cache(null);
-        GridCache<Integer, TestValue2> cache2 = 
((IgniteKernal)grid(0)).cache(null);
+        GridCache<Integer, TestValue1> cache1 = 
((IgniteKernal)grid(0)).getCache(null);
+        GridCache<Integer, TestValue2> cache2 = 
((IgniteKernal)grid(0)).getCache(null);
 
         cache1.put(0, new TestValue1(0, "val0", 0 ,0));
         cache2.put(1, new TestValue2(0, "val0"));
 
-        
checkCancel(((IgniteKernal)grid(0)).cache(null).queries().rebuildIndexes("TestValue1"));
+        
checkCancel(((IgniteKernal)grid(0)).getCache(null).queries().rebuildIndexes("TestValue1"));
 
-        
checkCancel(((IgniteKernal)grid(0)).cache(null).queries().rebuildAllIndexes());
+        
checkCancel(((IgniteKernal)grid(0)).getCache(null).queries().rebuildAllIndexes());
 
         spi.sleepInRebuild = false;
 
-        final IgniteInternalFuture<?> fut1 = 
((IgniteKernal)grid(0)).cache(null).queries().rebuildIndexes(TestValue1.class);
+        final IgniteInternalFuture<?> fut1 = 
((IgniteKernal)grid(0)).getCache(null).queries().rebuildIndexes(TestValue1.class);
 
         assertFalse(fut1.isCancelled());
 
         fut1.get();
 
-        final IgniteInternalFuture<?> fut2 = 
((IgniteKernal)grid(0)).cache(null).queries().rebuildAllIndexes();
+        final IgniteInternalFuture<?> fut2 = 
((IgniteKernal)grid(0)).getCache(null).queries().rebuildAllIndexes();
 
         assertFalse(fut2.isCancelled());
 

Reply via email to