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 2517817FAB for ; Mon, 8 Jun 2015 10:12:45 +0000 (UTC) Received: (qmail 10926 invoked by uid 500); 8 Jun 2015 10:12:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 10895 invoked by uid 500); 8 Jun 2015 10:12: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 10846 invoked by uid 99); 8 Jun 2015 10:12:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 10:12:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 08 Jun 2015 10:10:32 +0000 Received: (qmail 10350 invoked by uid 99); 8 Jun 2015 10:12:19 -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; Mon, 08 Jun 2015 10:12:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 936A4DFF8E; Mon, 8 Jun 2015 10:12:19 +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: Mon, 08 Jun 2015 10:12:26 -0000 Message-Id: <6ef8f61beea94337b0228a48ec4e6954@git.apache.org> In-Reply-To: <45db4b432fcb4b64bc4416fbc57e611c@git.apache.org> References: <45db4b432fcb4b64bc4416fbc57e611c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/nodejs' into ignite-nodejs X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/nodejs' into ignite-nodejs Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92d677cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92d677cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92d677cf Branch: refs/heads/ignite-nodejs Commit: 92d677cf3fa21ea40e96e3aa838cf8e7254962f9 Parents: 2c7426b 0e197f2 Author: ivasilinets Authored: Mon Jun 8 13:01:43 2015 +0300 Committer: ivasilinets Committed: Mon Jun 8 13:01:43 2015 +0300 ---------------------------------------------------------------------- modules/nodejs/src/main/js/cache.js | 17 +++++++ modules/nodejs/src/main/js/ignition.js | 17 +++++++ modules/nodejs/src/main/js/server.js | 17 +++++++ .../ignite/internal/NodeJsAbstractTest.java | 4 +- .../ignite/internal/NodeJsIgnitionSelfTest.java | 52 ++++++++++++++++++++ .../ignite/internal/NodeJsPutGetSelfTest.java | 45 +++++++++++++++++ .../apache/ignite/internal/NodeJsSelfTest.java | 52 -------------------- .../testsuites/IgniteNodeJsTestSuite.java | 3 +- modules/nodejs/src/test/js/rest-jetty.xml | 20 +++++++- modules/nodejs/src/test/js/test.js | 45 +++++++++++------ modules/nodejs/src/test/js/test_put_get.js | 50 +++++++++++++++++++ modules/nodejs/src/test/js/test_utils.js | 21 +++++++- 12 files changed, 271 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92d677cf/modules/nodejs/src/main/js/ignition.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92d677cf/modules/nodejs/src/main/js/server.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92d677cf/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92d677cf/modules/nodejs/src/test/js/rest-jetty.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92d677cf/modules/nodejs/src/test/js/test_utils.js ---------------------------------------------------------------------- diff --cc modules/nodejs/src/test/js/test_utils.js index dca6603,a37c0ed..9534ce6 --- a/modules/nodejs/src/test/js/test_utils.js +++ b/modules/nodejs/src/test/js/test_utils.js @@@ -106,4 -123,20 +123,4 @@@ TestUtils.testDone = function() console.log("Node JS test finished.") } - exports.TestUtils = TestUtils; -/** - * Test routine. - */ -TestUtils.runTest = function() { - var fileName = process.argv[2].toString().trim(); - require("./" + fileName); - var functionName = process.argv[3].toString().trim(); - if (!global[functionName]) { - console.log("node js test failed: function with name " + functionName + " not found"); - return; - } - global[functionName](); -} - + exports.TestUtils = TestUtils; - -TestUtils.runTest();