You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:09 UTC
[10/51] [abbrv] ignite git commit: IGNITE-2523: Fixed message count
tests.
IGNITE-2523: Fixed message count tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d3e1645a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d3e1645a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d3e1645a
Branch: refs/heads/ignite-2523
Commit: d3e1645aaeb8fd9393744cb087a9ddde27f2e95b
Parents: 3d34e50
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 10:52:48 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 10:52:48 2016 +0300
----------------------------------------------------------------------
.../GridCacheAtomicMessageCountSelfTest.java | 40 ++++++++++++++------
1 file changed, 28 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3e1645a/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..cda86ba 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;
@@ -138,6 +139,7 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
TestCommunicationSpi commSpi = (TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
commSpi.registerMessage(GridNearAtomicUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
commSpi.registerMessage(GridDhtAtomicUpdateRequest.class);
int putCnt = 15;
@@ -166,22 +168,22 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
jcache(0).put(i, i);
}
- assertEquals(expNearCnt, commSpi.messageCount(GridNearAtomicUpdateRequest.class));
- assertEquals(expDhtCnt, commSpi.messageCount(GridDhtAtomicUpdateRequest.class));
+ assertEquals(expNearCnt, nearRequestsCount(commSpi));
+ assertEquals(expDhtCnt, dhtRequestsCount(commSpi));
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(GridDhtAtomicUpdateRequest.class));
+ assertEquals(0, nearRequestsCount(commSpi));
+ assertEquals(0, dhtRequestsCount(commSpi));
}
}
else {
for (int i = 1; i < 4; i++) {
commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi();
- assertEquals(0, commSpi.messageCount(GridNearAtomicUpdateRequest.class));
+ assertEquals(0, nearRequestsCount(commSpi));
}
}
}
@@ -191,6 +193,27 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
}
/**
+ * Get amount of near update requests.
+ *
+ * @param commSpi Communication SPI.
+ * @return Count.
+ */
+ private int nearRequestsCount(TestCommunicationSpi commSpi) {
+ return commSpi.messageCount(GridNearAtomicUpdateRequest.class) +
+ commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class);
+ }
+
+ /**
+ * Get amount of DHT update requests.
+ *
+ * @param commSpi Communication SPI.
+ * @return Count.
+ */
+ private int dhtRequestsCount(TestCommunicationSpi commSpi) {
+ return commSpi.messageCount(GridDhtAtomicUpdateRequest.class);
+ }
+
+ /**
* Test communication SPI.
*/
private static class TestCommunicationSpi extends TcpCommunicationSpi {
@@ -229,12 +252,5 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
return cntr == null ? 0 : cntr.get();
}
-
- /**
- * Resets counter to zero.
- */
- public void resetCount() {
- cntMap.clear();
- }
}
}
\ No newline at end of file