ignite-656: test is fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e113332 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e113332 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e113332 Branch: refs/heads/ignite-gg-9702 Commit: 7e11333218cee1bcb7b965048aef80c2814113be Parents: c769709 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Apr 16 12:44:33 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Apr 16 12:44:33 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e113332/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index ce0886e..c48321e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4290,7 +4290,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertNotNull(cache.get(key)); } - cache.removeAll(); + cache.removeAll(new HashSet<>(keys)); for (String key : keys) assertNull(cache.get(key)); @@ -4370,7 +4370,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertTrue(map.containsKey(key)); } - cacheSkipStore.removeAll(); + cacheSkipStore.removeAll(data.keySet()); for (String key : keys) { assertNull(cacheSkipStore.get(key)); @@ -4446,7 +4446,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testWithSkipStoreRemoveAll() throws Exception { - if (atomicityMode() == CacheAtomicityMode.TRANSACTIONAL) + if (atomicityMode() == CacheAtomicityMode.TRANSACTIONAL || + (atomicityMode() == CacheAtomicityMode.ATOMIC && nearEnabled())) fail("https://issues.apache.org/jira/browse/IGNITE-373";); IgniteCache<String, Integer> cache = grid(0).cache(null);
