# IGNITE-56 Migration tests to IgniteCache

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java

@@ -431,12 +431,13 @@ public void testPutIfAbsentAsyncAvgTime() throws Exception {
      * @throws Exception If failed.
      */
     public void testGetAndPutIfAbsentAsyncAvgTime() throws Exception {
-        GridCache<Object, Object> cache = grid(0).cache(null);
+        IgniteCache<Object, Object> cache = grid(0).jcache(null);
+        IgniteCache<Object, Object> cacheAsync = cache.withAsync();
 
         Integer key = null;
 
         for (int i = 0; i < 1000; i++) {
-            if (cache.affinity().isPrimary(grid(0).localNode(), i)) {
+            if (affinity(cache).isPrimary(grid(0).localNode(), i)) {
                 key = i;
 
                 break;
@@ -445,7 +446,9 @@ public void testGetAndPutIfAbsentAsyncAvgTime() throws Exception {
 
         assertEquals(0.0f, cache.metrics().getAveragePutTime());
 
-        IgniteInternalFuture<?> fut = cache.putIfAbsentAsync(key, key);
+        cacheAsync.getAndPutIfAbsent(key, key);
+
+        IgniteFuture<?> fut = cache.future();
 
         fut.get();
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java

@@ -114,10 +114,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
                             // Preloading may happen as nodes leave, so we need to wait.
                             new GridAbsPredicateX() {
                                 @Override public boolean applyx() throws IgniteCheckedException {
-                                    //<Object, Object> to support remove(key)
-                                    GridCache<Object, Object> cache = grid(fi).cache(null);
+                                    jcache(fi).removeAll();
 
-                                    cache.removeAll();
+                                    GridCache<Object, Object> cache = internalCache(fi);
 
                                     // Fix for tests where mapping was removed at primary node
                                     // but was not removed at others.

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java

@@ -23,6 +23,7 @@
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
@@ -269,7 +270,7 @@ public void checkPutAllFailoverGroupLock(boolean near, int workerCnt, int shutdo
             for (Ignite g : runningWorkers) {
                 info(">>>>> " + g.jcache(CACHE_NAME).localSize());
 
-                primaryCacheSize += g.cache(CACHE_NAME).primarySize();
+                primaryCacheSize += ((IgniteKernal)g).internalCache(CACHE_NAME).primarySize();
             }
 
             assertTrue(TEST_MAP_SIZE <= primaryCacheSize);

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java

@@ -21,6 +21,7 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.fifo.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -180,7 +181,7 @@ private void performanceTest() throws Exception {
         Ignite g = startGrid();
 
         try {
-            GridCache<Integer, Integer> cache = g.cache(null);
+            GridCache<Integer, Integer> cache = ((IgniteKernal)g).internalCache(null);
 
 //            int max = 17 * 1024 * 1024;
             int max = Integer.MAX_VALUE;
@@ -210,7 +211,7 @@ private void performanceMultithreadedTest() throws Exception {
         Ignite g = startGrid();
 
         try {
-            final GridCache<Integer, Integer> c = g.cache(null);
+            final GridCache<Integer, Integer> c = ((IgniteKernal)g).internalCache(null);
 
             final long start = System.currentTimeMillis();
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java

@@ -122,7 +122,7 @@ private void checkSwap() throws Exception {
 
             startGrid(1);
 
-            int size = grid(1).cache(null).size();
+            int size = grid(1).jcache(null).localSize();
 
             info("New node cache size: " + size);
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.transactions.*;
 
@@ -206,10 +207,10 @@ public void testPessimisticSerializableRollbacksNoData() throws Exception {
      */
     private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put)
         throws Exception {
-        GridCache<Integer, Integer> cache = grid(0).cache(null);
+        IgniteCache<Integer, Integer> cache = grid(0).jcache(null);
 
         for (int i = 0; i < TX_CNT; i++) {
-            IgniteTx tx = cache.txStart(concurrency, isolation);
+            IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation);
 
             if (put)
                 for (int j = 0; j < keyCount(); j++)
@@ -220,7 +221,7 @@ private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isol
 
         for (int i = 0; i < gridCount(); i++) {
             IgniteTxMetrics metrics = grid(i).transactions().metrics();
-            CacheMetrics cacheMetrics = grid(i).cache(null).metrics();
+            CacheMetrics cacheMetrics = grid(i).jcache(null).metrics();
 
             if (i == 0) {
                 assertEquals(TX_CNT, metrics.txCommits());
@@ -248,10 +249,10 @@ private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isol
      */
     private void testRollbacks(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation,
         boolean put) throws Exception {
-        GridCache<Integer, Integer> cache = grid(0).cache(null);
+        IgniteCache<Integer, Integer> cache = grid(0).jcache(null);
 
         for (int i = 0; i < TX_CNT; i++) {
-            IgniteTx tx = cache.txStart(concurrency, isolation);
+            IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation);
 
             if (put)
                 for (int j = 0; j < keyCount(); j++)
@@ -262,7 +263,7 @@ private void testRollbacks(IgniteTxConcurrency concurrency, IgniteTxIsolation is
 
         for (int i = 0; i < gridCount(); i++) {
             IgniteTxMetrics metrics = grid(i).transactions().metrics();
-            CacheMetrics cacheMetrics = grid(i).cache(null).metrics();
+            CacheMetrics cacheMetrics = grid(i).jcache(null).metrics();
 
             assertEquals(0, metrics.txCommits());
             assertEquals(0, cacheMetrics.getCacheTxCommits());

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java

@@ -122,26 +122,26 @@ public void checkByteArrays() throws Exception {
         byte[] val = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
 
         for (int i = 0; i < keyCnt; i++)
-            grid(0).cache(null).put(String.valueOf(i), val);
+            grid(0).jcache(null).put(String.valueOf(i), val);
 
         for (int i = 0; i < keyCnt; i++)
-            grid(0).cache(null).get(String.valueOf(i));
+            grid(0).jcache(null).get(String.valueOf(i));
 
         startGrid(1);
 
         if (memMode == ONHEAP_TIERED) {
             for (int i = 0; i < keyCnt; i++)
-                grid(0).cache(null).evict(String.valueOf(i));
+                grid(0).jcache(null).evict(String.valueOf(i));
 
             for (int i = 0; i < keyCnt; i++)
-                grid(0).cache(null).promote(String.valueOf(i));
+                grid(0).jcache(null).promote(String.valueOf(i));
         }
 
         startGrid(2);
 
         for (int g = 0; g < 3; g++) {
             for (int i = 0; i < keyCnt; i++) {
-                byte[] o = (byte[])grid(g).cache(null).get(String.valueOf(i));
+                byte[] o = (byte[])grid(g).jcache(null).get(String.valueOf(i));
 
                 assertTrue("Got invalid value [val=" + Arrays.toString(val) + ", actual=" + Arrays.toString(o) + ']',
                     Arrays.equals(val, o));

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java

@@ -21,6 +21,7 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -247,7 +248,7 @@ public void testPutRemoveConsistencyMultithreaded() throws Exception {
 
                     Ignite ignite = grid(g);
 
-                    GridCache<Object, Object> cache = ignite.cache(null);
+                    IgniteCache<Object, Object> cache = ignite.jcache(null);
 
                     int k = rnd.nextInt(range);
 
@@ -273,7 +274,7 @@ public void testPutRemoveConsistencyMultithreaded() throws Exception {
             Long firstVal = null;
 
             for (int g = 0; g < gridCount(); g++) {
-                Long val = (Long)grid(g).cache(null).peek(i);
+                Long val = (Long)grid(g).jcache(null).peek(i);
 
                 if (firstVal == null && val != null)
                     firstVal = val;
@@ -300,7 +301,7 @@ public void testPutRemoveConsistencyMultithreaded() throws Exception {
      * @param g Grid to check.
      */
     private void checkKeySet(Ignite g) {
-        GridCache<Object, Object> cache = g.cache(null);
+        GridCache<Object, Object> cache = ((IgniteKernal)g).internalCache(null);
 
         Set<Object> keys = cache.keySet();
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java

@@ -122,14 +122,14 @@ public void testNodeStop() throws Exception {
             private int cnt;
 
             @SuppressWarnings({"BusyWait"})
-            @Override public void applyx() throws IgniteCheckedException {
+            @Override public void applyx() {
                 while (cnt++ < txCnt && !done.get()) {
-                    GridCache<Object, Object> cache = grid(0).cache(null);
+                    IgniteCache<Object, Object> cache = grid(0).jcache(null);
 
                     if (cnt % logMod == 0)
                         info("Starting transaction: " + cnt);
 
-                    try (IgniteTx tx = cache.txStart()) {
+                    try (IgniteTx tx = grid(0).transactions().txStart()) {
                         int kv = RAND.nextInt(keyRange);
 
                         cache.put(kv, kv);
@@ -138,7 +138,7 @@ public void testNodeStop() throws Exception {
 
                         tx.commit();
                     }
-                    catch (IgniteTxOptimisticCheckedException e) {
+                    catch (IgniteTxOptimisticException e) {
                         info("Caught cache optimistic exception: " + e);
                     }
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
@@ -138,7 +139,7 @@ public void testTxWritesOnDhtNode() throws Exception {
     private void checkSingleWrites() throws Exception {
         prepare();
 
-        GridCache<Integer, String> cache = grid(0).cache(null);
+        IgniteCache<Integer, String> cache = grid(0).jcache(null);
 
         for (int i = 0; i < 100; i++)
             cache.put(i, String.valueOf(i));
@@ -157,7 +158,7 @@ private void checkBatchWrites() throws Exception {
         for (int i = 0; i < 100; i++)
             map.put(i, String.valueOf(i));
 
-        grid(0).cache(null).putAll(map);
+        grid(0).jcache(null).putAll(map);
 
         checkWrites();
     }
@@ -168,9 +169,9 @@ private void checkBatchWrites() throws Exception {
     private void checkTxWrites() throws Exception {
         prepare();
 
-        GridCache<Object, Object> cache = grid(0).cache(null);
+        IgniteCache<Object, Object> cache = grid(0).jcache(null);
 
-        try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+        try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             for (int i = 0; i < 100; i++)
                 cache.put(i, String.valueOf(i));
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java

@@ -95,7 +95,7 @@ public void testPutGet() throws Exception {
 
         final Ignite ignite = grid();
 
-        ignite.cache(null).put(key, "val");
+        ignite.jcache(null).put(key, "val");
 
         GridCacheEntryEx<String,Integer> dhtEntry = dht(ignite).peekEx(key);
 
@@ -122,14 +122,14 @@ public void testPutGet() throws Exception {
      * @throws Exception If failed.
      */
     private String txGet(Ignite ignite, String key) throws Exception {
-        try (IgniteTx tx = ignite.cache(null).txStart(PESSIMISTIC, REPEATABLE_READ)) {
+        try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
             GridCacheEntryEx<String, Integer> dhtEntry = dht(ignite).peekEx(key);
 
             if (DEBUG)
                 info("DHT entry [hash=" + System.identityHashCode(dhtEntry) + ", xid=" + tx.xid() +
                     ", entry=" + dhtEntry + ']');
 
-            String val = ignite.<String, String>cache(null).get(key);
+            String val = ignite.<String, String>jcache(null).get(key);
 
             assertNotNull(val);
             assertEquals("val", val);