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 2015/06/05 16:42:19 UTC
incubator-ignite git commit: #nodejs: add runScript method to
NodeJsAbstractTest.
Repository: incubator-ignite
Updated Branches:
refs/heads/nodejs b80aceb59 -> 82da81d22
#nodejs: add runScript method to NodeJsAbstractTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/82da81d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82da81d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82da81d2
Branch: refs/heads/nodejs
Commit: 82da81d2230a3af33b586aed7c26fd4872a1b8a8
Parents: b80aceb
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Jun 5 17:42:07 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Jun 5 17:42:07 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/NodeJsAbstractTest.java | 62 +++++++++++++++++
.../apache/ignite/internal/NodeJsSelfTest.java | 71 +++-----------------
2 files changed, 73 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82da81d2/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 ea08bd4..597dd03 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
@@ -19,9 +19,16 @@ package org.apache.ignite.internal;
import org.apache.ignite.cache.*;
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.testframework.junits.common.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static java.util.concurrent.TimeUnit.*;
+
/**
* Abstract class for Node JS testing.
*/
@@ -68,4 +75,59 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest {
sep + "test" +
sep + "nodejs" + sep;
}
+
+ /**
+ * @param path Path to script.
+ * @throws Exception If script failed.
+ */
+ protected void runJsScript(String path) throws Exception {
+ final CountDownLatch readyLatch = new CountDownLatch(1);
+
+ GridJavaProcess proc = null;
+
+ final List<String> errors = new ArrayList<>();
+
+ List<String> cmd = new ArrayList<>();
+
+ cmd.add("C:\\Program Files\\nodejs\\node_modules\\.bin\\nodeunit.cmd");
+
+ cmd.add(path);
+
+ Map<String, String> env = new HashMap<>();
+
+ env.put("IGNITE_HOME", IgniteUtils.getIgniteHome());
+
+ try {
+ proc = GridJavaProcess.exec(
+ cmd,
+ env,
+ log,
+ new CI1<String>() {
+ @Override public void apply(String s) {
+ info("Node js: " + s);
+
+ if (s.contains("OK: "))
+ readyLatch.countDown();
+
+ if (s.contains("Error") || s.contains("FAILURES")) {
+ errors.add("Script failed: " + s);
+
+ readyLatch.countDown();
+ }
+ }
+ },
+ null
+ );
+
+ assertTrue(readyLatch.await(60, SECONDS));
+
+ assertEquals(errors.toString(), 0, errors.size());
+
+ proc.getProcess().waitFor();
+ }
+ finally {
+ if (proc != null)
+ proc.killProcess();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82da81d2/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
index 36c3289..82c29eb 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
@@ -17,73 +17,24 @@
package org.apache.ignite.internal;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-
/**
* Test node js client.
*/
public class NodeJsSelfTest extends NodeJsAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGrid(0);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
public void testPutGetJs() throws Exception {
- startGrid(0);
-
- final CountDownLatch readyLatch = new CountDownLatch(1);
-
- GridJavaProcess proc = null;
-
- final List<String> errors = new ArrayList<>();
-
- List<String> cmd = new ArrayList<>();
-
- cmd.add("C:\\Program Files\\nodejs\\node_modules\\.bin\\nodeunit.cmd");
-
- cmd.add(getNodeJsTestDir() + "test.js");
-
- Map<String, String> env = new HashMap<>();
-
- env.put("IGNITE_HOME", IgniteUtils.getIgniteHome());
- try {
- proc = GridJavaProcess.exec(
- cmd,
- env,
- log,
- new CI1<String>() {
- @Override
- public void apply(String s) {
- info("Node js: " + s);
-
- if (s.contains("OK: "))
- readyLatch.countDown();
-
- if (s.contains("Error") || s.contains("FAILURES")) {
- errors.add("Script failed: " + s);
-
- readyLatch.countDown();
- }
- }
- },
- null
- );
-
- assertTrue(readyLatch.await(60, SECONDS));
-
- assertEquals(errors.toString(), 0, errors.size());
-
- proc.getProcess().waitFor();
- }
- finally {
- stopAllGrids();
-
- if (proc != null)
- proc.killProcess();
- }
+ runJsScript(getNodeJsTestDir() + "test.js");
}
}