IGNITE-96 Changed tests on client module to JCache API.

modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java

@@ -18,15 +18,13 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.client.ssl.*;
 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.processors.affinity.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
@@ -46,7 +44,6 @@
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
 
 /**
  *
@@ -281,7 +278,7 @@ private void doTestSyncCommitFlag(final GridClientData data) throws Exception {
         final String key = "k0";
 
         Collection<UUID> affNodesIds = F.viewReadOnly(
-            grid(0).cache(data.cacheName()).affinity().mapKeyToPrimaryAndBackups(key),
+            affinity(grid(0).jcache(data.cacheName())).mapKeyToPrimaryAndBackups(key),
             F.node2id());
 
         final GridClientData dataFirst = data.pinNodes(F.first(client.compute().nodes()));
@@ -467,11 +464,11 @@ public void testMultithreadedCachePut() throws Exception {
 
             ClusterNode node = ignite.cluster().mapKeyToNode(PARTITIONED_CACHE_NAME, key);
 
-            if (!puts.get(key).get2().equals(gridMap.get(node.id()).cache(PARTITIONED_CACHE_NAME).peek(key))) {
+            if (!puts.get(key).get2().equals(gridMap.get(node.id()).jcache(PARTITIONED_CACHE_NAME).peek(key))) {
                 // printAffinityState(gridMap.values());
 
                 failNotEquals("Node don't have value for key [nodeId=" + node.id() + ", key=" + key + "]",
-                    puts.get(key).get2(), gridMap.get(node.id()).cache(PARTITIONED_CACHE_NAME).peek(key));
+                    puts.get(key).get2(), gridMap.get(node.id()).jcache(PARTITIONED_CACHE_NAME).peek(key));
             }
 
             // Assert that client has properly determined affinity node.
@@ -492,26 +489,11 @@ public void testMultithreadedCachePut() throws Exception {
 
             // Check that no other nodes see this key.
             for (UUID id : F.view(gridMap.keySet(), F.notEqualTo(node.id())))
-                assertNull("Got value in near cache.", gridMap.get(id).cache(PARTITIONED_CACHE_NAME).peek(key));
+                assertNull("Got value in near cache.", gridMap.get(id).jcache(PARTITIONED_CACHE_NAME).peek(key));
         }
 
         for (Ignite g : gridMap.values())
-            g.cache(PARTITIONED_CACHE_NAME).clear();
-    }
-
-    /**
-     * @param grids Collection for Grids to print affinity info.
-     */
-    private void printAffinityState(Iterable<Ignite> grids) {
-        for (Ignite g : grids) {
-            GridAffinityAssignmentCache affCache = getFieldValue(
-                ((IgniteKernal)g).internalCache(PARTITIONED_CACHE_NAME).context().affinity(),
-                "aff");
-
-            CacheAffinityFunction aff = getFieldValue(affCache, "aff");
-
-            info("Affinity [nodeId=" + g.cluster().localNode().id() + ", affinity=" + aff + "]");
-        }
+            g.jcache(PARTITIONED_CACHE_NAME).clear();
     }
 
     /** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/client/ClientTestPortableAffinityKeyTask.java

@@ -72,12 +72,12 @@ protected Boolean executeJob(Object arg) throws IgniteException {
 
         String expAffKey = (String)it.next();
 
-        Object affKey = ignite.cache(cacheName).affinity().affinityKey(obj);
+        Object affKey = ignite.affinity(cacheName).affinityKey(obj);
 
         if (!expAffKey.equals(affKey))
             throw new IgniteException("Unexpected affinity key: " + affKey);
 
-        if (!ignite.cache(cacheName).affinity().mapKeyToNode(obj).isLocal())
+        if (!ignite.affinity(cacheName).mapKeyToNode(obj).isLocal())
             throw new IgniteException("Job is not run on primary node.");
 
         return true;

modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java

@@ -401,12 +401,12 @@ public void testAffinityExecute() throws Exception {
     public void testInvalidateFlag() throws Exception {
         IgniteEx g0 = grid(0);
 
-        GridCache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME);
+        IgniteCache<String, String> cache = g0.jcache(PARTITIONED_CACHE_NAME);
 
         String key = null;
 
         for (int i = 0; i < 10_000; i++) {
-            if (!cache.affinity().isPrimaryOrBackup(g0.localNode(), String.valueOf(i))) {
+            if (!affinity(cache).isPrimaryOrBackup(g0.localNode(), String.valueOf(i))) {
                 key = String.valueOf(i);
 
                 break;
@@ -424,9 +424,9 @@ public void testInvalidateFlag() throws Exception {
         d.flagsOn(GridClientCacheFlag.INVALIDATE).put(key, "zzz");
 
         for (Ignite g : G.allGrids()) {
-            cache = g.cache(PARTITIONED_CACHE_NAME);
+            cache = g.jcache(PARTITIONED_CACHE_NAME);
 
-            if (cache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key))
+            if (affinity(cache).isPrimaryOrBackup(g.cluster().localNode(), key))
                 assertEquals("zzz", cache.peek(key));
             else
                 assertNull(cache.peek(key));
@@ -619,7 +619,7 @@ public void testAffinityPut() throws Exception {
             partitioned.put(key, "val" + key);
 
             for (Map.Entry<UUID, Ignite> entry : gridsByLocNode.entrySet()) {
-                Object val = entry.getValue().cache(PARTITIONED_CACHE_NAME).peek(key);
+                Object val = entry.getValue().jcache(PARTITIONED_CACHE_NAME).peek(key);
 
                 if (primaryNodeId.equals(entry.getKey()))
                     assertEquals("val" + key, val);
@@ -641,7 +641,7 @@ public void testAffinityPut() throws Exception {
             partitioned.pinNodes(node).put(pinnedKey, "val" + pinnedKey);
 
             for (Map.Entry<UUID, Ignite> entry : gridsByLocNode.entrySet()) {
-                Object val = entry.getValue().cache(PARTITIONED_CACHE_NAME).peek(pinnedKey);
+                Object val = entry.getValue().jcache(PARTITIONED_CACHE_NAME).peek(pinnedKey);
 
                 if (primaryNodeId.equals(entry.getKey()) || pinnedNodeId.equals(entry.getKey()))
                     assertEquals("val" + pinnedKey, val);