Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

src/v1/internal/connector.js

@@ -59,7 +59,8 @@ RELATIONSHIP = 0x52,
 UNBOUND_RELATIONSHIP = 0x72,
 PATH = 0x50,
 //sent before version negotiation
-MAGIC_PREAMBLE = 0x6060B017;
+MAGIC_PREAMBLE = 0x6060B017,
+DEBUG = false;
 
 let URLREGEX = new RegExp([
   "[^/]+//",          // scheme
@@ -71,6 +72,20 @@ function host( url ) {
   return url.match( URLREGEX )[2];
 }
 
+/**
+ * Very rudimentary log handling, should probably be replaced by something proper at some point.
+ * @param actor the part that sent the message, 'S' for server and 'C' for client
+ * @param msg the bolt message
+ */
+function log(actor, msg) {
+  if (DEBUG) {
+    for(var i = 2; i < arguments.length; i++) {
+      msg += " " + JSON.stringify(arguments[i]);
+    }
+    console.log(actor + ":" + msg);
+  }
+}
+
 function port( url ) {
   return url.match( URLREGEX )[3];
 }
@@ -187,8 +202,6 @@ class Connection {
     this._unpacker.structMappers[UNBOUND_RELATIONSHIP] = _mappers.unboundRel;
     this._unpacker.structMappers[PATH] = _mappers.path;
 
-
-
     let self = this;
     // TODO: Using `onmessage` and `onerror` came from the WebSocket API,
     // it reads poorly and has several annoying drawbacks. Swap to having
@@ -267,16 +280,19 @@ class Connection {
   _handleMessage( msg ) {
     switch( msg.signature ) {
       case RECORD:
+        log("S", "RECORD", msg.fields[0]);
         this._currentObserver.onNext( msg.fields[0] );
         break;
       case SUCCESS:
+        log("S", "SUCCESS", msg.fields[0]);
         try {
           this._currentObserver.onCompleted( msg.fields[0] );
         } finally {
           this._currentObserver = this._pendingObservers.shift();
         }
         break;
       case FAILURE:
+        log("S", "FAILURE", msg);
         try {
           this._currentObserver.onError( msg );
           this._errorMsg = msg;
@@ -304,6 +320,7 @@ class Connection {
         }
         break;
       case IGNORED:
+        log("S", "IGNORED");
         try {
           if (this._errorMsg && this._currentObserver.onError)
             this._currentObserver.onError(this._errorMsg);
@@ -320,6 +337,7 @@ class Connection {
 
   /** Queue an INIT-message to be sent to the database */
   initialize( clientName, token, observer ) {
+    log("C", "INIT", clientName, token);
     this._queueObserver(observer);
     this._packer.packStruct( INIT, [this._packable(clientName), this._packable(token)],
       (err) => this._handleFatalError(err) );
@@ -329,6 +347,7 @@ class Connection {
 
   /** Queue a RUN-message to be sent to the database */
   run( statement, params, observer ) {
+    log("C", "RUN", statement, params);
     this._queueObserver(observer);
     this._packer.packStruct( RUN, [this._packable(statement), this._packable(params)],
       (err) => this._handleFatalError(err)  );
@@ -337,20 +356,23 @@ class Connection {
 
   /** Queue a PULL_ALL-message to be sent to the database */
   pullAll( observer ) {
+    log("C", "PULL_ALL");
     this._queueObserver(observer);
     this._packer.packStruct( PULL_ALL, [], (err) => this._handleFatalError(err) );
     this._chunker.messageBoundary();
   }
 
   /** Queue a DISCARD_ALL-message to be sent to the database */
   discardAll( observer ) {
+    log("C", "DISCARD_ALL");
     this._queueObserver(observer);
     this._packer.packStruct( DISCARD_ALL, [], (err) => this._handleFatalError(err) );
     this._chunker.messageBoundary();
   }
 
   /** Queue a RESET-message to be sent to the database */
   reset( observer ) {
+    log("C", "RESET");
     this._isHandlingFailure = true;
     let self = this;
     let wrappedObs = {
@@ -370,6 +392,7 @@ class Connection {
 
   /** Queue a ACK_FAILURE-message to be sent to the database */
   _ackFailure( observer ) {
+    log("C", "ACK_FAILURE");
     this._queueObserver(observer);
     this._packer.packStruct( ACK_FAILURE, [], (err) => this._handleFatalError(err) );
     this._chunker.messageBoundary();

test/internal/tls.test.js

@@ -26,10 +26,10 @@ var isLocalHost = require("../../lib/v1/internal/util").isLocalHost;
 describe('trust-signed-certificates', function() {
 
   var driver;
-  var log = console.log
+  var log = console.log;
   beforeEach(function() {
     console.log = function () {}; // To mute deprecation message in test output
-  })
+  });
   it('should reject unknown certificates', function(done) {
     // Assuming we only run this test on NodeJS
     if( !NodeChannel.available ) {

test/v1/session.test.js

@@ -23,19 +23,22 @@ var Session = require("../../lib/v1/session");
 
 describe('session', function () {
 
-  var driver, session, server;
+  var driver, session, server, originalTimeout;
 
   beforeEach(function (done) {
     driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
     driver.onCompleted = function (meta) {
       server = meta['server'];
     };
     session = driver.session();
+    originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
     session.run("MATCH (n) DETACH DELETE n").then(done);
   });
 
   afterEach(function () {
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     driver.close();
   });
 
@@ -177,8 +180,8 @@ describe('session', function () {
     session.run(statement)
       .then(function (result) {
         var sum = result.summary;
-        expect(sum.resultAvailableAfter.toInt()).toBeGreaterThan(0);
-        expect(sum.resultConsumedAfter.toInt()).toBeGreaterThan(0);
+        expect(sum.resultAvailableAfter.toInt()).not.toBeLessThan(0);
+        expect(sum.resultConsumedAfter.toInt()).not.toBeLessThan(0);
         done();
       });
   });
@@ -313,8 +316,8 @@ describe('session', function () {
           .then(function (ignore) {
             done();
           });
-      }, 1000);
-    }, 1500);
+      }, 500);
+    }, 500);
   });
 
   it('should fail nicely on unpackable values ', function (done) {

test/v1/tck/steps/authsteps.js

@@ -26,28 +26,36 @@ module.exports = function () {
   var password = "password";
 
   this.Given(/^a driver is configured with auth enabled and correct password is provided$/, function () {
-    this.driver.close();
+    if (this.driver) {
+      this.driver.close();
+    }
     this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
   });
 
   this.Then(/^reading and writing to the database should be possible$/, function (callback) {
-    var session = this.driver.session()
+    var session = this.driver.session();
     session.run("CREATE (:label1)").then( function(  ) {
         callback();
     }).catch(function(err) {callback(new Error("Rejected Promise: " + err))});
   });
 
   this.Given(/^a driver is configured with auth enabled and the wrong password is provided$/, function () {
-    this.driver.close();
+    if (this.driver) {
+      this.driver.close();
+    }
     this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "wrong"));
+    this.driver.session();
   });
 
-  this.Then(/^reading and writing to the database should not be possible$/, function (callback) {
-   this.driver.onError = function(err) {
-     self.err = err;
-   };
-    var session = this.driver.session();
+  this.Then(/^reading and writing to the database should not be possible$/, {timeout:5000}, function (callback) {
+
     var self = this;
+    this.driver.onError = function (err) {
+      self.err = err;
+      callback();
+    };
+
+    var session = this.driver.session();
     session.run("CREATE (:label1)").then( function(  ) {
       callback(new Error("Should not be able to run session!"));
     }).catch( function(err) {

test/v1/tck/steps/environment.js

@@ -22,26 +22,34 @@ var fs = require("fs");
 
 module.exports = function () {
 
+  var driver = undefined;
+
   var failedScenarios = [];
 
+  this.registerHandler("BeforeFeatures", function(event, next) {
+    driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
+
+    return next()
+  });
+
   this.Before("@reset_database", function( scenario, callback ) {
-    this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
+    this.driver = driver;
     this.session = this.driver.session();
     this.session.run("MATCH (n) DETACH DELETE n").then( function( ) {
-        callback();
+      callback();
     });
-    callback();
   });
 
   this.Before("@tls", function( scenario ) {
+
     this.knownHosts1 = "known_hosts1";
     this.knownHosts2 = "known_hosts2";
     _deleteFile(this.knownHosts1);
     _deleteFile(this.knownHosts2);
   });
 
   this.Before("~@reset_database", "~@tls", function( scenario, callback ) {
-    this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
+    this.driver = driver;
     this.session = this.driver.session();
     callback();
   });
@@ -50,9 +58,9 @@ module.exports = function () {
     this.savedValues = {};
   });
 
-  this.After(function (scenario, callback) {
-    if (this.driver) {
-      this.driver.close();
+  this.After("~@error_reporting",function (scenario, callback) {
+    if (this.session) {
+      this.session.close();
     }
     if (!scenario.isSuccessful()) {
       failedScenarios.push(scenario)
@@ -64,6 +72,9 @@ module.exports = function () {
   });
 
   this.registerHandler('AfterFeatures', function (event, callback) {
+    if (driver) {
+      driver.close();
+    }
     if (failedScenarios.length) {
       for ( var i = 0; i < failedScenarios.length; i++) {
         console.log("FAILED! Scenario: " + failedScenarios[i].getName());

test/v1/tck/steps/erroreportingsteps.js

@@ -30,12 +30,12 @@ module.exports = function () {
   });
 
   this.When(/^`run` a query with that same session without closing the transaction first$/, function (callback) {
-    self = this;
+    var self = this;
     this.session.run("CREATE (:n)").then(function(result) {callback()}).catch(function(err) {self.error = err; callback()})
   });
 
   this.Then(/^it throws a `ClientException`$/, function (table) {
-    expected = table.rows()[0][0];
+    var expected = table.rows()[0][0];
     if (this.error === undefined) {
       throw new Error("Exepcted an error but got none.")
     }
@@ -57,22 +57,24 @@ module.exports = function () {
   });
 
   this.When(/^I run a non valid cypher statement$/, function (callback) {
-    self = this;
+    var self = this;
     this.session.run("CRETE (:n)").then(function(result) {callback()}).catch(function(err) {self.error = err.fields[0]; callback()})
   });
 
   this.When(/^I set up a driver to an incorrect port$/, function (callback) {
-    self = this;
-    driver = neo4j.driver("bolt://localhost:7777", neo4j.auth.basic("neo4j", "neo4j"));
-    driver.session();
+    var self = this;
+    var driver = neo4j.driver("bolt://localhost:7777", neo4j.auth.basic("neo4j", "neo4j"));
     driver.onError = function (error) { self.error = error; callback()};
+    driver.session();
+    setTimeout(callback, 1000);
   });
 
   this.When(/^I set up a driver with wrong scheme$/, function (callback) {
-    self = this;
-    driver = neo4j.driver("wrong://localhost:7474", neo4j.auth.basic("neo4j", "neo4j"));
+    var self = this;
+    var driver = neo4j.driver("wrong://localhost:7474", neo4j.auth.basic("neo4j", "neo4j"));
     driver.session();
     driver.onError = function (error) { self.error = error; callback()};
+    driver.close();
   });
 
-}
+};

test/v1/tck/steps/resultapisteps.js

@@ -235,4 +235,4 @@ this.Then(/^the `Result Summary` `Notifications` has one notification with$/, fu
     throw Error("No statistics mapping of: " + statementString)
   }
 
-}
+};

test/v1/tck/steps/tlssteps.js

@@ -51,7 +51,7 @@ module.exports = function () {
     callback();
   });
 
-  this.Then(/^creating sessions should fail$/, function (callback) {
+  this.Then(/^creating sessions should fail$/,  {timeout: CALLBACK_TIMEOUT}, function (callback) {
     var session = this.driver1.session();
     var self = this;
     session.run("RETURN 1")