IGNITE-59 Support lock, lockAll: Fix 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/5e24d63e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e24d63e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e24d63e Branch: refs/heads/ignite-54 Commit: 5e24d63e49abdb3cbebdf4e51b653542df7e0942 Parents: ea40627 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri Jan 16 13:13:02 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri Jan 16 13:13:02 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridCacheLockAbstractTest.java | 2 +- .../cache/distributed/near/GridCacheNearMultiNodeSelfTest.java | 2 +- .../cache/distributed/near/GridCacheNearOneNodeSelfTest.java | 4 ++-- .../kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java index 639534b..44c86e5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -352,7 +352,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { info("Put key-value pair into cache: 1='2'"); - assertEquals("2", cache1.remove(1)); + assertEquals("2", cache1.getAndRemove(1)); l2.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index f63d2d7..56549e9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -761,7 +761,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { try { assertEquals(val, near.get(key)); - assertEquals(val, near.remove(key)); + assertEquals(val, near.getAndRemove(key)); assertNull(near.localPeek(key)); assertNull(dht(primaryGrid(key)).peek(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 25adeea..0e583e5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java @@ -213,7 +213,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { assertEquals("1", dht().peek(1)); assertEquals("1", near.get(1)); - assertEquals("1", near.remove(1)); + assertEquals("1", near.getAndRemove(1)); assertNull(near.localPeek(1)); assertNull(dht().peek(1)); @@ -248,7 +248,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { try { assertEquals("1", near.get(1)); - assertEquals("1", near.remove(1)); + assertEquals("1", near.getAndRemove(1)); assertNull(near.localPeek(1)); assertNull(dht().peek(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java index 7e932ed..41030e6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java @@ -161,7 +161,8 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { GridGgfsFileInfo info = mgr.info(fileId); assertNull("Expects empty properties are not stored: " + info, getFieldValue(info, "props")); - assertEquals("Expects empty properties are not stored: " + info, Collections.emptyMap(), info.properties()); + assertEquals("Expects empty properties are not stored: " + info, Collections.<String, String>emptyMap(), + info.properties()); info = mgr.updateProperties(ROOT_ID, fileId, fileName, F.asMap(key1, "1")); @@ -178,7 +179,8 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { info = mgr.updateProperties(ROOT_ID, fileId, fileName, F.<String, String>asMap(key2, null)); assertNull("Expects empty properties are not stored: " + info, getFieldValue(info, "props")); - assertEquals("Expects empty properties are not stored: " + info, Collections.emptyMap(), info.properties()); + assertEquals("Expects empty properties are not stored: " + info, Collections.<String, String>emptyMap(), + info.properties()); assertNull(mgr.updateProperties(ROOT_ID, fileId, "not_exists", F.<String, String>asMap(key2, null))); }
