fix: unit tests

Author: karenc-bq

tests/unit/monitor_impl.test.ts

@@ -105,7 +105,7 @@ describe("monitor impl test", () => {
   });
 
   it("run with context", async () => {
-    const monitorContextInstance = new MonitorConnectionContext(monitor, mockClient, 30000, 5000, 3);
+    const monitorContextInstance = new MonitorConnectionContext(monitor, mockClient, 30000, 5000, 3, mockPluginService);
     monitor.startMonitoring(monitorContextInstance);
     // Should end by itself.
     monitor.run();

tests/unit/notification_pipeline.test.ts

@@ -31,9 +31,9 @@ class TestPlugin extends DefaultPlugin {
     return Promise.resolve(OldConnectionSuggestionAction.NO_OPINION);
   }
 
-  notifyHostListChanged(changes: Map<string, Set<HostChangeOptions>>): void {
+  notifyHostListChanged(changes: Map<string, Set<HostChangeOptions>>): Promise<void> {
     this.counter++;
-    return;
+    return Promise.resolve();
   }
 
   resetCounter() {

tests/unit/read_write_splitting.test.ts

@@ -31,6 +31,9 @@ import { OldConnectionSuggestionAction } from "../../common/lib/old_connection_s
 import { HostListProvider } from "../../common/lib/host_list_provider/host_list_provider";
 import { WrapperProperties } from "../../common/lib/wrapper_property";
 import { ClientWrapper } from "../../common/lib/client_wrapper";
+import { NodePostgresDriverDialect } from "../../pg/lib/dialect/node_postgres_driver_dialect";
+import { DriverDialect } from "../../common/lib/driver_dialect/driver_dialect";
+import { MySQL2DriverDialect } from "../../mysql/lib/dialect/mysql2_driver_dialect";
 
 const properties: Map<string, any> = new Map();
 const builder = new HostInfoBuilder({ hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy() });
@@ -53,6 +56,7 @@ const mockHostListProvider: HostListProvider = mock<HostListProvider>();
 const mockClosedReaderClient: AwsClient = mock(AwsMySQLClient);
 const mockClosedWriterClient: AwsClient = mock(AwsMySQLClient);
 const mockDialect: MySQLDatabaseDialect = mock(MySQLDatabaseDialect);
+const mockDriverDialect: DriverDialect = mock(MySQL2DriverDialect);
 const mockChanges: Set<HostChangeOptions> = mock(Set<HostChangeOptions>);
 
 const clientWrapper: ClientWrapper = {
@@ -79,6 +83,9 @@ describe("reader write splitting test", () => {
     when(mockPluginService.getHostListProvider()).thenReturn(instance(mockHostListProvider));
     when(mockPluginService.getHosts()).thenReturn(defaultHosts);
     when(mockPluginService.isInTransaction()).thenReturn(false);
+    when(mockPluginService.getDialect()).thenReturn(mockDialect);
+    when(mockPluginService.getDriverDialect()).thenReturn(mockDriverDialect);
+    when(mockDriverDialect.connect(anything())).thenReturn(Promise.resolve(mockReaderClient));
     properties.clear();
   });
 
@@ -101,8 +108,6 @@ describe("reader write splitting test", () => {
     when(mockPluginService.getCurrentClient()).thenReturn(instance(mockWriterClient));
     when(await mockWriterClient.isValid()).thenReturn(true);
     when(mockPluginService.getCurrentHostInfo()).thenReturn(writerHost);
-    when(mockPluginService.getDialect()).thenReturn(mockDialect);
-    when(mockDialect.connect(anything())).thenReturn(Promise.resolve(mockReaderClient));
     when(mockPluginService.connect(anything(), anything())).thenResolve(mockReaderWrapper);
 
     const target = new ReadWriteSplittingPlugin(
@@ -127,8 +132,6 @@ describe("reader write splitting test", () => {
     when(mockPluginService.getCurrentClient()).thenReturn(instance(mockReaderClient));
     when(await mockReaderClient.isValid()).thenReturn(true);
     when(mockPluginService.getCurrentHostInfo()).thenReturn(readerHost1);
-    when(mockPluginService.getDialect()).thenReturn(mockDialect);
-    when(mockDialect.connect(anything())).thenReturn(Promise.resolve(mockReaderClient));
     when(mockPluginService.connect(anything(), anything())).thenResolve(mockWriterWrapper);
 
     const target = new ReadWriteSplittingPlugin(
@@ -153,8 +156,6 @@ describe("reader write splitting test", () => {
     when(mockPluginService.getCurrentClient()).thenReturn(instance(mockReaderClient));
     when(await mockReaderClient.isValid()).thenReturn(true);
     when(mockPluginService.getCurrentHostInfo()).thenReturn(readerHost1);
-    when(mockPluginService.getDialect()).thenReturn(mockDialect);
-    when(mockDialect.connect(anything())).thenReturn(Promise.resolve(mockReaderClient));
     when(mockPluginService.connect(anything(), anything())).thenResolve(mockReaderWrapper);
 
     const target = new ReadWriteSplittingPlugin(
@@ -179,8 +180,6 @@ describe("reader write splitting test", () => {
     when(mockPluginService.getCurrentClient()).thenReturn(instance(mockWriterClient));
     when(await mockWriterClient.isValid()).thenReturn(true);
     when(mockPluginService.getCurrentHostInfo()).thenReturn(writerHost);
-    when(mockPluginService.getDialect()).thenReturn(mockDialect);
-    when(mockDialect.connect(anything())).thenReturn(Promise.resolve(mockReaderClient));
     when(mockPluginService.connect(anything(), anything())).thenResolve(mockReaderWrapper);
 
     const target = new ReadWriteSplittingPlugin(
@@ -207,8 +206,6 @@ describe("reader write splitting test", () => {
     when(mockWriterClient.targetClient).thenReturn(mockWriterWrapper);
     when(mockWriterClient.targetClient && (await mockPluginService.isClientValid(mockWriterClient.targetClient))).thenReturn(true);
     when(mockPluginService.getCurrentHostInfo()).thenReturn(writerHost);
-    when(mockPluginService.getDialect()).thenReturn(mockDialect);
-    when(mockDialect.connect(anything())).thenReturn(Promise.resolve(mockReaderClient));
     when(mockPluginService.connect(anything(), anything())).thenReturn(Promise.resolve(mockWriterWrapper));
 
     const target = new ReadWriteSplittingPlugin(

tests/unit/reader_failover_handler.test.ts

@@ -24,6 +24,7 @@ import { anything, instance, mock, reset, verify, when } from "ts-mockito";
 import { ClientWrapper } from "../../common/lib/client_wrapper";
 import { PgDatabaseDialect } from "../../pg/lib/dialect/pg_database_dialect";
 import { FailoverRestriction } from "../../common/lib/plugins/failover/failover_restriction";
+import { NodePostgresDriverDialect } from "../../pg/lib/dialect/node_postgres_driver_dialect";
 
 const host1 = new HostInfo("writer", 1234, HostRole.WRITER);
 const host2 = new HostInfo("reader1", 1234, HostRole.READER);
@@ -33,7 +34,8 @@ const host5 = new HostInfo("reader4", 1234, HostRole.READER);
 const host6 = new HostInfo("reader5", 1234, HostRole.READER);
 const defaultHosts = [host1, host2, host3, host4, host5, host6];
 const properties = new Map();
-const dialect = mock(PgDatabaseDialect);
+const mockDatabaseDialect = mock(PgDatabaseDialect);
+const mockDriverDialect = mock(NodePostgresDriverDialect);
 const clientWrapper: ClientWrapper = {
   client: undefined,
   hostInfo: mock(HostInfo),
@@ -46,8 +48,11 @@ const mockPluginService = mock(PluginService);
 
 describe("reader failover handler", () => {
   beforeEach(() => {
-    when(dialect.getFailoverRestrictions()).thenReturn([]);
-    when(mockPluginService.getDialect()).thenReturn(instance(dialect));
+    when(mockDatabaseDialect.getFailoverRestrictions()).thenReturn([]);
+    when(mockPluginService.getDialect()).thenReturn(mockDatabaseDialect);
+    when(mockPluginService.getDriverDialect()).thenReturn(mockDriverDialect);
+    when(mockDriverDialect.createTargetClient(anything())).thenReturn(mockTargetClient);
+    when(mockDriverDialect.connect(anything())).thenResolve(mockTargetClient);
   });
   afterEach(() => {
     reset(mockPluginService);
@@ -97,8 +102,6 @@ describe("reader failover handler", () => {
     const currentHostIndex = 2;
 
     when(mockPluginService.getHosts()).thenReturn(hosts);
-    when(mockPluginService.createTargetClient(anything())).thenReturn(mockTargetClient);
-    when(dialect.connect(anything())).thenResolve(mockTargetClient);
     when(mockPluginService.forceConnect(anything(), properties)).thenCall(async () => {
       await new Promise((resolve, reject) => {
         timeoutId = setTimeout(resolve, 20000);