Remove connection-verifier and tests for the driver.ts methods

Author: bigmontz

packages/core/src/driver.ts

@@ -19,7 +19,6 @@
 
 import ConnectionProvider from './connection-provider'
 import { Bookmarks } from './internal/bookmarks'
-import { ConnectivityVerifier } from './internal/connectivity-verifier'
 import ConfiguredCustomResolver from './internal/resolver/configured-custom-resolver'
 
 import {
@@ -153,8 +152,8 @@ class Driver {
   /**
    * Verifies connectivity of this driver by trying to open a connection with the provided driver options.
    *
-   * @deprecated This return of this method will change in 6.0.0 to not return the {@link Promise<ServerInfo>} and return a
-   * {@link Promise<void>} instead. If you need to use the server info, use {@link getServerInfo} instead.
+   * @deprecated This return of this method will change in 6.0.0 to not async return the {@link ServerInfo} and 
+   * async return {@link void} instead. If you need to use the server info, use {@link getServerInfo} instead.
    *
    * @public
    * @param {Object} param - The object parameter

packages/core/src/internal/connectivity-verifier.ts

@@ -25,7 +25,6 @@ import * as constants from './constants'
 import * as connectionHolder from './connection-holder'
 import * as txConfig from './tx-config'
 import * as transactionExecutor from './transaction-executor'
-import * as connectivityVerifier from './connectivity-verifier'
 import * as logger from './logger'
 import * as urlUtil from './url-util'
 import * as serverAddress from './server-address'
@@ -41,7 +40,6 @@ export {
   connectionHolder,
   txConfig,
   transactionExecutor,
-  connectivityVerifier,
   logger,
   urlUtil,
   serverAddress,

packages/core/src/internal/index.ts

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ConnectionProvider, newError, Session } from '../src'
-import Driver from '../src/driver'
+import { ConnectionProvider, newError, ServerInfo, Session } from '../src'
+import Driver, { READ } from '../src/driver'
 import { Bookmarks } from '../src/internal/bookmarks'
 import { Logger } from '../src/internal/logger'
 import { ConfiguredCustomResolver } from '../src/internal/resolver'
@@ -155,6 +155,48 @@ describe('Driver', () => {
     expect(driver.isEncrypted()).toEqual(expectedValue)
   })
 
+  it.each([
+    [undefined, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [undefined, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+    [{}, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [{}, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+    [{ database: undefined }, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [{ database: undefined }, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+    [{ database: 'db' }, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [{ database: 'db' }, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+  ])('.verifyConnectivity(%o) => %s', (input: { database?: string } | undefined, _, expectedPromise) => {
+    connectionProvider.verifyConnectivityAndGetServerInfo = jest.fn(() => expectedPromise)
+
+    const promise: Promise<ServerInfo> = driver!.verifyConnectivity(input)
+
+    expect(promise).toBe(expectedPromise)
+    expect(connectionProvider.verifyConnectivityAndGetServerInfo)
+      .toBeCalledWith({ database: input && input.database ? input.database : '', accessMode: READ })
+
+    promise.catch(_ => 'Do nothing').finally(() => { })
+  })
+
+  it.each([
+    [undefined, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [undefined, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+    [{}, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [{}, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+    [{ database: undefined }, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [{ database: undefined }, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+    [{ database: 'db' }, 'Promise.resolve(ServerInfo>)', Promise.resolve(new ServerInfo())],
+    [{ database: 'db' }, 'Promise.reject(Error)', Promise.reject(newError('something went wrong'))],
+  ])('.getServerInfo(%o) => %s', (input: { database?: string } | undefined, _, expectedPromise) => {
+    connectionProvider.verifyConnectivityAndGetServerInfo = jest.fn(() => expectedPromise)
+
+    const promise: Promise<ServerInfo> = driver!.getServerInfo(input)
+
+    expect(promise).toBe(expectedPromise)
+    expect(connectionProvider.verifyConnectivityAndGetServerInfo)
+      .toBeCalledWith({ database: input && input.database ? input.database : '', accessMode: READ })
+
+    promise.catch(_ => 'Do nothing').finally(() => { })
+  })
+
   function mockCreateConnectonProvider(connectionProvider: ConnectionProvider) {
     return (
       id: number,