WIP: fix build errors in unit tests

pagopa · Jun 5, 2024 · 081a60d · 081a60d
1 parent 52fa22e
commit 081a60d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/HandleNHCreateOrUpdateInstallationCallActivity/__tests__/handler.test.ts b/HandleNHCreateOrUpdateInstallationCallActivity/__tests__/handler.test.ts
@@ -7,14 +7,14 @@ import {
   ActivityResultSuccess
 } from "../handler";
 
-import * as azure from "azure-sb";
 import { PlatformEnum } from "../../generated/notifications/Platform";
 import { CreateOrUpdateInstallationMessage } from "../../generated/notifications/CreateOrUpdateInstallationMessage";
 
 import { NotificationHubConfig } from "../../utils/notificationhubServicePartition";
 
 import { envConfig } from "../../__mocks__/env-config.mock";
 import { createActivity } from "../../utils/durable/activities";
+import { NotificationHubsClient } from "@azure/notification-hubs";
 
 const activityName = "any";
 
@@ -41,7 +41,7 @@ const mockNotificationHubService = {
 const mockBuildNHService = jest
   .fn()
   .mockImplementation(
-    _ => (mockNotificationHubService as unknown) as azure.NotificationHubService
+    _ => (mockNotificationHubService as unknown) as NotificationHubsClient
   );
 
 const handler = createActivity(

diff --git a/HandleNHDeleteInstallationCallActivity/__tests__/handler.test.ts b/HandleNHDeleteInstallationCallActivity/__tests__/handler.test.ts
@@ -1,5 +1,3 @@
-// tslint:disable:no-any
-
 import { NonEmptyString } from "@pagopa/ts-commons/lib/strings";
 import { context as contextMock } from "../../__mocks__/durable-functions";
 import {
@@ -8,15 +6,14 @@ import {
   ActivityResultSuccess
 } from "../handler";
 
-import * as azure from "azure-sb";
-
 import { envConfig } from "../../__mocks__/env-config.mock";
 import { NotificationHubConfig } from "../../utils/notificationhubServicePartition";
 import {
   ActivityResultFailure,
   createActivity
 } from "../../utils/durable/activities";
-import { activityName } from "..";
+import { activityName } from "../";
+import { NotificationHubsClient } from "@azure/notification-hubs";
 
 const aFiscalCodeHash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" as NonEmptyString;
 
@@ -33,7 +30,7 @@ const mockNotificationHubService = {
 const mockBuildNHService = jest
   .fn()
   .mockImplementation(
-    _ => (mockNotificationHubService as unknown) as azure.NotificationHubService
+    _ => (mockNotificationHubService as unknown) as NotificationHubsClient
   );
 
 const handler = createActivity(

diff --git a/HandleNHNotifyMessageCallActivity/__tests__/handler.test.ts b/HandleNHNotifyMessageCallActivity/__tests__/handler.test.ts
@@ -1,6 +1,6 @@
 // tslint:disable:no-any
 
-import { FiscalCode, NonEmptyString } from "@pagopa/ts-commons/lib/strings";
+import { NonEmptyString } from "@pagopa/ts-commons/lib/strings";
 import { context as contextMock } from "../../__mocks__/durable-functions";
 import {
   ActivityInput,
@@ -9,14 +9,14 @@ import {
 } from "../handler";
 import { ActivityInput as NHServiceActivityInput } from "../handler";
 
-import * as azure from "azure-sb";
 import { NotifyMessage } from "../../generated/notifications/NotifyMessage";
 
 import { envConfig } from "../../__mocks__/env-config.mock";
 import { createActivity } from "../../utils/durable/activities";
 import { TelemetryClient } from "applicationinsights";
 import { NotificationHubConfig } from "../../utils/notificationhubServicePartition";
 import { toSHA256 } from "../../utils/conversions";
+import { NotificationHubsClient } from "@azure/notification-hubs";
 
 const aFiscalCodeHash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" as NonEmptyString;
 
@@ -45,7 +45,7 @@ const mockNotificationHubService = {
 const mockBuildNHService = jest
   .fn()
   .mockImplementation(
-    _ => (mockNotificationHubService as unknown) as azure.NotificationHubService
+    _ => (mockNotificationHubService as unknown) as NotificationHubsClient
   );
 
 const activityName = "any";

diff --git a/HandleNHNotifyMessageCallActivityQueue/__tests__/handler.test.ts b/HandleNHNotifyMessageCallActivityQueue/__tests__/handler.test.ts
@@ -1,6 +1,5 @@
 import { NonEmptyString } from "@pagopa/ts-commons/lib/strings";
 
-import * as azure from "azure-sb";
 import { NotifyMessage } from "../../generated/notifications/NotifyMessage";
 
 import { envConfig } from "../../__mocks__/env-config.mock";
@@ -9,6 +8,7 @@ import { NotificationHubConfig } from "../../utils/notificationhubServicePartiti
 import { toSHA256 } from "../../utils/conversions";
 import { handle } from "../handler";
 import * as NSP from "../../utils/notificationhubServicePartition";
+import { NotificationHubsClient } from "@azure/notification-hubs";
 
 const aFiscalCodeHash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" as NonEmptyString;
 
@@ -42,8 +42,7 @@ const mockNotificationHubService = {
 const buildNHService = jest
   .spyOn(NSP, "buildNHService")
   .mockImplementation(
-    () =>
-      (mockNotificationHubService as unknown) as azure.NotificationHubService
+    () => (mockNotificationHubService as unknown) as NotificationHubsClient
   );
 
 const aNotifyMessageToBlacklistedUser: NotifyMessage = {

diff --git a/utils/__tests__/healthcheck.test.ts b/utils/__tests__/healthcheck.test.ts
@@ -2,22 +2,22 @@ import { envConfig } from "../../__mocks__/env-config.mock";
 
 import { checkAzureNotificationHub } from "../healthcheck";
 
-import * as azure from "azure-sb";
 import { pipe } from "fp-ts/lib/function";
 
 import * as TE from "fp-ts/lib/TaskEither";
+import { NotificationHubsClient } from "@azure/notification-hubs";
 
 const notificationhubServicePartition = require("../notificationhubServicePartition");
 
 const mockNotificationHubServiceKO = ({
   deleteInstallation: jest.fn((_, callback) =>
     callback(Error("An error occurred"), null)
   )
-} as unknown) as azure.NotificationHubService;
+} as unknown) as NotificationHubsClient;
 
 const mockNotificationHubServiceOK = ({
   deleteInstallation: jest.fn((_, callback) => callback(null, null))
-} as unknown) as azure.NotificationHubService;
+} as unknown) as NotificationHubsClient;
 const mockBuildNHService = jest
   .fn()
   .mockReturnValue(mockNotificationHubServiceOK);