Repository: ignite Updated Branches: refs/heads/ignite-2523-1 be738808d -> 96cc54ce8
FIxing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4833d3f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4833d3f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4833d3f Branch: refs/heads/ignite-2523-1 Commit: d4833d3f9f26ce907922e5a9f8b7287ab5508ed7 Parents: be73880 Author: vozerov-gridgain <[email protected]> Authored: Sat Apr 23 18:27:01 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Sat Apr 23 18:27:01 2016 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAtomicMessageCountSelfTest.java | 12 ++++++++---- .../cache/IgniteCacheAtomicStopBusySelfTest.java | 9 +++++---- ...GridCacheAtomicInvalidPartitionHandlingSelfTest.java | 5 +++-- 3 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d4833d3f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java index 0e17102..5e72029 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.managers.communication.GridIoMessage; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateRequest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; @@ -137,7 +138,10 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest TestCommunicationSpi commSpi = (TestCommunicationSpi)grid(0).configuration().getCommunicationSpi(); - commSpi.registerMessage(GridNearAtomicUpdateRequest.class); + Class nearMsgCls = orderMode == + CLOCK ? GridNearAtomicUpdateRequest.class : GridNearAtomicSingleUpdateRequest.class; + + commSpi.registerMessage(nearMsgCls); commSpi.registerMessage(GridDhtAtomicUpdateRequest.class); int putCnt = 15; @@ -166,14 +170,14 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest jcache(0).put(i, i); } - assertEquals(expNearCnt, commSpi.messageCount(GridNearAtomicUpdateRequest.class)); + assertEquals(expNearCnt, commSpi.messageCount(nearMsgCls)); assertEquals(expDhtCnt, commSpi.messageCount(GridDhtAtomicUpdateRequest.class)); if (writeOrderMode == CLOCK) { for (int i = 1; i < 4; i++) { commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi(); - assertEquals(0, commSpi.messageCount(GridNearAtomicUpdateRequest.class)); + assertEquals(0, commSpi.messageCount(nearMsgCls)); assertEquals(0, commSpi.messageCount(GridDhtAtomicUpdateRequest.class)); } } @@ -181,7 +185,7 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest for (int i = 1; i < 4; i++) { commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi(); - assertEquals(0, commSpi.messageCount(GridNearAtomicUpdateRequest.class)); + assertEquals(0, commSpi.messageCount(nearMsgCls)); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d4833d3f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java index cdb7907..2c94200 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStopBusySelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateRequest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest; /** @@ -31,28 +32,28 @@ public class IgniteCacheAtomicStopBusySelfTest extends IgniteCacheAbstractStopBu /** {@inheritDoc} */ @Override public void testPut() throws Exception { - bannedMsg.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicSingleUpdateRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testPutBatch() throws Exception { - bannedMsg.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicSingleUpdateRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testPutAsync() throws Exception { - bannedMsg.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicSingleUpdateRequest.class); super.testPut(); } /** {@inheritDoc} */ @Override public void testRemove() throws Exception { - bannedMsg.set(GridNearAtomicUpdateRequest.class); + bannedMsg.set(GridNearAtomicSingleUpdateRequest.class); super.testPut(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d4833d3f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index 74d2d09..91d5b52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -477,8 +477,9 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA private boolean delayMessage(GridIoMessage msg) { Object origMsg = msg.message(); - return delay && - ((origMsg instanceof GridNearAtomicUpdateRequest) || (origMsg instanceof GridDhtAtomicUpdateRequest)); + return delay && ((origMsg instanceof GridNearAtomicUpdateRequest) || + (origMsg instanceof GridNearAtomicSingleUpdateRequest) || + (origMsg instanceof GridDhtAtomicUpdateRequest)); } } } \ No newline at end of file
