test: fix unit test failure due to missing file

karenc-bq · karenc-bq · commit 06fc7d42ceba · 2026-04-09T21:06:04.000-07:00
diff --git a/common/lib/authentication/aws_secrets_manager_plugin.ts b/common/lib/authentication/aws_secrets_manager_plugin.ts
@@ -141,6 +141,7 @@ export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin implements
         }
       }
       logger.debug(Messages.get("AwsSecretsManagerConnectionPlugin.unhandledError", error.name, error.message));
+      throw error;
     }
   }
 
diff --git a/common/lib/database_dialect/topology_aware_database_dialect.ts b/common/lib/database_dialect/topology_aware_database_dialect.ts
@@ -34,3 +34,7 @@ export interface TopologyAwareDatabaseDialect {
 export interface GlobalAuroraTopologyDialect extends TopologyAwareDatabaseDialect {
   getRegionByInstanceId(targetClient: ClientWrapper, instanceId: string): Promise<string | null>;
 }
+
+export function isDialectTopologyAware(dialect: any): dialect is TopologyAwareDatabaseDialect {
+  return dialect;
+}
diff --git a/common/lib/host_list_provider/aurora_topology_utils.ts b/common/lib/host_list_provider/aurora_topology_utils.ts
@@ -18,7 +18,7 @@ import { TopologyQueryResult, TopologyUtils } from "./topology_utils";
 import { ClientWrapper } from "../client_wrapper";
 import { DatabaseDialect } from "../database_dialect/database_dialect";
 import { HostInfo } from "../host_info";
-import { isDialectTopologyAware } from "../utils/utils";
+import { isDialectTopologyAware } from "../database_dialect/topology_aware_database_dialect";
 import { Messages } from "../utils/messages";
 
 /**
diff --git a/common/lib/host_list_provider/global_topology_utils.ts b/common/lib/host_list_provider/global_topology_utils.ts
@@ -18,7 +18,7 @@ import { TopologyQueryResult, TopologyUtils } from "./topology_utils";
 import { ClientWrapper } from "../client_wrapper";
 import { DatabaseDialect } from "../database_dialect/database_dialect";
 import { HostInfo } from "../host_info";
-import { isDialectTopologyAware } from "../utils/utils";
+import { isDialectTopologyAware } from "../database_dialect/topology_aware_database_dialect";
 import { Messages } from "../utils/messages";
 import { AwsWrapperError } from "../utils/errors";
 
diff --git a/common/lib/host_list_provider/monitoring/cluster_topology_monitor.ts b/common/lib/host_list_provider/monitoring/cluster_topology_monitor.ts
@@ -62,8 +62,6 @@ export class ClusterTopologyMonitorImpl extends AbstractMonitor implements Clust
   protected static readonly DEFAULT_CONNECTION_TIMEOUT_MS: number = 5000;
   protected static readonly DEFAULT_QUERY_TIMEOUT_MS: number = 5000;
 
-  static readonly MONITORING_PROPERTY_PREFIX: string = "topology_monitoring_";
-
   private readonly clusterId: string;
   protected readonly initialHostInfo: HostInfo;
   private readonly servicesContainer: FullServicesContainer;
@@ -129,8 +127,8 @@ export class ClusterTopologyMonitorImpl extends AbstractMonitor implements Clust
 
     this._monitoringProperties = new Map<string, any>(props);
     for (const [key, val] of props) {
-      if (key.startsWith(ClusterTopologyMonitorImpl.MONITORING_PROPERTY_PREFIX)) {
-        this._monitoringProperties.set(key.substring(ClusterTopologyMonitorImpl.MONITORING_PROPERTY_PREFIX.length), val);
+      if (key.startsWith(WrapperProperties.TOPOLOGY_MONITORING_PROPERTY_PREFIX)) {
+        this._monitoringProperties.set(key.substring(WrapperProperties.TOPOLOGY_MONITORING_PROPERTY_PREFIX.length), val);
         this._monitoringProperties.delete(key);
       }
     }
diff --git a/common/lib/host_list_provider/rds_host_list_provider.ts b/common/lib/host_list_provider/rds_host_list_provider.ts
@@ -25,7 +25,7 @@ import { AwsTimeoutError, AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
 import { WrapperProperties } from "../wrapper_property";
 import { logger } from "../../logutils";
-import { isDialectTopologyAware } from "../utils/utils";
+import { isDialectTopologyAware } from "../database_dialect/topology_aware_database_dialect";
 import { DatabaseDialect } from "../database_dialect/database_dialect";
 import { ClientWrapper } from "../client_wrapper";
 import { CoreServicesContainer } from "../utils/core_services_container";
diff --git a/common/lib/internal_pooled_connection_provider.ts b/common/lib/internal_pooled_connection_provider.ts
@@ -27,7 +27,7 @@ import { lookup, LookupAddress } from "dns";
 import { promisify } from "util";
 import { HostInfoBuilder } from "./host_info_builder";
 import { RdsUrlType } from "./utils/rds_url_type";
-import { AwsWrapperError } from "./index";
+import { AwsWrapperError } from "./utils/errors";
 import { Messages } from "./utils/messages";
 import { HostSelector } from "./host_selector";
 import { RandomHostSelector } from "./random_host_selector";
diff --git a/common/lib/plugin_service.ts b/common/lib/plugin_service.ts
@@ -22,7 +22,7 @@ import { DynamicHostListProvider, HostListProvider } from "./host_list_provider/
 import { ConnectionUrlParser } from "./utils/connection_url_parser";
 import { DatabaseDialect, DatabaseType } from "./database_dialect/database_dialect";
 import { HostInfoBuilder } from "./host_info_builder";
-import { AwsTimeoutError, AwsWrapperError, UnsupportedMethodError } from "./";
+import { AwsTimeoutError, AwsWrapperError, UnsupportedMethodError } from "./utils/errors";
 import { HostAvailability } from "./host_availability/host_availability";
 import { HostAvailabilityCacheItem } from "./host_availability/host_availability_cache_item";
 import { StatusCacheItem } from "./utils/status_cache_item";
diff --git a/common/lib/plugins/bluegreen/blue_green_status_provider.ts b/common/lib/plugins/bluegreen/blue_green_status_provider.ts
@@ -45,7 +45,6 @@ import { FullServicesContainer } from "../../utils/full_services_container";
 import { StorageService } from "../../utils/storage/storage_service";
 
 export class BlueGreenStatusProvider {
-  static readonly MONITORING_PROPERTY_PREFIX = "blue_green_monitoring_";
   private static readonly DEFAULT_CONNECT_TIMEOUT_MS = 10_000; // 10 seconds
   private static readonly DEFAULT_QUERY_TIMEOUT_MS = 10_000; // 10 seconds
 
@@ -134,7 +133,7 @@ export class BlueGreenStatusProvider {
     const monitoringConnProperties: Map<string, any> = new Map(this.properties);
 
     for (const key of monitoringConnProperties.keys()) {
-      if (!key.startsWith(BlueGreenStatusProvider.MONITORING_PROPERTY_PREFIX)) {
+      if (!key.startsWith(WrapperProperties.BG_MONITORING_PROPERTY_PREFIX)) {
         continue;
       }
 
diff --git a/common/lib/utils/status_cache_item.ts b/common/lib/utils/status_cache_item.ts
@@ -0,0 +1,23 @@
+/*
+  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ 
+  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.
+*/
+
+export class StatusCacheItem<T> {
+  readonly status: T;
+
+  constructor(status: T) {
+    this.status = status;
+  }
+}
diff --git a/common/lib/utils/utils.ts b/common/lib/utils/utils.ts
@@ -20,7 +20,6 @@ import { WrapperProperties } from "../wrapper_property";
 import { HostRole } from "../host_role";
 import { logger } from "../../logutils";
 import { AwsWrapperError, InternalQueryTimeoutError } from "./errors";
-import { TopologyAwareDatabaseDialect } from "../database_dialect/topology_aware_database_dialect";
 
 export function sleep(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -124,10 +123,6 @@ export function equalsIgnoreCase(value1: string | null, value2: string | null):
   return value1 != null && value2 != null && value1.localeCompare(value2, undefined, { sensitivity: "accent" }) === 0;
 }
 
-export function isDialectTopologyAware(dialect: any): dialect is TopologyAwareDatabaseDialect {
-  return dialect;
-}
-
 export function containsHostAndPort(hosts: HostInfo[] | null | undefined, hostAndPort: string): boolean {
   if (!hosts || hosts.length === 0) {
     return false;
diff --git a/common/lib/wrapper_property.ts b/common/lib/wrapper_property.ts
@@ -16,8 +16,6 @@
 
 import { ConnectionProvider } from "./connection_provider";
 import { DatabaseDialect } from "./database_dialect/database_dialect";
-import { ClusterTopologyMonitorImpl } from "./host_list_provider/monitoring/cluster_topology_monitor";
-import { BlueGreenStatusProvider } from "./plugins/bluegreen/blue_green_status_provider";
 import { AwsWrapperError } from "./utils/errors";
 import { Messages } from "./utils/messages";
 
@@ -61,6 +59,8 @@ export class WrapperProperty<T> {
 
 export class WrapperProperties {
   static readonly MONITORING_PROPERTY_PREFIX: string = "monitoring_";
+  static readonly TOPOLOGY_MONITORING_PROPERTY_PREFIX: string = "topology_monitoring_";
+  static readonly BG_MONITORING_PROPERTY_PREFIX: string = "blue_green_monitoring_";
   static readonly DEFAULT_PLUGINS = "auroraConnectionTracker,failover,efm2";
   static readonly DEFAULT_TOKEN_EXPIRATION_SEC = 15 * 60;
 
@@ -563,8 +563,8 @@ export class WrapperProperties {
 
   private static readonly PREFIXES = [
     WrapperProperties.MONITORING_PROPERTY_PREFIX,
-    ClusterTopologyMonitorImpl.MONITORING_PROPERTY_PREFIX,
-    BlueGreenStatusProvider.MONITORING_PROPERTY_PREFIX
+    WrapperProperties.TOPOLOGY_MONITORING_PROPERTY_PREFIX,
+    WrapperProperties.BG_MONITORING_PROPERTY_PREFIX
   ];
 
   private static startsWithPrefix(key: string): boolean {
diff --git a/mysql/lib/client.ts b/mysql/lib/client.ts
@@ -39,7 +39,7 @@ import { ClientUtils } from "../../common/lib/utils/client_utils";
 import { RdsMultiAZClusterMySQLDatabaseDialect } from "./dialect/rds_multi_az_mysql_database_dialect";
 import { TelemetryTraceLevel } from "../../common/lib/utils/telemetry/telemetry_trace_level";
 import { MySQL2DriverDialect } from "./dialect/mysql2_driver_dialect";
-import { isDialectTopologyAware } from "../../common/lib/utils/utils";
+import { isDialectTopologyAware } from "../../common/lib/database_dialect/topology_aware_database_dialect";
 import { MySQLClient, MySQLPoolClient } from "./mysql_client";
 import { DriverConnectionProvider } from "../../common/lib/driver_connection_provider";
 import { GlobalAuroraMySQLDatabaseDialect } from "./dialect/global_aurora_mysql_database_dialect";
diff --git a/pg/lib/client.ts b/pg/lib/client.ts
@@ -38,7 +38,7 @@ import { ClientWrapper } from "../../common/lib/client_wrapper";
 import { RdsMultiAZClusterPgDatabaseDialect } from "./dialect/rds_multi_az_pg_database_dialect";
 import { TelemetryTraceLevel } from "../../common/lib/utils/telemetry/telemetry_trace_level";
 import { NodePostgresDriverDialect } from "./dialect/node_postgres_driver_dialect";
-import { isDialectTopologyAware } from "../../common/lib/utils/utils";
+import { isDialectTopologyAware } from "../../common/lib/database_dialect/topology_aware_database_dialect";
 import { PGClient, PGPoolClient } from "./pg_client";
 import { DriverConnectionProvider } from "../../common/lib/driver_connection_provider";
 import { GlobalAuroraPgDatabaseDialect } from "./dialect/global_aurora_pg_database_dialect";
diff --git a/tests/unit/batching_event_publisher.test.ts b/tests/unit/batching_event_publisher.test.ts
@@ -35,8 +35,8 @@ class TestableEventPublisher extends BatchingEventPublisher {
     return this.pendingEvents.size;
   }
 
-  triggerSendMessages(): void {
-    this.sendMessages();
+  async triggerSendMessages(): Promise<void> {
+    await this.sendMessages();
   }
 }
 
@@ -52,7 +52,7 @@ describe("BatchingEventPublisher", () => {
     publisher = new TestableEventPublisher();
     processEventCalls = [];
     mockSubscriber = {
-      processEvent: (event: Event) => {
+      processEvent: async (event: Event) => {
         processEventCalls.push(event);
       }
     };
@@ -62,7 +62,7 @@ describe("BatchingEventPublisher", () => {
     publisher.releaseResources();
   });
 
-  it("should publish events to subscribers and deduplicate", () => {
+  it("should publish events to subscribers and deduplicate", async () => {
     const eventSubscriptions = new Set([DataAccessEvent]);
 
     publisher.subscribe(mockSubscriber, eventSubscriptions);
@@ -73,7 +73,7 @@ describe("BatchingEventPublisher", () => {
     publisher.publish(event);
     publisher.publish(event);
 
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(publisher.pendingEventCount).toBe(0);
 
@@ -82,7 +82,7 @@ describe("BatchingEventPublisher", () => {
 
     publisher.unsubscribe(mockSubscriber, eventSubscriptions);
     publisher.publish(event);
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(publisher.pendingEventCount).toBe(0);
 
@@ -105,23 +105,23 @@ describe("BatchingEventPublisher", () => {
     expect(publisher.pendingEventCount).toBe(0);
   });
 
-  it("should not deliver events to unsubscribed subscribers", () => {
+  it("should not deliver events to unsubscribed subscribers", async () => {
     const eventSubscriptions = new Set([DataAccessEvent]);
 
     publisher.subscribe(mockSubscriber, eventSubscriptions);
     publisher.unsubscribe(mockSubscriber, eventSubscriptions);
 
     const event = new DataAccessEvent(TestDataClass, "key");
     publisher.publish(event);
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(processEventCalls.length).toBe(0);
   });
 
-  it("should handle multiple subscribers", () => {
+  it("should handle multiple subscribers", async () => {
     const processEventCalls2: Event[] = [];
     const mockSubscriber2: EventSubscriber = {
-      processEvent: (event: Event) => {
+      processEvent: async (event: Event) => {
         processEventCalls2.push(event);
       }
     };
@@ -133,7 +133,7 @@ describe("BatchingEventPublisher", () => {
 
     const event = new DataAccessEvent(TestDataClass, "key");
     publisher.publish(event);
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(processEventCalls.length).toBe(1);
     expect(processEventCalls2.length).toBe(1);
diff --git a/tests/unit/connection_plugin_chain_builder.test.ts b/tests/unit/connection_plugin_chain_builder.test.ts
@@ -37,6 +37,11 @@ const mockPluginServiceInstance: PluginService = instance(mockPluginService);
 const mockDefaultConnProvider: ConnectionProvider = mock(DriverConnectionProvider);
 const mockEffectiveConnProvider: ConnectionProvider = mock(DriverConnectionProvider);
 
+const mockServicesContainer: FullServicesContainer = {
+  pluginService: mockPluginServiceInstance,
+  telemetryFactory: new NullTelemetryFactory()
+} as unknown as FullServicesContainer;
+
 describe("testConnectionPluginChainBuilder", () => {
   beforeAll(() => {
     when(mockPluginService.getTelemetryFactory()).thenReturn(new NullTelemetryFactory());
@@ -51,7 +56,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, plugins);
 
     const result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -70,7 +75,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.AUTO_SORT_PLUGIN_ORDER.name, false);
 
     const result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -89,7 +94,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, "executeTime,connectTime,iam");
 
     let result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -104,7 +109,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, "iam,executeTime,connectTime,failover");
 
     result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -125,7 +130,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, "test");
 
     const result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
diff --git a/tests/unit/database_dialect.test.ts b/tests/unit/database_dialect.test.ts
@@ -30,6 +30,8 @@ import { SimpleHostAvailabilityStrategy } from "../../common/lib/host_availabili
 import { ClientWrapper } from "../../common/lib/client_wrapper";
 import { RdsMultiAZClusterMySQLDatabaseDialect } from "../../mysql/lib/dialect/rds_multi_az_mysql_database_dialect";
 import { RdsMultiAZClusterPgDatabaseDialect } from "../../pg/lib/dialect/rds_multi_az_pg_database_dialect";
+import { GlobalAuroraMySQLDatabaseDialect } from "../../mysql/lib/dialect/global_aurora_mysql_database_dialect";
+import { GlobalAuroraPgDatabaseDialect } from "../../pg/lib/dialect/global_aurora_pg_database_dialect";
 import { DatabaseDialectManager } from "../../common/lib/database_dialect/database_dialect_manager";
 import { NodePostgresDriverDialect } from "../../pg/lib/dialect/node_postgres_driver_dialect";
 import { mock } from "ts-mockito";
@@ -49,14 +51,16 @@ const mysqlDialects: Map<DatabaseDialectCodes, DatabaseDialect> = new Map([
   [DatabaseDialectCodes.MYSQL, new MySQLDatabaseDialect()],
   [DatabaseDialectCodes.RDS_MYSQL, new RdsMySQLDatabaseDialect()],
   [DatabaseDialectCodes.AURORA_MYSQL, new AuroraMySQLDatabaseDialect()],
-  [DatabaseDialectCodes.RDS_MULTI_AZ_MYSQL, new RdsMultiAZClusterMySQLDatabaseDialect()]
+  [DatabaseDialectCodes.RDS_MULTI_AZ_MYSQL, new RdsMultiAZClusterMySQLDatabaseDialect()],
+  [DatabaseDialectCodes.GLOBAL_AURORA_MYSQL, new GlobalAuroraMySQLDatabaseDialect()]
 ]);
 
 const pgDialects: Map<DatabaseDialectCodes, DatabaseDialect> = new Map([
   [DatabaseDialectCodes.PG, new PgDatabaseDialect()],
   [DatabaseDialectCodes.RDS_PG, new RdsPgDatabaseDialect()],
   [DatabaseDialectCodes.AURORA_PG, new AuroraPgDatabaseDialect()],
-  [DatabaseDialectCodes.RDS_MULTI_AZ_PG, new RdsMultiAZClusterPgDatabaseDialect()]
+  [DatabaseDialectCodes.RDS_MULTI_AZ_PG, new RdsMultiAZClusterPgDatabaseDialect()],
+  [DatabaseDialectCodes.GLOBAL_AURORA_PG, new GlobalAuroraPgDatabaseDialect()]
 ]);
 
 const MYSQL_QUERY = "SHOW VARIABLES LIKE 'version_comment'";
@@ -287,6 +291,8 @@ describe("test database dialects", () => {
 
     const mockClientWrapper: ClientWrapper = new PgClientWrapper(mockTargetClient, currentHostInfo, new Map<string, any>());
     const pluginService = new PluginServiceImpl(fullServicesContainer, mockClient, databaseType, expectedDialect!.dialects, props, mockDriverDialect);
+    fullServicesContainer.hostListProviderService = pluginService;
+    fullServicesContainer.pluginService = pluginService;
     await pluginService.updateDialect(mockClientWrapper);
     expect(pluginService.getDialect()).toBe(expectedDialectClass);
   });
diff --git a/tests/unit/failover2_plugin.test.ts b/tests/unit/failover2_plugin.test.ts
@@ -40,6 +40,7 @@ import { MySQLClientWrapper } from "../../common/lib/mysql_client_wrapper";
 import { MySQL2DriverDialect } from "../../mysql/lib/dialect/mysql2_driver_dialect";
 import { DriverDialect } from "../../common/lib/driver_dialect/driver_dialect";
 import { Failover2Plugin } from "../../common/lib/plugins/failover2/failover2_plugin";
+import { FullServicesContainer } from "../../common/lib/utils/full_services_container";
 
 const builder = new HostInfoBuilder({ hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy() });
 
@@ -57,7 +58,10 @@ const properties: Map<string, any> = new Map();
 let plugin: Failover2Plugin;
 
 function initializePlugin(mockPluginServiceInstance: PluginService): void {
-  plugin = new Failover2Plugin(mockPluginServiceInstance, properties, new RdsUtils());
+  const mockContainer = {
+    pluginService: mockPluginServiceInstance
+  } as unknown as FullServicesContainer;
+  plugin = new Failover2Plugin(mockContainer, properties, new RdsUtils());
 }
 
 describe("reader failover handler", () => {
diff --git a/tests/unit/rds_host_list_provider.test.ts b/tests/unit/rds_host_list_provider.test.ts
diff --git a/tests/unit/sliding_expiration_cache.test.ts b/tests/unit/sliding_expiration_cache.test.ts
diff --git a/tests/unit/stale_dns_helper.test.ts b/tests/unit/stale_dns_helper.test.ts

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin implements`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`logger.debug(Messages.get("AwsSecretsManagerConnectionPlugin.unhandledError", error.name, error.message));`
	`144`	`+ throw error;`
`144`	`145`	`}`
`145`	`146`	`}`
`146`	`147`
Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,7 @@ export interface TopologyAwareDatabaseDialect {`
`34`	`34`	`export interface GlobalAuroraTopologyDialect extends TopologyAwareDatabaseDialect {`
`35`	`35`	`getRegionByInstanceId(targetClient: ClientWrapper, instanceId: string): Promise<string \| null>;`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+export function isDialectTopologyAware(dialect: any): dialect is TopologyAwareDatabaseDialect {`
	`39`	`+ return dialect;`
	`40`	`+}`