IGNITE-544 - 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/1424f9d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1424f9d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1424f9d7 Branch: refs/heads/ignite-573 Commit: 1424f9d7a67c2d2759d9063ae03b4766a55fd4cc Parents: 216f8cb Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Mar 24 18:29:37 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Mar 24 18:29:37 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 12 ++++++------ .../near/GridCacheNearMultiNodeSelfTest.java | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1424f9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 2b65fed..bc96efa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -5315,22 +5315,22 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, */ private static class PeekModes { /** */ - boolean near; + private boolean near; /** */ - boolean primary; + private boolean primary; /** */ - boolean backup; + private boolean backup; /** */ - boolean heap; + private boolean heap; /** */ - boolean offheap; + private boolean offheap; /** */ - boolean swap; + private boolean swap; /** {@inheritDoc} */ @Override public String toString() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1424f9d7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 94a64ab..0388699 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -516,15 +516,11 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { assertEquals("3", s); - assertEquals("2", near.localPeek(2, CachePeekMode.ONHEAP)); + assertEquals("2", near.get(2)); assertEquals("3", near.get(3)); assertNotNull(dht(primaryGrid(3)).peek(3, F.asList(GLOBAL))); - // This assertion no longer makes sense as we bring the value over whenever - // there is a version mismatch. - // assertNull(dht(primaryGrid(2)).peek(2, new GridCachePeekMode[]{GLOBAL})); - tx.commit(); } }
