#ignite-237: Change tests to new affinity API.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50db6efa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50db6efa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50db6efa Branch: refs/heads/sprint-2 Commit: 50db6efa0b0a48c6e23fe48e71436cd5949b66e3 Parents: 482ffd1 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Feb 26 15:09:21 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Feb 26 15:09:21 2015 +0300 ---------------------------------------------------------------------- .../dht/GridCacheDhtEvictionNearReadersSelfTest.java | 6 +----- .../distributed/dht/GridCacheDhtEvictionSelfTest.java | 14 +------------- 2 files changed, 2 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50db6efa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index 6d43df5..a293c6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -168,10 +167,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT * @return Primary node for the given key. */ private Collection<ClusterNode> keyNodes(Object key) { - CacheRendezvousAffinityFunction aff = (CacheRendezvousAffinityFunction) grid(0).jcache(null). - getConfiguration(CacheConfiguration.class).getAffinity(); - - return aff.assignPartition(aff.partition(key), new ArrayList<>(grid(0).cluster().nodes()), 1, null); + return grid(0).affinity(null).mapKeyToPrimaryAndBackups(key); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50db6efa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index c253861..d9242f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -158,22 +157,11 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { } /** - * @param idx Index. - * @return Affinity. - */ - private CacheRendezvousAffinityFunction affinity(int idx) { - return (CacheRendezvousAffinityFunction)grid(idx).jcache(null). - getConfiguration(CacheConfiguration.class).getAffinity(); - } - - /** * @param key Key. * @return Primary node for the given key. */ private Collection<ClusterNode> keyNodes(Object key) { - CacheRendezvousAffinityFunction aff = affinity(0); - - return aff.assignPartition(aff.partition(key), new ArrayList(grid(0).cluster().nodes()), 1, null); + return grid(0).affinity(null).mapKeyToPrimaryAndBackups(key); } /**
