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 2017/02/14 13:11:39 UTC
[20/34] ignite git commit: IGNITE-3727 fix notes from jira.
IGNITE-3727 fix notes from jira.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/14cb9f5d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14cb9f5d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14cb9f5d
Branch: refs/heads/ignite-3727-2
Commit: 14cb9f5d3ea788f3cf4a96fe77c346c192173c5c
Parents: e4b44a8
Author: DmitriyGovorukhin <dg...@gridgain.com>
Authored: Tue Sep 13 12:57:59 2016 +0300
Committer: DmitriyGovorukhin <dg...@gridgain.com>
Committed: Tue Sep 13 12:57:59 2016 +0300
----------------------------------------------------------------------
.../messaging/IgniteMessagingSendAsyncTest.java | 81 ++++++++------------
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
2 files changed, 32 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/14cb9f5d/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
index 0187579..d98dedf 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
@@ -19,10 +19,12 @@ package org.apache.ignite.messaging;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Assert;
+import java.io.Serializable;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
@@ -30,28 +32,16 @@ import java.util.concurrent.atomic.AtomicReference;
/**
*
*/
-public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
- /**
- * Ignite instance for test.
- */
- private Ignite ignite1;
-
- private Ignite ignite2;
-
+public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest implements Serializable {
/**
* Topic name.
*/
private final String TOPIC = "topic";
/**
- * {@inheritDoc}
+ * Message string.
*/
- @Override protected void beforeTest() throws Exception {
- super.beforeTest();
-
- ignite1 = startGrid(1);
- ignite2 = startGrid(2);
- }
+ private final String msgStr = "message";
/**
* {@inheritDoc}
@@ -66,29 +56,26 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
* Test for check, that if use default mode, local listeners execute
* in the same thread. 1 node in topology.
*/
- public void testSendDefaultMode() throws InterruptedException {
- stopGrid(2);
-
- final String msgStr = "message";
+ public void testSendDefaultMode() throws Exception {
+ Ignite ignite1 = startGrid(1);
- send(ignite1.message(), msgStr, new ProcedureApply() {
+ send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () {
@Override public void apply(String msg, Thread thread) {
Assert.assertEquals(Thread.currentThread(), thread);
Assert.assertEquals(msgStr, msg);
}
});
+
}
/**
* Test for check, that if use async mode, local listeners execute
* in another thread(through pool). 1 node in topology.
*/
- public void testSendAsyncMode() throws InterruptedException {
- stopGrid(2);
-
- final String msgStr = "message";
+ public void testSendAsyncMode() throws Exception {
+ Ignite ignite1 = startGrid(1);
- send(ignite1.message().withAsync(), msgStr, new ProcedureApply() {
+ send(ignite1.message().withAsync(), msgStr, new IgniteBiInClosure<String, Thread> () {
@Override public void apply(String msg, Thread thread) {
Assert.assertTrue(!Thread.currentThread().equals(thread));
Assert.assertEquals(msgStr, msg);
@@ -101,10 +88,11 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
* in the same thread. 2 node in topology.
*/
public void testSendDefaultMode2Node() throws Exception {
- final String msgStr = "message";
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
- sendWith2Node(ignite1.message(), msgStr, new ProcedureApply() {
- @Override public void apply(String msg, Thread thread) {
+ sendWith2Node(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () {
+ @Override public void apply(String msg, Thread thread) {
Assert.assertEquals(Thread.currentThread(), thread);
Assert.assertEquals(msgStr, msg);
}
@@ -116,10 +104,11 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
* in another thread(through pool). 2 node in topology.
*/
public void testSendAsyncMode2Node() throws Exception {
- final String msgStr = "message";
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
- sendWith2Node(ignite1.message().withAsync(), msgStr, new ProcedureApply() {
- @Override public void apply(String msg, Thread thread) {
+ sendWith2Node(ignite2, ignite1.message().withAsync(), msgStr, new IgniteBiInClosure<String, Thread> () {
+ @Override public void apply(String msg, Thread thread) {
Assert.assertTrue(!Thread.currentThread().equals(thread));
Assert.assertEquals(msgStr, msg);
}
@@ -131,10 +120,11 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
* @param msgStr Message string.
* @param cls Callback for compare result.
*/
- private void sendWith2Node(
- final IgniteMessaging igniteMsg,
- final String msgStr,
- final ProcedureApply cls
+ public void sendWith2Node(
+ final Ignite ignite2,
+ final IgniteMessaging igniteMsg,
+ final String msgStr,
+ final IgniteBiInClosure<String,Thread> cls
) throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
@@ -142,7 +132,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
@Override public boolean apply(UUID uuid, String msg) {
Assert.assertEquals(msgStr, msg);
latch.countDown();
- return false;
+ return true;
}
});
@@ -157,9 +147,9 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
* @param cls Callback for compare result.
*/
private void send(
- IgniteMessaging igniteMsg,
- String msgStr,
- ProcedureApply cls
+ final IgniteMessaging igniteMsg,
+ final String msgStr,
+ final IgniteBiInClosure<String,Thread> cls
) throws InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);
@@ -171,7 +161,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
thread.set(Thread.currentThread());
val.set(msgStr);
latch.countDown();
- return false;
+ return true;
}
});
@@ -181,15 +171,4 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest {
cls.apply(val.get(), thread.get());
}
-
- /**
- * Only for this test procedure.
- */
- private interface ProcedureApply {
- /**
- * @param val Value.
- * @param thread Thread.
- */
- void apply(String val, Thread thread);
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/14cb9f5d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 2717b06..3eb7e5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -53,6 +53,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.DynamicProxySerializationMultiJvmSelfTest;
import org.apache.ignite.messaging.GridMessagingNoPeerClassLoadingSelfTest;
import org.apache.ignite.messaging.GridMessagingSelfTest;
+import org.apache.ignite.messaging.IgniteMessagingSendAsyncTest;
import org.apache.ignite.messaging.IgniteMessagingWithClientTest;
import org.apache.ignite.spi.GridSpiLocalHostInjectionTest;
import org.apache.ignite.startup.properties.NotStringSystemPropertyTest;
@@ -97,6 +98,7 @@ public class IgniteBasicTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridSelfTest.class));
suite.addTest(new TestSuite(ClusterGroupHostsSelfTest.class));
suite.addTest(new TestSuite(IgniteMessagingWithClientTest.class));
+ suite.addTest(new TestSuite(IgniteMessagingSendAsyncTest.class));
GridTestUtils.addTestIfNeeded(suite, ClusterGroupSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, GridMessagingSelfTest.class, ignoredTests);