sp-1 fixing 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/5a307bc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a307bc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a307bc1 Branch: refs/heads/ignite-sql-tests Commit: 5a307bc18899278c94e639ff43db24d28af5e031 Parents: 37c699b Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Feb 9 14:06:06 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Feb 9 14:06:06 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 11 +++++++---- .../GridCachePartitionedMultiNodeFullApiSelfTest.java | 10 ++++------ 2 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a307bc1/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 546c476..8f02feb 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 @@ -3122,8 +3122,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract @SuppressWarnings("unchecked") @Override public boolean applyx() throws IgniteCheckedException { try { - if (c.get(key) != null) + Integer val = c.get(key); + + if (val != null) { + info("Value is in cache [key=" + key + ", val=" + val + ']'); + return false; + } // Get "cache" field from GridCacheProxyImpl. GridCacheAdapter c0 = GridTestUtils.getFieldValue(c, "cache"); @@ -3687,11 +3692,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertFalse(cache.iterator().hasNext()); - final int SIZE = 20000; - Map<String, Integer> entries = new HashMap<>(); - for (int i = 0; i < SIZE; ++i) { + for (int i = 0; i < 20000; ++i) { cache.put(Integer.toString(i), i); entries.put(Integer.toString(i), i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a307bc1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index 459be63..eec0642 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -17,15 +17,13 @@ package org.apache.ignite.internal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import java.util.*; @@ -33,8 +31,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; import static org.apache.ignite.events.EventType.*; +import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; /** * Multi-node tests for partitioned cache. @@ -75,8 +73,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i * i); - GridCache<Object, Object> prj0 = grid(0).cache(null); - GridCache<Object, Object> prj1 = grid(1).cache(null); + IgniteCache<Object, Object> prj0 = grid(0).jcache(null); + IgniteCache<Object, Object> prj1 = grid(1).jcache(null); prj0.putAll(putMap);
