Repository: incubator-ignite Updated Branches: refs/heads/ignite-nodejs bfa16e5ce -> d38383338
#nodejs: Do not pollute global scope with test functions Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3838333 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3838333 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3838333 Branch: refs/heads/ignite-nodejs Commit: d3838333823e13367f74207fd1efcc4b3e772300 Parents: bfa16e5 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Sun Jun 7 23:42:47 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Sun Jun 7 23:42:47 2015 +0300 ---------------------------------------------------------------------- modules/nodejs/src/test/nodejs/test_ignition.js | 4 ++-- modules/nodejs/src/test/nodejs/test_utils.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3838333/modules/nodejs/src/test/nodejs/test_ignition.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/nodejs/test_ignition.js b/modules/nodejs/src/test/nodejs/test_ignition.js index db9f9f5..805bfd7 100644 --- a/modules/nodejs/src/test/nodejs/test_ignition.js +++ b/modules/nodejs/src/test/nodejs/test_ignition.js @@ -1,7 +1,7 @@ var TestUtils = require("./test_utils").TestUtils; var Ignition = require(TestUtils.scriptPath() + "ignition").Ignition; -test_ignition_fail = function () { +exports.test_ignition_fail = function () { Ignition.start(['127.0.0.3:9091', '127.0.0.1:9092'], onConnect); function onConnect(error, server) { @@ -18,7 +18,7 @@ test_ignition_fail = function () { } } -ignition_start_success = function() { +exports.ignition_start_success = function() { Ignition.start(['127.0.0.0:9090', '127.0.0.1:9090'], onConnect); function onConnect(error, server) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3838333/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 20dc504..a910201 100644 --- a/modules/nodejs/src/test/nodejs/test_utils.js +++ b/modules/nodejs/src/test/nodejs/test_utils.js @@ -111,13 +111,14 @@ TestUtils.testDone = function() { */ TestUtils.runTest = function() { var fileName = process.argv[2].toString().trim(); - require("./" + fileName); + var tests = require("./" + fileName); + console.log("test file " + fileName + " scope " + tests) var functionName = process.argv[3].toString().trim(); - if (!global[functionName]) { + if (!tests[functionName]) { console.log("node js test failed: function with name " + functionName + " not found"); return; } - global[functionName](); + tests[functionName](); } exports.TestUtils = TestUtils;
