#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 <ivasilin...@gridgain.com> Authored: Tue Jun 23 20:04:09 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> 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<String> cmd = new ArrayList<>(); cmd.add("node"); - cmd.add(getNodeJsTestDir() + "test-runner.js"); - cmd.add(fileName); - cmd.add(functionName); Map<String, String> 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<String>() { @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"); }
