Repository: incubator-ignite Updated Branches: refs/heads/ignite-96-tests f138c0036 -> 95d2c9566
# IGNITE-56 Migration of tests to IgniteCache Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/137b7296 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/137b7296 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/137b7296 Branch: refs/heads/ignite-96-tests Commit: 137b729684128adf9f06dc3ba6f6e1f6cb0ddcd4 Parents: f138c00 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue Feb 10 14:36:36 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Feb 10 14:36:36 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 8 ++++---- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 6 +----- .../internal/processors/cache/GridCacheAbstractSelfTest.java | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/137b7296/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java index f760c3f..604d719 100644 --- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java @@ -114,10 +114,10 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { * Check CacheAffinityProxy methods. */ private void checkAffinity() { - checkAffinity(grid(0).affinity(null), grid(1).cache(null).affinity()); - checkAffinity(grid(0).affinity(CACHE1), grid(1).cache(CACHE1).affinity()); - checkAffinity(grid(0).affinity(CACHE2), grid(1).cache(CACHE2).affinity()); - checkAffinity(grid(0).affinity(CACHE3), grid(1).cache(CACHE3).affinity()); + checkAffinity(grid(0).affinity(null), cache(1, null).affinity()); + checkAffinity(grid(0).affinity(CACHE1), cache(1, CACHE1).affinity()); + checkAffinity(grid(0).affinity(CACHE2), cache(1, CACHE2).affinity()); + checkAffinity(grid(0).affinity(CACHE3), cache(1, CACHE3).affinity()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/137b7296/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 b4ef527..66153dd 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 @@ -2722,14 +2722,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testPeekMode() throws Exception { String key = "testPeekMode"; - GridCache<String, Integer> cache = primaryIgnite(key).cache(null); + GridCache<String, Integer> cache = ((IgniteKernal)primaryIgnite(key)).cache(null); cache.put(key, 1); - Cache.Entry<String, Integer> entry = cache.entry(key); - - // assert entry.primary(); - assert cache.peek(key, F.asList(TX)) == null; assert cache.peek(key, F.asList(SWAP)) == null; assert cache.peek(key, F.asList(DB)) == 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/137b7296/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index fdf6e9e..683f5e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -361,7 +361,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked"}) @Override protected GridCache<String, Integer> cache(int idx) { - return grid(idx).cache(null); + return ((IgniteKernal)grid(idx)).cache(null); } /**
