You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 14:24:28 UTC
incubator-ignite git commit: #ignite-51: Change test for messaging.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 29508fad7 -> 2f43d32d1
#ignite-51: Change test for messaging.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f43d32d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f43d32d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f43d32d
Branch: refs/heads/ignite-51
Commit: 2f43d32d17d2000a4c251ab067bfbab393f687be
Parents: 29508fa
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Mar 2 16:24:21 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Mar 2 16:24:21 2015 +0300
----------------------------------------------------------------------
.../communication/GridCacheMessageSelfTest.java | 88 ++++++++++++++++++--
1 file changed, 79 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f43d32d/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
index 29c22db..c011bbc 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
@@ -26,20 +26,27 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
/** */
private static final byte DIRECT_TYPE = (byte)202;
+ /** */
+ private static final byte DIRECT_TYPE1 = (byte)203;
+
static {
GridIoMessageFactory.registerCustom(DIRECT_TYPE, new CO<Message>() {
- @Override
- public Message apply() {
+ @Override public Message apply() {
return new TestMessage();
}
});
GridIoMessageFactory.registerCustom(GridTestMessage.DIRECT_TYPE, new CO<Message>() {
- @Override
- public Message apply() {
+ @Override public Message apply() {
return new GridTestMessage();
}
});
+
+ GridIoMessageFactory.registerCustom(DIRECT_TYPE1, new CO<Message>() {
+ @Override public Message apply() {
+ return new TestMessage1();
+ }
+ });
}
/** {@inheritDoc} */
@@ -50,7 +57,6 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
CacheConfiguration ccfg = new CacheConfiguration();
- ccfg.setName(null);
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -100,7 +106,11 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
for (int i = 1; i <= SAMPLE_CNT; i++) {
mgr0.send(grid(1).localNode(), topic, message, GridIoPolicy.PUBLIC_POOL);
- message.add(new GridTestMessage(grid(1).localNode().id(), i, 0));
+ TestMessage1 mes1 = new TestMessage1();
+
+ mes1.init(new GridTestMessage(grid(1).localNode().id(), i, 0));
+
+ message.add(mes1);
}
assert latch.await(3, SECONDS);
@@ -109,13 +119,13 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
/** */
private static class TestMessage extends GridCacheMessage {
/** */
- @GridDirectCollection(GridTestMessage.class)
- private Collection<GridTestMessage> entries = new ArrayList<>();
+ @GridDirectCollection(TestMessage1.class)
+ private Collection<TestMessage1> entries = new ArrayList<>();
/**
* @param entry Entry.
*/
- public void add(GridTestMessage entry) {
+ public void add(TestMessage1 entry) {
entries.add(entry);
}
@@ -169,4 +179,64 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
return true;
}
}
+
+ private static class TestMessage1 extends GridCacheMessage {
+ GridTestMessage mes;
+
+ public void init(GridTestMessage mes) {
+ this.mes = mes;
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte directType() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte fieldsCount() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
+ writer.setBuffer(buf);
+
+ if (!writer.isHeaderWritten()) {
+ if (!writer.writeHeader(directType(), fieldsCount()))
+ return false;
+
+ writer.onHeaderWritten();
+ }
+
+ switch (writer.state()) {
+ case 0:
+ if (!mes.writeTo(buf, writer))
+ return false;
+
+ writer.incrementState();
+ }
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
+ reader.setBuffer(buf);
+
+ if (!reader.beforeMessageRead())
+ return false;
+
+ switch (reader.state()) {
+ case 0:
+ mes.readFrom(buf, reader);
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+ }
+
+ return true;
+ }
+ }
}