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 134AA180A1 for ; Tue, 23 Jun 2015 17:47:46 +0000 (UTC) Received: (qmail 68182 invoked by uid 500); 23 Jun 2015 17:47:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 68152 invoked by uid 500); 23 Jun 2015 17:47:45 -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 68143 invoked by uid 99); 23 Jun 2015 17:47:45 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jun 2015 17:47:45 +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 6F4B01A5F76 for ; Tue, 23 Jun 2015 17:47:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-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 aZzKrXHTu261 for ; Tue, 23 Jun 2015 17:47:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 54BE727DC4 for ; Tue, 23 Jun 2015 17:47:29 +0000 (UTC) Received: (qmail 67153 invoked by uid 99); 23 Jun 2015 17:47:27 -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; Tue, 23 Jun 2015 17:47:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FEDBE02A2; Tue, 23 Jun 2015 17:47:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 23 Jun 2015 17:47:38 -0000 Message-Id: <5a69033af0ca4df699cf49f987b400ab@git.apache.org> In-Reply-To: <755d1051167d4ce3b6a9d45dc26809d1@git.apache.org> References: <755d1051167d4ce3b6a9d45dc26809d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/20] incubator-ignite git commit: #ignite-965: code style node js java tests. #ignite-965: code style node js java tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac5434a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac5434a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac5434a4 Branch: refs/heads/ignite-965 Commit: ac5434a44421e057d3642b77f5be43ea711e2ee0 Parents: 53ed5c0 Author: ivasilinets Authored: Tue Jun 23 20:04:09 2015 +0300 Committer: ivasilinets Committed: Tue Jun 23 20:04:09 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/NodeJsAbstractTest.java | 17 ++++++----------- .../ignite/internal/NodeJsCacheApiSelfTest.java | 4 +++- .../ignite/internal/NodeJsComputeSelfTest.java | 4 +++- .../ignite/internal/NodeJsIgnitionSelfTest.java | 4 +++- 4 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac5434a4/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java index 5b7af7b..79ae908 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java @@ -22,9 +22,9 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; @@ -48,7 +48,7 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest { /** Node JS file with tests. */ private String fileName; - /** */ + /** Ip finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** @@ -61,6 +61,7 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + cfg.setCacheConfiguration(cacheConfiguration()); ConnectorConfiguration conCfg = new ConnectorConfiguration(); @@ -118,11 +119,8 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest { List cmd = new ArrayList<>(); cmd.add("node"); - cmd.add(getNodeJsTestDir() + "test-runner.js"); - cmd.add(fileName); - cmd.add(functionName); Map env = new HashMap<>(); @@ -130,10 +128,7 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest { env.put("IGNITE_HOME", IgniteUtils.getIgniteHome()); try { - proc = GridJavaProcess.exec( - cmd, - env, - log, + proc = GridJavaProcess.exec(cmd, env, log, new CI1() { @Override public void apply(String s) { info("Node js: " + s); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac5434a4/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsCacheApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsCacheApiSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsCacheApiSelfTest.java index 6c02ede..f17ca60 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsCacheApiSelfTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsCacheApiSelfTest.java @@ -21,7 +21,9 @@ package org.apache.ignite.internal; * Test node js client put/get. */ public class NodeJsCacheApiSelfTest extends NodeJsAbstractTest { - /** Constructor. */ + /** + * Constructor. + */ public NodeJsCacheApiSelfTest() { super("test-cache-api.js"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac5434a4/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java index e6ec550..5c4635d 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsComputeSelfTest.java @@ -21,7 +21,9 @@ package org.apache.ignite.internal; * Test compute node js. */ public class NodeJsComputeSelfTest extends NodeJsAbstractTest { - /** Constructor. */ + /** + * Constructor. + */ public NodeJsComputeSelfTest() { super("test-compute.js"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac5434a4/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsIgnitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsIgnitionSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsIgnitionSelfTest.java index 08973d5..205e467 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsIgnitionSelfTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsIgnitionSelfTest.java @@ -21,7 +21,9 @@ package org.apache.ignite.internal; * Test node js client. */ public class NodeJsIgnitionSelfTest extends NodeJsAbstractTest { - /** Constructor. */ + /** + * Constructor. + */ public NodeJsIgnitionSelfTest() { super("test-ignition.js"); }