Repository: incubator-ignite Updated Branches: refs/heads/ignite-nodejs bf7812e13 -> 2dbdf167d
#nodejs: debug Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2dbdf167 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2dbdf167 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2dbdf167 Branch: refs/heads/ignite-nodejs Commit: 2dbdf167dd3742e6fdeb7a086b5935d652280450 Parents: bf7812e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jun 8 00:25:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jun 8 00:25:57 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/NodeJsAbstractTest.java | 2 +- modules/nodejs/src/test/nodejs/test_runner.js | 35 ++++++++++++++++++++ modules/nodejs/src/test/nodejs/test_utils.js | 28 +--------------- 3 files changed, 37 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2dbdf167/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 1ca1bed..cfa18fa 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 @@ -119,7 +119,7 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest { cmd.add("node"); - cmd.add(getNodeJsTestDir() + "test_utils.js"); + cmd.add(getNodeJsTestDir() + "test_runner.js"); cmd.add(fileName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2dbdf167/modules/nodejs/src/test/nodejs/test_runner.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/nodejs/test_runner.js b/modules/nodejs/src/test/nodejs/test_runner.js new file mode 100644 index 0000000..7bb3cf4 --- /dev/null +++ b/modules/nodejs/src/test/nodejs/test_runner.js @@ -0,0 +1,35 @@ +/** + * Create instance of TestUtils + * + * @constructor + */ +function TestRunner() { +} + +/** + * Test routine. + */ +TestRunner.runTest = function() { + var fileName = process.argv[2].toString().trim(); + + console.log("FileName " + fileName); + + var Test = require(fileName); + + console.log("Test : " + Object.keys(Test)) + + Test = Test[Object.keys(Test)[0]]; + + console.log("Result test: " + Test); + + var functionName = process.argv[3].toString().trim(); + + if (!Test[functionName]) { + console.log("node js test failed: function with name " + functionName + " not found"); + return; + } + Test[functionName](); +} + + +TestRunner.runTest(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2dbdf167/modules/nodejs/src/test/nodejs/test_utils.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/nodejs/test_utils.js b/modules/nodejs/src/test/nodejs/test_utils.js index d7ec458..dca6603 100644 --- a/modules/nodejs/src/test/nodejs/test_utils.js +++ b/modules/nodejs/src/test/nodejs/test_utils.js @@ -106,30 +106,4 @@ TestUtils.testDone = function() { console.log("Node JS test finished.") } -/** - * Test routine. - */ -TestUtils.runTest = function() { - var fileName = process.argv[2].toString().trim(); - - console.log("FileName " + fileName); - - var Test = require(fileName); - - console.log("Test : " + Object.keys(Test)) - - Test = Test[Object.keys(Test)[0]]; - - console.log("Result test: " + Test); - var functionName = process.argv[3].toString().trim(); - - if (!Test[functionName]) { - console.log("node js test failed: function with name " + functionName + " not found"); - return; - } - Test[functionName](); -} - -exports.TestUtils = TestUtils; - -TestUtils.runTest(); \ No newline at end of file +exports.TestUtils = TestUtils; \ No newline at end of file
