Repository: ignite Updated Branches: refs/heads/ignite-1537 f6195b432 -> 456f1b655
ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/456f1b65 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/456f1b65 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/456f1b65 Branch: refs/heads/ignite-1537 Commit: 456f1b655965ea0f913b637e397a82f8777a62df Parents: f6195b4 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 11 19:46:10 2016 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 11 19:46:10 2016 +0300 ---------------------------------------------------------------------- .../GridCacheAbstractFullApiMultithreadedSelfTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/456f1b65/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java index 95ca9b5..9908b87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java @@ -324,10 +324,14 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid @Override public void applyx(IgniteCache<String, Integer> cache) { int rnd = random(); + Set<Integer> ids = new HashSet<>(set); + cache.removeAll(rangeKeys(0, rnd)); - for (int i = 0; i < rnd; i++) - assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == null; + for (int i = 0; i < rnd; i++) { + if (ids.contains(i)) + assertNull(cache.localPeek("key" + i)); + } } }); } @@ -350,7 +354,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid for (int i = 0; i < rnd; i++) { if (ids.contains(i)) - assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == null; + assertNull(cache.localPeek("key" + i)); } } }); @@ -359,6 +363,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid /** * @param cache Cache. * @param key Key. + * @return Removed value. */ private <K, V> V removeAsync(IgniteCache<K, V> cache, K key) { IgniteCache<K, V> cacheAsync = cache.withAsync(); @@ -371,6 +376,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid /** * @param cache Cache. * @param key Key. + * @param val Value. + * @return Remove result. */ private <K, V> boolean removeAsync(IgniteCache<K, V> cache, K key, V val) { IgniteCache<K, V> cacheAsync = cache.withAsync();
