Added tests for server info with observer API

Author: lutovich

test/v1/routing.driver.boltkit.it.js

@@ -682,48 +682,106 @@ describe('routing driver ', function () {
     }
 
     // Given
-    var kit = new boltkit.BoltKit();
-    var routingServer = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9001);
-    var writeServer = kit.start('./test/resources/boltkit/write_server_with_version.script', 9007);
-    var readServer = kit.start('./test/resources/boltkit/read_server_with_version.script', 9005);
+    const kit = new boltkit.BoltKit();
+    const routingServer = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9001);
+    const writeServer = kit.start('./test/resources/boltkit/write_server_with_version.script', 9007);
+    const readServer = kit.start('./test/resources/boltkit/read_server_with_version.script', 9005);
 
     kit.run(function () {
-      var driver = newDriver("bolt+routing://127.0.0.1:9001");
+      const driver = newDriver("bolt+routing://127.0.0.1:9001");
       // When
-      var readSession = driver.session(neo4j.session.READ);
-      readSession.run('MATCH (n) RETURN n.name').then(function (readResult) {
-        var writeSession = driver.session(neo4j.session.WRITE);
-        writeSession.run("CREATE (n {name:'Bob'})").then(function (writeResult) {
-            var readServerInfo = readResult.summary.server;
-            var writeServerInfo = writeResult.summary.server;
-
-            readSession.close();
-            writeSession.close();
-            driver.close();
+      const readSession = driver.session(neo4j.session.READ);
+      readSession.run('MATCH (n) RETURN n.name').then(readResult => {
+        const writeSession = driver.session(neo4j.session.WRITE);
+        writeSession.run("CREATE (n {name:'Bob'})").then(writeResult => {
+          const readServerInfo = readResult.summary.server;
+          const writeServerInfo = writeResult.summary.server;
+
+          readSession.close();
+          writeSession.close();
+          driver.close();
 
-            routingServer.exit(function (routingServerExitCode) {
-              writeServer.exit(function (writeServerExitCode) {
-                readServer.exit(function (readServerExitCode) {
+          routingServer.exit(routingServerExitCode => {
+            writeServer.exit(writeServerExitCode => {
+              readServer.exit(readServerExitCode => {
 
-                  expect(readServerInfo.address).toBe('127.0.0.1:9005');
-                  expect(readServerInfo.version).toBe('TheReadServerV1');
+                expect(readServerInfo.address).toBe('127.0.0.1:9005');
+                expect(readServerInfo.version).toBe('TheReadServerV1');
 
-                  expect(writeServerInfo.address).toBe('127.0.0.1:9007');
-                  expect(writeServerInfo.version).toBe('TheWriteServerV1');
+                expect(writeServerInfo.address).toBe('127.0.0.1:9007');
+                expect(writeServerInfo.version).toBe('TheWriteServerV1');
 
-                  expect(routingServerExitCode).toEqual(0);
-                  expect(writeServerExitCode).toEqual(0);
-                  expect(readServerExitCode).toEqual(0);
+                expect(routingServerExitCode).toEqual(0);
+                expect(writeServerExitCode).toEqual(0);
+                expect(readServerExitCode).toEqual(0);
 
-                  done();
-                });
+                done();
               });
             });
+          });
         })
       });
     });
   });
 
+  it('should expose server info in cluster using observer', function (done) {
+    if (!boltkit.BoltKitSupport) {
+      done();
+      return;
+    }
+
+    // Given
+    const kit = new boltkit.BoltKit();
+    const routingServer = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9001);
+    const writeServer = kit.start('./test/resources/boltkit/write_server_with_version.script', 9007);
+    const readServer = kit.start('./test/resources/boltkit/read_server_with_version.script', 9005);
+
+    kit.run(function () {
+      const driver = newDriver("bolt+routing://127.0.0.1:9001");
+      // When
+      const readSession = driver.session(neo4j.session.READ);
+      readSession.run('MATCH (n) RETURN n.name').subscribe({
+        onNext: () => {
+        },
+        onError: () => {
+        },
+        onCompleted: readSummary => {
+          const writeSession = driver.session(neo4j.session.WRITE);
+          writeSession.run("CREATE (n {name:'Bob'})").subscribe({
+            onNext: () => {
+            },
+            onError: () => {
+            },
+            onCompleted: writeSummary => {
+              readSession.close();
+              writeSession.close();
+              driver.close();
+
+              routingServer.exit(function (routingServerExitCode) {
+                writeServer.exit(function (writeServerExitCode) {
+                  readServer.exit(function (readServerExitCode) {
+
+                    expect(readSummary.server.address).toBe('127.0.0.1:9005');
+                    expect(readSummary.server.version).toBe('TheReadServerV1');
+
+                    expect(writeSummary.server.address).toBe('127.0.0.1:9007');
+                    expect(writeSummary.server.version).toBe('TheWriteServerV1');
+
+                    expect(routingServerExitCode).toEqual(0);
+                    expect(writeServerExitCode).toEqual(0);
+                    expect(readServerExitCode).toEqual(0);
+
+                    done();
+                  });
+                });
+              });
+            }
+          })
+        }
+      });
+    });
+  });
+
   function newDriver(url) {
     // BoltKit currently does not support encryption, create driver with encryption turned off
     return neo4j.driver(url, neo4j.auth.basic("neo4j", "neo4j"), {

test/v1/transaction.test.js

@@ -297,32 +297,66 @@ describe('transaction', function() {
   });
 
   it('should expose server info on successful query', function (done) {
-    //lazy way of checking the version number
-    //if server has been set we know it is at least
-    //3.1 (todo actually parse the version string)
-    if (!server) {
-      done();
+    if (neo4jVersionOlderThan31(done)) {
       return;
     }
+
     // Given
-    var statement = 'RETURN 1';
+    const statement = 'RETURN 1';
 
     // When & Then
-    var tx = session.beginTransaction();
+    const tx = session.beginTransaction();
     tx.run(statement)
-      .then(function (result) {
-        var sum = result.summary;
+      .then(result => {
+        const sum = result.summary;
         expect(sum.server).toBeDefined();
         expect(sum.server.address).toEqual('localhost:7687');
         expect(sum.server.version).toBeDefined();
       });
-    tx.commit().then(function() {
-      done();
-    })
+    tx.commit().then(done);
+  });
+
+  it('should expose server info on successful query using observer', function (done) {
+    if (neo4jVersionOlderThan31(done)) {
+      return;
+    }
+
+    // Given
+    const statement = 'RETURN 1';
+
+    // When & Then
+    const tx = session.beginTransaction();
+    tx.run(statement)
+      .subscribe({
+        onNext: record => {
+        },
+        onError: error => {
+        },
+        onCompleted: summary => {
+          const server = summary.server;
+
+          expect(server).toBeDefined();
+          expect(server.address).toEqual('localhost:7687');
+          expect(server.version).toBeDefined();
+
+          done();
+        }
+      });
   });
 
   function expectSyntaxError(error) {
-      const code = error.fields[0].code;
-      expect(code).toBe('Neo.ClientError.Statement.SyntaxError');
+    const code = error.fields[0].code;
+    expect(code).toBe('Neo.ClientError.Statement.SyntaxError');
+  }
+
+  function neo4jVersionOlderThan31(done) {
+    //lazy way of checking the version number
+    //if server has been set we know it is at least
+    //3.1 (todo actually parse the version string)
+    if (!server) {
+      done();
+      return true;
+    }
+    return false;
   }
 });