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

pontusmelke · pontusmelke · commit 013376439221 · 2016-04-05T12:05:47.000+02:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -204,8 +204,8 @@ gulp.task('download-tck', function() {
 gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
     return gulp.src(featureHome + "/*").pipe(cucumber({
         'steps': 'test/v1/tck/steps/*.js',
-        'format': 'summary',
-        'tags' : ['~@in_dev', '~@db']
+        'format': 'pretty',
+        'tags' : ['~@in_dev', '~@db', '~@equality']
     }));
 });
 
diff --git a/src/v1/driver.js b/src/v1/driver.js
@@ -53,7 +53,8 @@ class Driver {
     this._pool = new Pool(
       this._createConnection.bind(this),
       this._destroyConnection.bind(this),
-      this._validateConnection.bind(this)
+      this._validateConnection.bind(this),
+      config.connectionPoolSize
     );
   }
 
diff --git a/src/v1/internal/buf.js b/src/v1/internal/buf.js
@@ -199,6 +199,13 @@ class BaseBuffer
     return this.getUInt16( this._updatePos(2) );
   }
 
+  /**
+   * Read from state position.
+   */
+  readUInt32 () {
+    return this.getUInt32( this._updatePos(4) );
+  }
+
   /**
    * Read from state position.
    */
diff --git a/src/v1/internal/ch-node.js b/src/v1/internal/ch-node.js
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 import net from 'net';
 import tls from 'tls';
 import fs from 'fs';
@@ -210,7 +210,7 @@ class NodeChannel {
       this.onerror(err);
     }
   }
