ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #ignite-565: remove GridCache from tests.
Date Tue, 24 Mar 2015 16:04:20 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-565 8837527e8 -> 3b8f5060b


#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/3b8f5060
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b8f5060
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b8f5060

Branch: refs/heads/ignite-565
Commit: 3b8f5060b6e9faf0d702c84a1183a1541ec993a8
Parents: 8837527
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Tue Mar 24 19:04:17 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Tue Mar 24 19:04:17 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java  | 6 +++---
 .../cache/distributed/near/GridCacheNearMultiNodeSelfTest.java | 2 +-
 .../internal/processors/igfs/IgfsDualAbstractSelfTest.java     | 2 +-
 .../ignite/internal/processors/igfs/IgfsProcessorSelfTest.java | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b8f5060/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
index 2112712..ae0ea4b 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
@@ -246,10 +246,10 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest
{
                 for (int i = 0; i < NODE_CNT; i++) {
                     IgniteEx g = grid(i);
 
-                    GridCache<Object, Object> cache = g.cachex(DATA_CACHE_NAME);
+                    IgniteCache<Object, Object> cache = g.cache(DATA_CACHE_NAME);
 
-                    assertTrue("Data cache is not empty [keys=" + cache.keySet() +
-                        ", node=" + g.localNode().id() + ']', cache.isEmpty());
+                    assertTrue("Data cache is not empty [keys=" + keySet(cache) +
+                        ", node=" + g.localNode().id() + ']', cache.localSize() == 0);
                 }
             }
         });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b8f5060/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 94a64ab..51a0efa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -357,7 +357,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest
{
 
             assert mapKeys.get(n.id()).get1().contains(key);
 
-            GridCache<Integer, String> dhtCache = dht(G.ignite(n.id()));
+            GridCacheAdapter<Integer, String> dhtCache = dht(G.ignite(n.id()));
 
             String s = dhtCache.peek(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b8f5060/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
index 874c90e..fbad428 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
@@ -1247,7 +1247,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest
{
 
         IgfsBlockKey key = new IgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(),
2);
 
-        GridCache<IgfsBlockKey, byte[]> dataCache = igfs.context().kernalContext().cache().cache(
+        IgniteCache<IgfsBlockKey, byte[]> dataCache = igfs.context().kernalContext().cache().jcache(
             igfs.configuration().getDataCacheName());
 
         for (int i = 0; i < 10; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b8f5060/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index a0d8bfb..639271b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -683,8 +683,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         IgniteUuid fileId = U.field(igfs.info(path), "fileId");
 
-        GridCache<IgniteUuid, IgfsFileInfo> metaCache = grid(0).cachex(META_CACHE_NAME);
-        GridCache<IgfsBlockKey, byte[]> dataCache = grid(0).cachex(DATA_CACHE_NAME);
+        IgniteCache<IgniteUuid, IgfsFileInfo> metaCache = grid(0).cache(META_CACHE_NAME);
+        IgniteCache<IgfsBlockKey, byte[]> dataCache = grid(0).cache(DATA_CACHE_NAME);
 
         IgfsFileInfo info = metaCache.get(fileId);
 


Mime
View raw message