#ignite-565: Remove GridCache from tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e373dff5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e373dff5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e373dff5 Branch: refs/heads/ignite-611 Commit: e373dff5eea6d6a9ec4f1b594c7663ca573ca1e3 Parents: 9f3a94a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Mar 25 16:48:38 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Mar 25 16:48:38 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteTxMultiNodeAbstractTest.java | 2 +- .../ignite/internal/processors/igfs/IgfsStreamsSelfTest.java | 7 ++++--- .../processors/cache/GridIndexingWithNoopSwapSelfTest.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e373dff5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index d43cbb8..07dcad3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -707,7 +707,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe try { startGrids(GRID_CNT); - GridCache<String, Integer> cache = ((IgniteKernal)grid(0)).getCache(null); + GridCacheAdapter<String, Integer> cache = ((IgniteKernal)grid(0)).internalCache(null); // Store counter. cache.put(RMVD_CNTR_KEY, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e373dff5/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java index 09b514e..86e4c31 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.igfs.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -152,8 +153,8 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { * @throws IgniteCheckedException In case of exception. */ public void testConfiguration() throws IgniteCheckedException { - GridCache metaCache = getFieldValue(fs, "meta", "metaCache"); - GridCache dataCache = getFieldValue(fs, "data", "dataCache"); + GridCacheProxyImpl metaCache = getFieldValue(fs, "meta", "metaCache"); + GridCacheAdapter dataCache = getFieldValue(fs, "data", "dataCache"); assertNotNull(metaCache); assertEquals(META_CACHE_NAME, metaCache.name()); @@ -255,7 +256,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { // After this we should have first two block colocated with grid 0 and last block colocated with grid 1. IgfsFileImpl fileImpl = (IgfsFileImpl)fs.info(path); - GridCache<Object, Object> metaCache = grid(0).cachex(META_CACHE_NAME); + GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME); IgfsFileInfo fileInfo = (IgfsFileInfo)metaCache.get(fileImpl.fileId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e373dff5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 0267379..c650b6b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -91,12 +91,12 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testQuery() throws Exception { - GridCache<Integer, ObjectValue> cache = ((IgniteKernal)ignite).getCache(null); + GridCacheAdapter<Integer, ObjectValue> cache = ((IgniteKernal)ignite).internalCache(null); int cnt = 10; for (int i = 0; i < cnt; i++) - cache.putx(i, new ObjectValue("test" + i, i)); + cache.put(i, new ObjectValue("test" + i, i)); for (int i = 0; i < cnt; i++) { assertNotNull(cache.peek(i));