-  
+
   /**
    * Write the passed in buffer to connection
    * @param {NodeBuffer} buffer - Buffer to write
diff --git a/src/v1/internal/connector.js b/src/v1/internal/connector.js
@@ -42,7 +42,7 @@ else {
 let
 // Signature bytes for each message type
 INIT = 0x01,            // 0000 0001 // INIT <user_agent>
-ACK_FAILURE = 0x0D,     // 0000 1101 // ACK_FAILURE
+ACK_FAILURE = 0x0E,     // 0000 1110 // ACK_FAILURE
 RESET = 0x0F,           // 0000 1111 // RESET
 RUN = 0x10,             // 0001 0000 // RUN <statement> <parameters>
 DISCARD_ALL = 0x2F,     // 0010 1111 // DISCARD *
diff --git a/src/v1/internal/stream-observer.js b/src/v1/internal/stream-observer.js
@@ -39,6 +39,7 @@ class StreamObserver {
     this._queuedRecords = [];
     this._tail = null;
     this._error = null;
+    this._hasFailed = false;
   }
 
   /**
@@ -87,6 +88,10 @@ class StreamObserver {
    * @param {Object} error - An error object
    */
   onError(error) {
+    if(this._hasFailed) {
+      return;
+    }
+    this._hasFailed = true;
     if( this._observer ) {
       if( this._observer.onError ) {
         this._observer.onError( error );
diff --git a/src/v1/session.js b/src/v1/session.js
@@ -87,7 +87,15 @@ class Session {
    * @return
    */
   close(cb=(()=>null)) {
-    this._onClose(cb);
+    if(this._onClose) {
+      try {
+        this._onClose(cb);
+      } finally {
+        this._onClose = null;
+      }
+    } else {
+      cb();
+    }
   }
 }
 
diff --git a/test/internal/packstream.test.js b/test/internal/packstream.test.js
@@ -47,6 +47,8 @@ describe('packstream', function() {
   it('should pack strings', function() {
     expect( packAndUnpack( "" ) ).toBe( "" );
     expect( packAndUnpack( "abcdefg123567" ) ).toBe( "abcdefg123567" );
+    var str = Array(65536 + 1).join('a'); // 2 ^ 16 + 1
+    expect( packAndUnpack(str, str.length + 8)).toBe(str);
   });
   it('should pack structures', function() {
     expect( packAndUnpack( new Structure(1, ["Hello, world!!!"] ) ).fields[0] )  
diff --git a/test/v1/session.test.js b/test/v1/session.test.js
@@ -19,6 +19,7 @@
 
 var neo4j = require("../../lib/v1");
 var StatementType = require("../../lib/v1/result-summary").statementType;
+var Session = require("../../lib/v1/session");
 
 describe('session', function() {
 
@@ -35,6 +36,18 @@ describe('session', function() {
     driver.close();
   });
 
+  it('close should be idempotent ', function(){
+    // Given
+    var counter = 0;
+    var _session = new Session(null, function(){
+      counter++;
+    });
+    _session.close();
+    expect(counter).toBe(1);
+    _session.close();
+    expect(counter).toBe(1);
+  })
+
   it('should expose basic run/subscribe ', function(done) {
     // Given
 
diff --git a/test/v1/tck/steps/environment.js b/test/v1/tck/steps/environment.js
@@ -19,6 +19,10 @@ module.exports = function () {
     callback();
   });
 
+  this.Before("@equality_test", function( scenario ) {
+    this.savedValues = {}
+  });
+
   this.After(function (scenario, callback) {
     if (!scenario.isSuccessful()) {
       failedScenarios.push(scenario)
diff --git a/test/v1/tck/steps/matchacceptencesteps.js b/test/v1/tck/steps/matchacceptencesteps.js
@@ -3,15 +3,15 @@ var util = require("./util")
 
 module.exports = function () {
 
-  this.Given(/^init:(.*)$/, function (statement) {
+  this.Given(/^init: (.*)$/, function (statement) {
     return this.session.run(statement);
   });
 
-  this.When(/^running:(.*)$/, function (statement) {
+  this.When(/^running: (.*)$/, function (statement) {
       this.rc = this.session.run(statement);
   });
 
-  this.When(/^running parametrized:(.*)$/, function (statement, table) {
+  this.When(/^running parametrized: (.*)$/, function (statement, table) {
     var param = util.literalTableToTestObject(table.hashes())[0];
     this.rc = this.session.run(statement, param);
   });
diff --git a/test/v1/tck/steps/resultapisteps.js b/test/v1/tck/steps/resultapisteps.js
@@ -0,0 +1,219 @@
+var neo4j = require("../../../../lib/v1");
+var resultSummary = require("../../../../lib/v1/result-summary");
+var util = require("./util")
+
+module.exports = function () {
+
+  this.When(/^the `Statement Result` is consumed a `Result Summary` is returned$/, function (callback) {
+    self = this;
+    this.rc.then(function(res) {
+      self.summary = res.summary;
+      callback();
+    }).catch(function(err) {callback(new Error("Rejected Promise: " + err))});
+  });
+
+  this.Then(/^the `Statement Result` is closed$/, function () {
+    //No result cursor in JavaScript Driver
+  });
+
+  this.When(/^I request a `Statement` from the `Result Summary`$/, function () {
+    this.statement = this.summary.statement
+  });
+
+  this.Then(/^requesting the `Statement` as text should give: (.*)$/, function (statementText) {
+    if (this.statement.text != statementText) {
+      throw Error("'" + this.statement.text + "' does not match expected text: '" + statementText + "'")
+    }
+  });
+
+  this.Then(/^requesting the `Statement` parameter should give: (.*)$/, function (statementParam) {
+    var param = util.literalValueToTestValue(statementParam);
+    if (typeof this.statement.parameters === 'undefined') {
+      this.statement.parameters = {}
+    }
+    if (!util.compareValues(this.statement.parameters, param)) {
+        throw Error("Params does not match! Got: " + this.statement.parameters + " Expected: " + param);
+    }
+  });
+
+  this.Then(/^requesting `Counters` from `Result Summary` should give$/, function (table) {
+    var updateStatistics = this.summary.updateStatistics
+    for ( var i = 0 ; i < table.hashes().length; i++) {
+      var statistic = table.hashes()[i].counter;
+      var expected = util.literalValueToTestValueNormalIntegers(table.hashes()[i].result);
+      var given = getStatistic(statistic, updateStatistics)
+      if (!util.compareValues(given, expected)) {
+        throw Error("Statistics for: " + statistic + " does not match. Expected: '" + expected + "' Given: '" + given + "'");
+      }
+    }
+  });
+
+  this.Then(/^requesting the `Statement Type` should give (.*)$/, function (type) {
+    var type = getStatementTypeFromString(type);
+    if (this.summary.statementType != type)
+    {
+      throw Error("statementType does not match. Expected: '" + type + "' Given: '" + this.summary.statementType + "'");
+    }
+  });
+
+  this.Then(/^the `Result Summary` has a `Plan`$/, function () {
+    if(! this.summary.hasPlan()) {
+      throw Error("Expected summary to have a `plan`. It did not...");
+    }
+  });
+
+  this.Then(/^the `Result Summary` does not have a `Plan`$/, function () {
+    if(this.summary.hasPlan()) {
+      throw Error("Expected summary to NOT have a `plan`. It did not...");
+    }
+  });
+
+  this.Then(/^the `Result Summary` has a `Profile`$/, function () {
+    if(! this.summary.hasProfile()) {
+      throw Error("Expected summary to have a `profile plan`. It did not...");
+    }
+  });
+
+  this.Then(/^the `Result Summary` does not have a `Profile`$/, function () {
+    if( this.summary.hasProfile()) {
+      throw Error("Expected summary to NOT have a `profile plan`. It did...");
+    }
+  });
+
+  this.Then(/^requesting the `Plan` it contains$/, function (table) {
+    checkPlanExact(table, this.summary.plan)
+  });
+
+  this.Then(/^the `Plan` also contains method calls for:$/, function (table) {
+    checkPlan(table, this.summary.plan)
+  });
+
+  this.Then(/^requesting the `Profile` it contains:$/, function (table) {
+    checkPlanExact(table, this.summary.profile)
+});
+
+this.Then(/^the `Profile` also contains method calls for:$/, function (table) {
+  checkPlan(table, this.summary.profile)
+});
+
+this.Then(/^the `Result Summary` `Notifications` is empty$/, function () {
+  if (! this.summary.notifications.length == 0) {
+    throw Error("Expected no notifications. Got: " + this.summary.notifications.length)
+  }
+});
+
+this.Then(/^the `Result Summary` `Notifications` has one notification with$/, function (table) {
+
+  var expected = {};
+  if (this.summary.notifications.length > 1) {
+    throw Error("Expected only one notification. Got: " + this.summary.notifications.length)
+  }
+  var givenNotification = this.summary.notifications[0];
+  var given = {}
+  for ( var i = 0 ; i < table.hashes().length; i++) {
+    var key = table.hashes()[i]['key']
+    expected[key] = util.literalValueToTestValueNormalIntegers(table.hashes()[i]['value']);
+    given[key] = givenNotification[key]
+  }
+  if (Object.keys(givenNotification).length !== Object.keys(given).length) {
+    throw Error("Keys do not match with expected. Got: " + Object.keys(givenNotification) + " Expected: " + Object.keys(given))
+  }
+  if (!util.compareValues(expected, given)) {
+    throw Error("Summary notifications does not match. Expected: '" + util.printable(expected) + "' Given: '" + util.printable(givenNotification) + "'");
+  }
+});
+
+  function checkPlanExact(table, plan)
+  {
+    for ( var i = 0 ; i < table.hashes().length; i++) {
+      var dataKey = getPlanParam(table.hashes()[i]["plan method"])
+      var given = plan[dataKey];
+      if (given === undefined || given === null || given === NaN) {
+        throw Error("Plans `" + dataKey + "` has no content! Got: " + given);
+      }
+    }
+  }
+
+  function checkPlan(table, plan)
+  {
+    for ( var i = 0 ; i < table.hashes().length; i++) {
+      var dataKey = getPlanParam(table.hashes()[i]["plan method"])
+      var given = plan[dataKey];
+      if (given === undefined || given === null || given === NaN) {
+        throw Error("Plans `" + dataKey + "` has no content! Got: " + given);
+      }
+    }
+  }
+
+  function getPlanParam(key) {
+    if (key == 'operator type') {
+      return 'operatorType'
+    }
+    if (key == 'db hits') {
+      return 'dbHits'
+    }
+    if (key == 'records') {
+      return 'rows'
+    }
+    else {
+      return key
+    }
+  }
+
+  function getStatementTypeFromString(type) {
+    if (type == 'read write') {
+      return resultSummary.statementType.READ_WRITE;
+    }
+    if (type == 'read only') {
+      return resultSummary.statementType.READ_ONLY;
+    }
+    if (type == 'write only') {
+      return resultSummary.statementType.WRITE_ONLY;
+    }
+    if (type == 'schema write') {
+      return resultSummary.statementType.SCHEMA_WRITE;
+    }
+    throw Error("No statement type mapping of: " + type)
+  }
+
+  function getStatistic(statementString, updateStatistics) {
+    if (statementString == 'nodes created') {
+      return updateStatistics.nodesCreated();
+    }
+    if (statementString == 'nodes deleted') {
+      return updateStatistics.nodesDeleted();
+    }
+    if (statementString == 'relationships created') {
+      return updateStatistics.relationshipsCreated();
+    }
+    if (statementString == 'relationships deleted') {
+      return updateStatistics.relationshipsDeleted();
+    }
+    if (statementString == 'properties set') {
+      return updateStatistics.propertiesSet();
+    }
+    if (statementString == 'labels added') {
+      return updateStatistics.labelsAdded();
+    }
+    if (statementString == 'labels removed') {
+      return updateStatistics.labelsRemoved();
+    }
+    if (statementString == 'indexes added') {
+      return updateStatistics.indexesAdded();
+    }
+    if (statementString == 'indexes removed') {
+      return updateStatistics.indexesRemoved();
+    }
+    if (statementString == 'constraints added') {
+      return updateStatistics.constraintsAdded();
+    }
+    if (statementString == 'constraints removed') {
+      return updateStatistics.constraintsRemoved();
+    }
+    if (statementString == 'contains updates') {
+      return updateStatistics.containsUpdates();
+    }
+    throw Error("No statistics mapping of: " + statementString)
+  }
+
+}
diff --git a/test/v1/tck/steps/util.js b/test/v1/tck/steps/util.js

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ class Driver {`
`53`	`53`	`this._pool = new Pool(`
`54`	`54`	`this._createConnection.bind(this),`
`55`	`55`	`this._destroyConnection.bind(this),`
`56`		`- this._validateConnection.bind(this)`
	`56`	`+ this._validateConnection.bind(this),`
	`57`	`+ config.connectionPoolSize`
`57`	`58`	`);`
`58`	`59`	`}`
`59`	`60`