Removed driver.onError callbacks

Author: ali-ince

test/driver.test.js

@@ -19,7 +19,6 @@
 
 import neo4j from '../src'
 import sharedNeo4j from './internal/shared-neo4j'
-import FakeConnection from './internal/fake-connection'
 import lolex from 'lolex'
 import {
   DEFAULT_ACQUISITION_TIMEOUT,
@@ -65,20 +64,20 @@ describe('#integration driver', () => {
     driver.close()
   })
 
-  it('should handle connection errors', done => {
+  it('should handle connection errors', async () => {
     // Given
     driver = neo4j.driver('bolt://local-host', sharedNeo4j.authToken)
-
-    // Expect
-    driver.onError = error => {
-      // the error message is different whether in browser or node
+    const session = driver.session()
+    const txc = session.beginTransaction()
+    try {
+      await txc.run('RETURN 1')
+      expect(true).toBeFalsy('exception expected')
+    } catch (error) {
       expect(error.message).not.toBeNull()
       expect(error.code).toEqual(neo4j.error.SERVICE_UNAVAILABLE)
-      done()
+    } finally {
+      session.close()
     }
-
-    // When
-    startNewTransaction(driver)
   }, 10000)
 
   it('should fail with correct error message when connecting to port 80', done => {
@@ -131,19 +130,20 @@ describe('#integration driver', () => {
     }).toBeDefined()
   })
 
-  it('should fail early on wrong credentials', done => {
+  it('should fail early on wrong credentials', async () => {
     // Given
     driver = neo4j.driver('bolt://localhost', wrongCredentials())
-
-    // Expect
-    driver.onError = err => {
-      // the error message is different whether in browser or node
-      expect(err.code).toEqual('Neo.ClientError.Security.Unauthorized')
-      done()
+    const session = driver.session()
+    const txc = session.beginTransaction()
+    try {
+      await txc.run('RETURN 1')
+      expect(true).toBeFalsy('exception expected')
+    } catch (error) {
+      expect(error.message).not.toBeNull()
+      expect(error.code).toEqual('Neo.ClientError.Security.Unauthorized')
+    } finally {
+      session.close()
     }
-
-    // When
-    startNewTransaction(driver)
   })
 
   it('should fail queries on wrong credentials', done => {
@@ -220,26 +220,25 @@ describe('#integration driver', () => {
     })
   })
 
-  it('should fail nicely when connecting with routing to standalone server', done => {
+  it('should fail nicely when connecting with routing to standalone server', async () => {
     if (!routingProcedureOnlyAvailableOnCores()) {
-      done()
-      return
+      return Promise.resolve(null)
     }
 
     // Given
     driver = neo4j.driver('neo4j://localhost', sharedNeo4j.authToken)
-
-    // Expect
-    driver.onError = error => {
+    const session = driver.session()
+    try {
+      await session.run('RETURN 1')
+      expect(true).toBeFalsy('exception expected')
+    } catch (error) {
       expect(error.message).toContain(
         'Could not perform discovery. No routing servers available.'
       )
       expect(error.code).toEqual(neo4j.error.SERVICE_UNAVAILABLE)
-      done()
+    } finally {
+      session.close()
     }
-
-    // When
-    startNewTransaction(driver)
   })
 
   it('should have correct user agent', () => {
@@ -267,42 +266,6 @@ describe('#integration driver', () => {
     )
   })
 
-  it('should treat closed connections as invalid', () => {
-    driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
-
-    const connectionValid = driver._validateConnection(
-      new FakeConnection().closed()
-    )
-
-    expect(connectionValid).toBeFalsy()
-  })
-
-  it('should treat not old open connections as valid', () => {
-    driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken, {
-      maxConnectionLifetime: 10
-    })
-
-    const connection = new FakeConnection().withCreationTimestamp(12)
-    clock = lolex.install()
-    clock.setSystemTime(20)
-    const connectionValid = driver._validateConnection(connection)
-
-    expect(connectionValid).toBeTruthy()
-  })
-
-  it('should treat old open connections as invalid', () => {
-    driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken, {
-      maxConnectionLifetime: 10
-    })
-
-    const connection = new FakeConnection().withCreationTimestamp(5)
-    clock = lolex.install()
-    clock.setSystemTime(20)
-    const connectionValid = driver._validateConnection(connection)
-
-    expect(connectionValid).toBeFalsy()
-  })
-
   it('should discard closed connections', done => {
     driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
 
@@ -514,7 +477,9 @@ describe('#integration driver', () => {
   }
 
   function openConnectionFrom (driver) {
-    return Array.from(Object.values(driver._openConnections))
+    return Array.from(
+      Object.values(driver._connectionProvider._openConnections)
+    )
   }
 
   function routingProcedureOnlyAvailableOnCores () {

test/examples.test.js

@@ -271,21 +271,27 @@ describe('#integration examples', () => {
     // tag::driver-lifecycle[]
     const driver = neo4j.driver(uri, neo4j.auth.basic(user, password))
 
-    driver.verifyConnectivity().then(() => {
-      console.log('Driver created')
-    })
-
-    driver.onError = error => {
-      console.log(error)
-    }
+    driver
+      .verifyConnectivity()
+      .then(() => {
+        console.log('Driver created')
+      })
+      .catch(error => {
+        console.log(`connectivity verification failed. ${error}`)
+      })
 
     const session = driver.session()
-    session.run('CREATE (i:Item)').then(() => {
-      session.close()
+    session
+      .run('CREATE (i:Item)')
+      .then(() => {
+        session.close()
 
-      // ... on application exit:
-      driver.close()
-    })
+        // ... on application exit:
+        driver.close()
+      })
+      .catch(error => {
+        console.log(`unable to execute statement. ${error}`)
+      })
     // end::driver-lifecycle[]
 
     testResultPromise.then(loggedMsg => {

test/internal/connection-provider-pooled.test.js

@@ -0,0 +1,77 @@
+/**
+ * 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 PooledConnectionProvider from '../../src/internal/connection-provider-pooled'
+import FakeConnection from './fake-connection'
+import lolex from 'lolex'
+
+describe('#unit PooledConnectionProvider', () => {
+  let clock
+
+  beforeEach(() => {
+    if (clock) {
+      clock.uninstall()
+      clock = null
+    }
+  })
+
+  it('should treat closed connections as invalid', () => {
+    const provider = new PooledConnectionProvider({
+      id: 0,
+      config: {}
+    })
+
+    const connectionValid = provider._validateConnection(
+      new FakeConnection().closed()
+    )
+
+    expect(connectionValid).toBeFalsy()
+  })
+
+  it('should treat not old open connections as valid', () => {
+    const provider = new PooledConnectionProvider({
+      id: 0,
+      config: {
+        maxConnectionLifetime: 10
+      }
+    })
+
+    const connection = new FakeConnection().withCreationTimestamp(12)
+    clock = lolex.install()
+    clock.setSystemTime(20)
+    const connectionValid = provider._validateConnection(connection)
+
+    expect(connectionValid).toBeTruthy()
+  })
+
+  it('should treat old open connections as invalid', () => {
+    const provider = new PooledConnectionProvider({
+      id: 0,
+      config: {
+        maxConnectionLifetime: 10
+      }
+    })
+
+    const connection = new FakeConnection().withCreationTimestamp(5)
+    clock = lolex.install()
+    clock.setSystemTime(20)
+    const connectionValid = provider._validateConnection(connection)
+
+    expect(connectionValid).toBeFalsy()
+  })
+})

test/session.test.js

@@ -1274,7 +1274,7 @@ describe('#integration session', () => {
   }
 
   function numberOfAcquiredConnectionsFromPool () {
-    const pool = driver._pool
+    const pool = driver._connectionProvider._connectionPool
     return pool.activeResourceCount(ServerAddress.fromUrl('localhost:7687'))
   }
 

test/types/driver.test.ts

@@ -101,9 +101,3 @@ driver.verifyConnectivity().then((serverInfo: ServerInfo) => {
   console.log(serverInfo.version)
   console.log(serverInfo.address)
 })
-
-driver.onError = (error: Neo4jError) => {
-  console.log(error)
-}
-
-driver.onError(new Neo4jError('message', 'code'))

types/driver.d.ts

@@ -75,8 +75,6 @@ declare interface Driver {
   close(): void
 
   verifyConnectivity(): Promise<ServerInfo>
-
-  onError?: (error: Neo4jError) => void
 }
 
 export {