Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 411AD18AC1 for ; Fri, 19 Jun 2015 02:55:31 +0000 (UTC) Received: (qmail 12492 invoked by uid 500); 19 Jun 2015 02:55:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 12459 invoked by uid 500); 19 Jun 2015 02:55:31 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 12445 invoked by uid 99); 19 Jun 2015 02:55:31 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 02:55:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 906AB1A5D42 for ; Fri, 19 Jun 2015 02:55:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id FBYxB4ncBGeC for ; Fri, 19 Jun 2015 02:55:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 142CE26199 for ; Fri, 19 Jun 2015 02:55:25 +0000 (UTC) Received: (qmail 12171 invoked by uid 99); 19 Jun 2015 02:55:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 02:55:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6290E3CBA; Fri, 19 Jun 2015 02:55:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Jun 2015 02:55:34 -0000 Message-Id: <72efe3771673445da2ec05e36879f4f1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/14] incubator-ignite git commit: Fixed test. Fixed test. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f3292d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f3292d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f3292d5 Branch: refs/heads/ignite-sprint-7 Commit: 4f3292d5d8b29c04fcc1bf1fa9b88e5f19ceddfe Parents: d874b00 Author: nikolay tikhonov Authored: Thu Jun 18 15:19:03 2015 +0300 Committer: nikolay tikhonov Committed: Thu Jun 18 15:19:03 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/GridSelfTest.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f3292d5/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java index eccae34..2de04b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java @@ -112,7 +112,9 @@ public class GridSelfTest extends GridProjectionAbstractTest { */ @SuppressWarnings({"TooBroadScope"}) public void testAsyncListen() throws Exception { - final String msg = "HELLO!"; + final String hello = "HELLO!"; + + final String bye = "BYE!"; final Ignite g = grid(0); @@ -120,10 +122,12 @@ public class GridSelfTest extends GridProjectionAbstractTest { g.message().remoteListen(null, new MessagingListenActor() { @Override protected void receive(UUID nodeId, String rcvMsg) throws Throwable { - assertEquals(locNodeId, nodeId); - assertEquals(msg, rcvMsg); + if (hello.equals(rcvMsg)) { + assertEquals(locNodeId, nodeId); + assertEquals(hello, rcvMsg); - stop(rcvMsg); + stop(bye); + } } }); @@ -131,22 +135,22 @@ public class GridSelfTest extends GridProjectionAbstractTest { g.message().localListen(null, new P2() { @Override public boolean apply(UUID nodeId, String msg) { - if (!locNodeId.equals(nodeId)) + if (msg.equals(bye)) cnt.incrementAndGet(); return true; } }); - g.message().send(null, msg); + g.message().send(null, hello); GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return cnt.get() == g.cluster().forRemotes().nodes().size(); + return cnt.get() == g.cluster().nodes().size(); } }, 5000); - assertEquals(cnt.get(), g.cluster().forRemotes().nodes().size()); + assertEquals(cnt.get(), g.cluster().nodes().size()); } /**