Merge pull request neo4j#58 from neo4j/1.0-tck

1.0 tck

Author: pontusmelke

gulpfile.js

@@ -216,7 +216,7 @@ gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
     return gulp.src(featureHome + "/*").pipe(cucumber({
         'steps': 'test/v1/tck/steps/*.js',
         'format': 'pretty',
-        'tags' : ['~@in_dev', '~@db', '~@equality', '~@streaming_and_cursor_navigation']
+        'tags' : ['~@fixed_session_pool', '~@db', '~@equality', '~@streaming_and_cursor_navigation', '~@tls']
     }));
 });
 

src/v1/session.js

@@ -20,6 +20,7 @@
 import StreamObserver from './internal/stream-observer';
 import Result from './result';
 import Transaction from './transaction';
+import {newError} from "./error";
 
 /**
   * A Session instance is used for handling the connection and
@@ -58,8 +59,9 @@ class Session {
       this._conn.pullAll(streamObserver);
       this._conn.sync();
     } else {
-      streamObserver.onError({error: "Please close the currently open transaction object before running " +
-        "more statements/transactions in the current session." });
+      streamObserver.onError(newError("Statements cannot be run directly on a "
+       + "session with an open transaction; either run from within the "
+       + "transaction or use a different session."));
     }
     return new Result( streamObserver, statement, parameters );
   }
@@ -74,7 +76,9 @@ class Session {
    */
   beginTransaction() {
     if (this._hasTx) {
-      throw new newError("Cannot have multiple transactions open for the session. Use multiple sessions or close the transaction before opening a new one.")
+      throw new newError("You cannot begin a transaction on a session with an "
+      + "open transaction; either run from within the transaction or use a "
+      + "different session.")
     }
 
     this._hasTx = true;

test/v1/session.test.js

@@ -234,8 +234,9 @@ describe('session', function() {
     //Then
     session.run("RETURN 42")
       .catch(function (error) {
-        expect(error.error).toBe("Please close the currently open transaction object before running " +
-          "more statements/transactions in the current session." );
+        expect(error.message).toBe("Statements cannot be run directly on a "
+         + "session with an open transaction; either run from within the "
+         + "transaction or use a different session." );
         done();
       })
   });

test/v1/tck/steps/authsteps.js

@@ -59,7 +59,7 @@ module.exports = function () {
     var expectedStartOfMessage = 'The client is unauthorized due to authentication failure.'
     var expectedCode = 'Neo.ClientError.Security.Unauthorized'
 
-    if (! message.startsWith(expectedStartOfMessage)) {
+    if (message.indexOf(expectedStartOfMessage) != 0) {
       throw new Error("Wrong error messsage. Expected: '" + expectedStartOfMessage + "'. Got: '" + message + "'");
     }
 

test/v1/tck/steps/erroreportingsteps.js

@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var neo4j = require("../../../../lib/v1");
+var util = require("./util");
+
+module.exports = function () {
+
+  this.Given(/^I have a driver$/, function () {
+  });
+
+  this.When(/^I start a `Transaction` through a session$/, function () {
+    this.transaction = this.session.beginTransaction()
+  });
+
+  this.When(/^`run` a query with that same session without closing the transaction first$/, function (callback) {
+    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];
+    if (this.error === undefined) {
+      throw new Error("Exepcted an error but got none.")
+    }
+    if (this.error.message.indexOf(expected) != 0) {
+      if (!(expected == "Unsupported URI scheme:" || expected == "Unable to connect to" ))
+      {
+        throw new Error("Error messages do not match. Given: '" + this.error.message + "'. Expected: '" + expected + "'");
+      }
+    }
+  });
+
+  this.When(/^I start a new `Transaction` with the same session before closing the previous$/, function () {
+    try {
+      this.session.beginTransaction();
+    } catch (e) {
+      this.error = e;
+    }
+
+  });
+
+  this.When(/^I run a non valid cypher statement$/, function (callback) {
+    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();
+    driver.onError = function (error) { self.error = error; callback()};
+  });
+
+  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"));
+    driver.session();
+    driver.onError = function (error) { self.error = error; callback()};
+  });
+
+}

test/v1/tck/steps/util.js

@@ -281,6 +281,9 @@ function getLiteralArray(result) {
 }
 
 function compareValues(given, expected) {
+  if(given === undefined || expected === undefined) {
+    throw new Error("Got undefined");
+  }
   if (neo4j.isInt(given)) {
     if (given.equals(expected)) {
       return true;
@@ -357,14 +360,15 @@ function restart(callback) {
     startDatabase();
     setTimeout(function () {
       callback();}, 5000);
-  }, 500);
+  }, 5000);
 }
 
 function startDatabase() {
   if(isWin) {
     return runPowershell(neo4jHome + '/bin/neo4j.bat install-service;' + neo4jHome + '/bin/neo4j.bat start');
   } else {
-    childProcess.execSync(neo4jHome + '/bin/neo4j start', function (err, stdout, stderr) {
+    childProcess.exec(neo4jHome + '/bin/neo4j start', function (err, stdout, stderr) {
+      console.log("starting");
       if (err) throw err;
     });
   }
@@ -374,7 +378,8 @@ function stopDatabase() {
   if(isWin) {
     runPowershell(neo4jHome + '/bin/neo4j.bat stop;' + neo4jHome + '/bin/neo4j.bat uninstall-service');
   } else {
-    childProcess.execSync(neo4jHome + '/bin/neo4j stop', function (err, stdout, stderr) {
+    childProcess.exec(neo4jHome + '/bin/neo4j stop', function (err, stdout, stderr) {
+      console.log("stopping");
       if (err) throw err;
     });
   }