IGNITE-3727 start/stop async remote listener test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/14e1a6b3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14e1a6b3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14e1a6b3 Branch: refs/heads/ignite-3727-2 Commit: 14e1a6b300109e84bf1a0652673fa674a9ea83b3 Parents: 271619d Author: DmitriyGovorukhin <[email protected]> Authored: Thu Sep 8 20:24:08 2016 +0300 Committer: DmitriyGovorukhin <[email protected]> Committed: Thu Sep 8 20:24:08 2016 +0300 ---------------------------------------------------------------------- .../ignite/messaging/GridMessagingSelfTest.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/14e1a6b3/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 2e2afd4..c6ce0dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -1045,6 +1045,8 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser } }, IllegalStateException.class, null); + discoSpi.blockCustomEvent(); + final String topic = "topic"; UUID id = msg.remoteListen(topic, new P2<UUID, Object>() { @@ -1060,9 +1062,13 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertNull(id); - IgniteFuture<UUID> fut = msg.future(); + IgniteFuture<UUID> starFut = msg.future(); + + Assert.assertNotNull(starFut); + + Assert.assertFalse(starFut.isDone()); - Assert.assertNotNull(fut); + discoSpi.stopBlock(); GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { @@ -1072,10 +1078,12 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser } }, IllegalStateException.class, null); - id = fut.get(); + id = starFut.get(); Assert.assertNotNull(id); + Assert.assertTrue(starFut.isDone()); + message(ignite1.cluster().forRemotes()).send(topic, "msg1"); GridTestUtils.waitForCondition(new PA() { @@ -1086,8 +1094,6 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser assertEquals(1, msgCnt.get()); - discoSpi.blockCustomEvent(); - msg.stopRemoteListen(id); IgniteFuture<?> stopFut = msg.future(); @@ -1135,7 +1141,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser synchronized (mux) { if (blockCustomEvt) { DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate"); - if (msg0 instanceof StopRoutineDiscoveryMessage) { + if (msg0 instanceof StopRoutineDiscoveryMessage || msg0 instanceof StartRoutineDiscoveryMessage) { log.info("Block custom message: " + msg0); blockedMsgs.add(msg);
