Repository: incubator-ignite Updated Branches: refs/heads/ignite-96-tests 9809ddad6 -> ad0bd6440
# IGNITE-56 internalCache() should return GridCacheProxy. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad0bd644 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad0bd644 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad0bd644 Branch: refs/heads/ignite-96-tests Commit: ad0bd6440e7f918c32f3a74d1391102a1fc9bcf7 Parents: 9809dda Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue Feb 10 16:15:39 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Feb 10 16:15:39 2015 +0300 ---------------------------------------------------------------------- .../distributed/near/GridCacheNearEvictionSelfTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0bd644/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index 98c6652..eca69b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -165,7 +165,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { }); for (int i = 0; i < gridCnt; i++) { - final GridCacheAdapter cache = internalCache(i); + final GridCache cache = internalCache(i); // Repeatedly check cache sizes because of concurrent cache updates. assertTrue(GridTestUtils.waitForCondition(new PA() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0bd644/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 33b82b4..0918e87 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -99,23 +99,23 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param idx Grid index. * @return Cache. */ - protected <K, V> GridCacheAdapter<K, V> internalCache(int idx) { - return ((IgniteKernal)grid(idx)).internalCache(null); + protected <K, V> GridCache<K, V> internalCache(int idx) { + return ((IgniteKernal)grid(idx)).cache(null); } /** * @param idx Grid index. * @return Cache. */ - protected <K, V> GridCacheAdapter<K, V> internalCache(int idx, String cacheName) { - return ((IgniteKernal)grid(idx)).internalCache(null); + protected <K, V> GridCache<K, V> internalCache(int idx, String cacheName) { + return ((IgniteKernal)grid(idx)).cache(null); } /** * @return Cache. */ - protected <K, V> GridCacheAdapter<K, V> internalCache() { - return ((IgniteKernal)grid()).internalCache(null); + protected <K, V> GridCache<K, V> internalCache() { + return ((IgniteKernal)grid()).cache(null); } /**