Repository: ignite Updated Branches: refs/heads/ignite-2.0 800b8bd90 -> b47f29d83
IGNITE-4925 Fix IgniteCacheBinaryObjectsScanSelfTest.testScanNoClasses - Fixes #1750. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b47f29d8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b47f29d8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b47f29d8 Branch: refs/heads/ignite-2.0 Commit: b47f29d83f25037c5bf3cfe489b7120a238c7120 Parents: 800b8bd Author: Evgenii Zhuravlev <[email protected]> Authored: Wed Apr 19 14:01:21 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Apr 19 14:01:21 2017 +0300 ---------------------------------------------------------------------- .../cache/IgniteCacheBinaryObjectsScanSelfTest.java | 11 +++++++++-- .../cache/IgniteCacheEntryListenerAbstractTest.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b47f29d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java index 666505b..e0da1f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java @@ -17,10 +17,12 @@ package org.apache.ignite.internal.processors.cache; +import java.util.ArrayList; import java.util.List; import javax.cache.Cache; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -127,9 +129,14 @@ public class IgniteCacheBinaryObjectsScanSelfTest extends GridCommonAbstractTest assertEquals(PERSON_CLS_NAME, entry.getValue().getClass().getName()); } - entries = cache.query(new ScanQuery<>(1023)).getAll(); + entries = new ArrayList<>(); - assertFalse(entries.isEmpty()); + int partCnt = client.affinity("testCache").partitions(); + + for (int i = 0; i < partCnt; i++) + entries.addAll(cache.query(new ScanQuery<>(i)).getAll()); + + assertEquals(100, entries.size()); for (Cache.Entry<Object, Object> entry : entries) { assertEquals(PERSON_KEY_CLS_NAME, entry.getKey().getClass().getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b47f29d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index e0e2771..ef2f156 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -329,7 +329,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb if (!eagerTtl()) { U.sleep(1100); - assertNull(primaryCache(key, cache.getName()).get(key(key))); + assertNull(primaryCache(key(key), cache.getName()).get(key(key))); evtsLatch.await(5000, MILLISECONDS);
