Repository: ignite Updated Branches: refs/heads/ignite-4932 837d1e7e0 -> b1da0a6cb
ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1da0a6c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1da0a6c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1da0a6c Branch: refs/heads/ignite-4932 Commit: b1da0a6cbc01e2d53fb70892af9aa1c0c6525491 Parents: 837d1e7 Author: sboikov <[email protected]> Authored: Thu Apr 13 15:42:25 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 13 15:42:25 2017 +0300 ---------------------------------------------------------------------- .../cache/IgniteCacheNoSyncForGetTest.java | 32 +++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1da0a6c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java index d1b97c5..3e624a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache; +import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -30,6 +31,7 @@ import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheEntry; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.configuration.CacheConfiguration; @@ -221,10 +223,14 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { if (withExpiryPlc) srvCache = srvCache.withExpiryPolicy(ModifiedExpiryPolicy.factoryOf(Duration.FIVE_MINUTES).create()); - if (getAll) + if (getAll) { assertEquals(data, srvCache.getAll(data.keySet())); - else + assertEquals(data.size(), srvCache.getEntries(data.keySet()).size()); + } + else { assertEquals(1, srvCache.get(1)); + assertEquals(1, srvCache.getEntry(1).getValue()); + } hangLatch.countDown(); @@ -324,7 +330,13 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { if (withExpiryPlc) cache = cache.withExpiryPolicy(ModifiedExpiryPolicy.factoryOf(Duration.FIVE_MINUTES).create()); - return cache.get(key); + Object val = cache.get(key); + + CacheEntry e = cache.getEntry(key); + + assertEquals(val, e.getValue()); + + return val; } } @@ -363,7 +375,19 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { if (withExpiryPlc) cache = cache.withExpiryPolicy(ModifiedExpiryPolicy.factoryOf(Duration.FIVE_MINUTES).create()); - return cache.getAll(keys); + Map vals = cache.getAll(keys); + + Collection<CacheEntry> entries = cache.getEntries(keys); + + assertEquals(vals.size(), entries.size()); + + for (CacheEntry entry : entries) { + Object val = vals.get(entry.getKey()); + + assertEquals(val, entry.getValue()); + } + + return vals; } } }
