ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [8/9] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/nodejs' into ignite-nodejs
Date Mon, 08 Jun 2015 10:12:26 GMT
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 <ivasilinets@gridgain.com>
Authored: Mon Jun 8 13:01:43 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
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();


Mime
View raw message