# sprint-1 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11cd874d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11cd874d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11cd874d Branch: refs/heads/ignite-211 Commit: 11cd874db703bd4a6cb5964e8a9dc17ddf7fda10 Parents: 2d1dcc6 Author: sboikov <semen.boi...@inria.fr> Authored: Tue Feb 10 11:37:44 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Tue Feb 10 11:37:44 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 38 ++++++++++---------- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 ++-- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 19 +++++----- 3 files changed, 30 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11cd874d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 78fa8c5..f579998 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -2914,8 +2914,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract /** * @throws Exception In case of error. */ - // TODO: IGNITE-206: Enable when fixed. - public void _testEvictExpired() throws Exception { + public void testEvictExpired() throws Exception { IgniteCache<String, Integer> cache = jcache(); String key = primaryKeysForCache(cache, 1).get(0); @@ -2943,16 +2942,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertTrue(cache.localSize() == 0); - // Force reload on primary node. - for (int i = 0; i < gridCount(); i++) { - if (cache(i).entry(key).primary()) - load(jcache(i), key, true); - } - - // Will do near get request. load(cache, key, true); - assertEquals((Integer)1, peek(cache, key)); + CacheAffinity<String> aff = ignite(0).affinity(null); + + for (int i = 0; i < gridCount(); i++) { + if (aff.isPrimaryOrBackup(grid(i).cluster().localNode(), key)) + assertEquals((Integer)1, peek(jcache(i), key)); + } } /** @@ -3256,8 +3253,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract /** * @throws Exception In case of error. */ - // TODO: IGNITE-206: Enable when fixed. - public void _testLocalEvict() throws Exception { + public void testLocalEvict() throws Exception { IgniteCache<String, Integer> cache = jcache(); List<String> keys = primaryKeysForCache(cache, 3); @@ -3280,14 +3276,20 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache.localPeek(key2, CachePeekMode.ONHEAP) == null; assert cache.localPeek(key3, CachePeekMode.ONHEAP) == 3; - if (cache.getConfiguration(CacheConfiguration.class).getDistributionMode() == CacheDistributionMode.NEAR_ONLY) - return; - loadAll(cache, ImmutableSet.of(key1, key2), true); - assert cache.localPeek(key1, CachePeekMode.ONHEAP) == 1; - assert cache.localPeek(key2, CachePeekMode.ONHEAP) == 2; - assert cache.localPeek(key3, CachePeekMode.ONHEAP) == 3; + CacheAffinity<String> aff = ignite(0).affinity(null); + + for (int i = 0; i < gridCount(); i++) { + if (aff.isPrimaryOrBackup(grid(i).cluster().localNode(), key1)) + assertEquals((Integer)1, peek(jcache(i), key1)); + + if (aff.isPrimaryOrBackup(grid(i).cluster().localNode(), key2)) + assertEquals((Integer)2, peek(jcache(i), key2)); + + if (aff.isPrimaryOrBackup(grid(i).cluster().localNode(), key3)) + assertEquals((Integer)3, peek(jcache(i), key3)); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11cd874d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 8c18258..843a1ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -144,8 +144,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache } /** {@inheritDoc} */ - // TODO: IGNITE-206: Enable when fixed. - @Override public void _testEvictExpired() throws Exception { + @Override public void testEvictExpired() throws Exception { IgniteCache<String, Integer> cache = jcache(); String key = primaryKeysForCache(cache, 1).get(0); @@ -185,8 +184,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache } /** {@inheritDoc} */ - // TODO: IGNITE-206: Enable when fixed. - @Override public void _testLocalEvict() throws Exception { + @Override public void testLocalEvict() throws Exception { IgniteCache<String, Integer> cache = jcache(); List<String> keys = primaryKeysForCache(cache, 3); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11cd874d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java index a431d83..59a347f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; import javax.cache.expiry.*; import java.util.*; @@ -115,8 +115,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe } /** {@inheritDoc} */ - // TODO: IGNITE-206: Enable when fixed. - @Override public void _testEvictExpired() throws Exception { + @Override public void testEvictExpired() throws Exception { IgniteCache<String, Integer> cache = jcache(); String key = primaryKeysForCache(cache, 1).get(0); @@ -143,15 +142,13 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe assertTrue(cache.localSize() == 0); - // Force reload on primary node. - for (int i = 0; i < gridCount(); i++) { - if (ignite(i).affinity(null).isPrimary(ignite(i).cluster().localNode(), key)) - load(jcache(i), key, true); - } - - // Will do near get request. load(cache, key, true); - assertEquals((Integer)1, cache.localPeek(key, CachePeekMode.ONHEAP)); + CacheAffinity<String> aff = ignite(0).affinity(null); + + for (int i = 0; i < gridCount(); i++) { + if (aff.isPrimaryOrBackup(grid(i).cluster().localNode(), key)) + assertEquals((Integer)1, peek(jcache(i), key)); + } } }
