Removing tck to normal unit tests

Author: Zhen Li

gulpfile.babel.js

@@ -36,7 +36,6 @@ var fs = require("fs-extra");
 var runSequence = require('run-sequence');
 var path = require('path');
 var minimist = require('minimist');
-var cucumber = require('gulp-cucumber');
 var install = require("gulp-install");
 var file = require('gulp-file');
 var semver = require('semver');
@@ -153,7 +152,7 @@ gulp.task('install-driver-into-sandbox', ['nodejs'], function(){
 });
 
 gulp.task('test', function (cb) {
-  runSequence('run-ts-declaration-tests', 'test-nodejs', 'test-browser', 'run-tck', function (err) {
+  runSequence('run-ts-declaration-tests', 'test-nodejs', 'test-browser', function (err) {
     if (err) {
       var exitCode = 2;
       console.log('[FAIL] test task failed - exiting with code ' + exitCode);
@@ -213,23 +212,6 @@ gulp.task('watch-n-test', ['test-nodejs'], function () {
   return gulp.watch(['src/**/*.js', "test/**/*.js"], ['test-nodejs'] );
 });
 
-var featureFiles   = 'https://s3-eu-west-1.amazonaws.com/remoting.neotechnology.com/driver-compliance/tck.tar.gz';
-var featureHome    = './build/tck';
-
-gulp.task('download-tck', function() {
-  return download(featureFiles)
-        .pipe(decompress({strip: 1}))
-        .pipe(gulp.dest(featureHome));
-});
-
-gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
-    return gulp.src(featureHome + "/*").pipe(cucumber({
-        'steps': 'test/v1/tck/steps/*.js',
-        'format': 'progress',
-        'tags' : ['~@fixed_session_pool', '~@db', '~@equality', '~@streaming_and_cursor_navigation']
-    })).on('end', logActiveNodeHandles);
-});
-
 /** Set the project version, controls package.json and version.js */
 gulp.task('set', function() {
   // Get the --version arg from command line

package.json

@@ -14,7 +14,6 @@
     "start-neo4j": "gulp start-neo4j",
     "stop-neo4j": "gulp stop-neo4j",
     "run-stress-tests": "gulp run-stress-tests",
-    "run-tck": "gulp run-tck",
     "run-ts-declaration-tests": "gulp run-ts-declaration-tests",
     "docs": "esdoc -c esdoc.json",
     "versionRelease": "gulp set --version $VERSION && npm version $VERSION --no-git-tag-version",

test/v1/session.test.js

@@ -234,10 +234,6 @@ describe('session', () => {
   });
 
   it('should expose server info on successful query', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
-
     // Given
     const statement = 'RETURN 1';
 
@@ -252,11 +248,7 @@ describe('session', () => {
       });
   });
 
-  it('should expose execution time information when using 3.1 and onwards', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
-
+  it('should expose execution time information', done => {
     // Given
     const statement = 'UNWIND range(1,10000) AS n RETURN n AS number';
     // When & Then
@@ -359,7 +351,8 @@ describe('session', () => {
     session.beginTransaction();
 
     // Then
-    expect(session.beginTransaction).toThrow();
+    expect(session.beginTransaction).toThrowError(
+      /You cannot begin a transaction on a session with an open transaction/);
   });
 
   it('should return lots of data', done => {
@@ -579,9 +572,6 @@ describe('session', () => {
   });
 
   it('should update last bookmark after every read tx commit', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
 
     // new session without initial bookmark
     session = driver.session();
@@ -601,9 +591,6 @@ describe('session', () => {
   });
 
   it('should update last bookmark after every write tx commit', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
 
     const bookmarkBefore = session.lastBookmark();
 
@@ -621,9 +608,6 @@ describe('session', () => {
   });
 
   it('should not lose last bookmark after run', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
 
     const tx = session.beginTransaction();
     tx.run('CREATE ()').then(() => {
@@ -640,10 +624,6 @@ describe('session', () => {
   });
 
   it('should commit read transaction', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
-
     // new session without initial bookmark
     session = driver.session();
     expect(session.lastBookmark()).toBeNull();
@@ -659,10 +639,6 @@ describe('session', () => {
   });
 
   it('should commit write transaction', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
-
     const bookmarkBefore = session.lastBookmark();
     const resultPromise = session.writeTransaction(tx => tx.run('CREATE (n:Node {id: 42}) RETURN n.id AS answer'));
 
@@ -683,10 +659,6 @@ describe('session', () => {
   });
 
   it('should not commit already committed read transaction', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
-
     const resultPromise = session.readTransaction(tx => {
       return new Promise((resolve, reject) => {
         tx.run('RETURN 42 AS answer').then(result => {
@@ -712,10 +684,6 @@ describe('session', () => {
   });
 
   it('should not commit already committed write transaction', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
-
     const resultPromise = session.readTransaction(tx => {
       return new Promise((resolve, reject) => {
         tx.run('CREATE (n:Node {id: 42}) RETURN n.id AS answer').then(result => {
@@ -745,9 +713,6 @@ describe('session', () => {
   });
 
   it('should not commit rolled back read transaction', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
 
     const bookmarkBefore = session.lastBookmark();
     const resultPromise = session.readTransaction(tx => {
@@ -770,9 +735,6 @@ describe('session', () => {
   });
 
   it('should not commit rolled back write transaction', done => {
-    if (!serverIs31OrLater(done)) {
-      return;
-    }
 
     const bookmarkBefore = session.lastBookmark();
     const resultPromise = session.readTransaction(tx => {
@@ -799,10 +761,6 @@ describe('session', () => {
   });
 
   it('should interrupt query waiting on a lock when closed', done => {
-    if (!serverIs31OrLater(done)) {
-      // locks are transaction termination aware by default only in 3.1+
-      return;
-    }
 
     session.run('CREATE ()').then(() => {
       session.close(() => {
@@ -836,10 +794,6 @@ describe('session', () => {
   });
 
   it('should interrupt transaction waiting on a lock when closed', done => {
-    if (!serverIs31OrLater(done)) {
-      // locks are transaction termination aware by default only in 3.1+
-      return;
-    }
 
     session.run('CREATE ()').then(() => {
       session.close(() => {
@@ -874,10 +828,6 @@ describe('session', () => {
   });
 
   it('should interrupt transaction function waiting on a lock when closed', done => {
-    if (!serverIs31OrLater(done)) {
-      // locks are transaction termination aware by default only in 3.1+
-      return;
-    }
 
     session.run('CREATE ()').then(() => {
       session.close(() => {
@@ -1163,16 +1113,6 @@ describe('session', () => {
     });
   }
 
-  function serverIs31OrLater(done) {
-    if (serverVersion.compareTo(VERSION_3_1_0) < 0) {
-      if (done && typeof done === 'function') {
-        done();
-      }
-      return false;
-    }
-    return true;
-  }
-
   function countNodes(label, propertyKey, propertyValue) {
     return new Promise((resolve, reject) => {
       session.run(`MATCH (n: ${label} {${propertyKey}: ${propertyValue}}) RETURN count(n) AS count`).then(result => {

test/v1/summary.test.js

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2002-2019 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.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.
+ */
+
+import neo4j from '../../src/v1';
+import sharedNeo4j from '../internal/shared-neo4j';
+
+describe('result summary', () => {
+
+  let driver, session;
+
+  beforeEach(done => {
+    driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken);
+    session = driver.session();
+
+    session.run("MATCH (n) DETACH DELETE n").then(done);
+  });
+
+  afterEach(() => {
+    driver.close();
+  });
+
+  fit('should get result summary', done => {
+    // When & Then
+    session.run("CREATE (p:Person { Name: 'Test'})").then(result => {
+      var summary = result.summary;
+
+      expect(summary.statement.text).toBe("CREATE (p:Person { Name: 'Test'})");
+      expect(summary.statement.parameters).toEqual({});
+
+      expect(summary.statementType).toBe("w");
+      expect(summary.plan).toBe(false);
+      expect(summary.profile).toBe(false);
+      expect(summary.notifications).toEqual([]);
+      expect(summary.resultConsumedAfter).toBeDefined();
+      expect(summary.resultAvailableAfter).toBeDefined();
+
+      var counters = summary.counters;
+      expect(counters.nodesCreated()).toBe(1);
+      expect(counters.nodesDeleted()).toBe(0);
+      expect(counters.relationshipsCreated()).toBe(0);
+      expect(counters.relationshipsDeleted()).toBe(0);
+      expect(counters.propertiesSet()).toBe(1);
+      expect(counters.labelsAdded()).toBe(1);
+      expect(counters.labelsRemoved()).toBe(0);
+      expect(counters.indexesAdded()).toBe(0);
+      expect(counters.indexesRemoved()).toBe(0);
+      expect(counters.constraintsAdded()).toBe(0);
+      expect(counters.constraintsRemoved()).toBe(0);
+      done();
+    });
+  });
+});