Update service providers in unit tests

damienbod · Mar 18, 2024 · d0bce96 · d0bce96
1 parent 6f31e0a
commit d0bce96
Show file tree

Hide file tree

Showing 25 changed files with 113 additions and 242 deletions.
diff --git a/...ular-auth-oidc-client/src/lib/config/auth-well-known/auth-well-known-data.service.spec.ts b/...ular-auth-oidc-client/src/lib/config/auth-well-known/auth-well-known-data.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { createRetriableStream } from '../../../test/create-retriable-stream.helper';
 import { DataService } from '../../api/data.service';
 import { LoggerService } from '../../logging/logger.service';
@@ -33,8 +33,8 @@ describe('AuthWellKnownDataService', () => {
     TestBed.configureTestingModule({
       providers: [
         AuthWellKnownDataService,
-        { provide: DataService, useClass: mockClass(DataService) },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
+        mockProvider(DataService),
+        mockProvider(LoggerService),
       ],
     });
   });

diff --git a/...s/angular-auth-oidc-client/src/lib/config/auth-well-known/auth-well-known.service.spec.ts b/...s/angular-auth-oidc-client/src/lib/config/auth-well-known/auth-well-known.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { EventTypes } from '../../public-events/event-types';
 import { PublicEventsService } from '../../public-events/public-events.service';
 import { StoragePersistenceService } from '../../storage/storage-persistence.service';
@@ -18,14 +18,8 @@ describe('AuthWellKnownService', () => {
       providers: [
         AuthWellKnownService,
         PublicEventsService,
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
-        {
-          provide: AuthWellKnownDataService,
-          useClass: mockClass(AuthWellKnownDataService),
-        },
+        mockProvider(AuthWellKnownDataService),
+        mockProvider(StoragePersistenceService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/config/config.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/config/config.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of } from 'rxjs';
-import { mockClass } from '../../test/auto-mock';
+import { mockClass, mockProvider } from '../../test/auto-mock';
 import { LoggerService } from '../logging/logger.service';
 import { EventTypes } from '../public-events/event-types';
 import { PublicEventsService } from '../public-events/public-events.service';
@@ -25,24 +25,12 @@ describe('Configuration Service', () => {
     TestBed.configureTestingModule({
       providers: [
         ConfigurationService,
-        {
-          provide: LoggerService,
-          useClass: mockClass(LoggerService),
-        },
+        mockProvider(LoggerService),
         PublicEventsService,
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
+        mockProvider(StoragePersistenceService),
         ConfigValidationService,
-        {
-          provide: PlatformProvider,
-          useClass: mockClass(PlatformProvider),
-        },
-        {
-          provide: AuthWellKnownService,
-          useClass: mockClass(AuthWellKnownService),
-        },
+        mockProvider(PlatformProvider),
+        mockProvider(AuthWellKnownService),
         {
           provide: StsConfigLoader,
           useClass: mockClass(StsConfigStaticLoader),

diff --git a/...ects/angular-auth-oidc-client/src/lib/config/validation/config-validation.service.spec.ts b/...ects/angular-auth-oidc-client/src/lib/config/validation/config-validation.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { LogLevel } from '../../logging/log-level';
 import { LoggerService } from '../../logging/logger.service';
 import { OpenIdConfiguration } from '../openid-configuration';
@@ -12,10 +12,7 @@ describe('Config Validation Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        ConfigValidationService,
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-      ],
+      providers: [ConfigValidationService, mockProvider(LoggerService)],
     });
   });
 

diff --git a/...th-oidc-client/src/lib/flows/callback-handling/code-flow-callback-handler.service.spec.ts b/...th-oidc-client/src/lib/flows/callback-handling/code-flow-callback-handler.service.spec.ts
@@ -1,7 +1,7 @@
 import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { createRetriableStream } from '../../../test/create-retriable-stream.helper';
 import { DataService } from '../../api/data.service';
 import { LoggerService } from '../../logging/logger.service';
@@ -23,18 +23,12 @@ describe('CodeFlowCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         CodeFlowCallbackHandlerService,
-        { provide: UrlService, useClass: mockClass(UrlService) },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        {
-          provide: TokenValidationService,
-          useClass: mockClass(TokenValidationService),
-        },
-        { provide: FlowsDataService, useClass: mockClass(FlowsDataService) },
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
-        { provide: DataService, useClass: mockClass(DataService) },
+        mockProvider(UrlService),
+        mockProvider(LoggerService),
+        mockProvider(TokenValidationService),
+        mockProvider(FlowsDataService),
+        mockProvider(StoragePersistenceService),
+        mockProvider(DataService),
       ],
     });
   });

diff --git a/...-client/src/lib/flows/callback-handling/history-jwt-keys-callback-handler.service.spec.ts b/...-client/src/lib/flows/callback-handling/history-jwt-keys-callback-handler.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { AuthStateService } from '../../auth-state/auth-state.service';
 import { LoggerService } from '../../logging/logger.service';
 import { StoragePersistenceService } from '../../storage/storage-persistence.service';
@@ -38,21 +38,12 @@ describe('HistoryJwtKeysCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         HistoryJwtKeysCallbackHandlerService,
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        { provide: AuthStateService, useClass: mockClass(AuthStateService) },
-        { provide: FlowsDataService, useClass: mockClass(FlowsDataService) },
-        {
-          provide: SigninKeyDataService,
-          useClass: mockClass(SigninKeyDataService),
-        },
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
-        {
-          provide: ResetAuthDataService,
-          useClass: mockClass(ResetAuthDataService),
-        },
+        mockProvider(LoggerService),
+        mockProvider(AuthStateService),
+        mockProvider(FlowsDataService),
+        mockProvider(SigninKeyDataService),
+        mockProvider(StoragePersistenceService),
+        mockProvider(ResetAuthDataService),
       ],
     });
   });

diff --git a/...idc-client/src/lib/flows/callback-handling/implicit-flow-callback-handler.service.spec.ts b/...idc-client/src/lib/flows/callback-handling/implicit-flow-callback-handler.service.spec.ts
@@ -1,6 +1,6 @@
 import { DOCUMENT } from '@angular/common';
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { LoggerService } from '../../logging/logger.service';
 import { CallbackContext } from '../callback-context';
 import { FlowsDataService } from '../flows-data.service';
@@ -16,12 +16,9 @@ describe('ImplicitFlowCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         ImplicitFlowCallbackHandlerService,
-        {
-          provide: ResetAuthDataService,
-          useClass: mockClass(ResetAuthDataService),
-        },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        { provide: FlowsDataService, useClass: mockClass(FlowsDataService) },
+        mockProvider(FlowsDataService),
+        mockProvider(ResetAuthDataService),
+        mockProvider(LoggerService),
         {
           provide: DOCUMENT,
           useValue: {

diff --git a/...c-client/src/lib/flows/callback-handling/refresh-session-callback-handler.service.spec.ts b/...c-client/src/lib/flows/callback-handling/refresh-session-callback-handler.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { AuthStateService } from '../../auth-state/auth-state.service';
 import { LoggerService } from '../../logging/logger.service';
 import { CallbackContext } from '../callback-context';
@@ -15,9 +15,9 @@ describe('RefreshSessionCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         RefreshSessionCallbackHandlerService,
-        { provide: AuthStateService, useClass: mockClass(AuthStateService) },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        { provide: FlowsDataService, useClass: mockClass(FlowsDataService) },
+        mockProvider(AuthStateService),
+        mockProvider(LoggerService),
+        mockProvider(FlowsDataService),
       ],
     });
   });

diff --git a/...idc-client/src/lib/flows/callback-handling/refresh-token-callback-handler.service.spec.ts b/...idc-client/src/lib/flows/callback-handling/refresh-token-callback-handler.service.spec.ts
@@ -1,7 +1,7 @@
 import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { createRetriableStream } from '../../../test/create-retriable-stream.helper';
 import { DataService } from '../../api/data.service';
 import { LoggerService } from '../../logging/logger.service';
@@ -19,13 +19,10 @@ describe('RefreshTokenCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         RefreshTokenCallbackHandlerService,
-        { provide: UrlService, useClass: mockClass(UrlService) },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        { provide: DataService, useClass: mockClass(DataService) },
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
+        mockProvider(UrlService),
+        mockProvider(LoggerService),
+        mockProvider(DataService),
+        mockProvider(StoragePersistenceService),
       ],
     });
   });

diff --git a/...-client/src/lib/flows/callback-handling/state-validation-callback-handler.service.spec.ts b/...-client/src/lib/flows/callback-handling/state-validation-callback-handler.service.spec.ts
@@ -1,7 +1,7 @@
 import { DOCUMENT } from '@angular/common';
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { AuthStateService } from '../../auth-state/auth-state.service';
 import { LoggerService } from '../../logging/logger.service';
 import { StateValidationResult } from '../../validation/state-validation-result';
@@ -22,16 +22,10 @@ describe('StateValidationCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         StateValidationCallbackHandlerService,
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        {
-          provide: StateValidationService,
-          useClass: mockClass(StateValidationService),
-        },
-        { provide: AuthStateService, useClass: mockClass(AuthStateService) },
-        {
-          provide: ResetAuthDataService,
-          useClass: mockClass(ResetAuthDataService),
-        },
+        mockProvider(LoggerService),
+        mockProvider(StateValidationService),
+        mockProvider(AuthStateService),
+        mockProvider(ResetAuthDataService),
         {
           provide: DOCUMENT,
           useValue: {

diff --git a/...ar-auth-oidc-client/src/lib/flows/callback-handling/user-callback-handler.service.spec.ts b/...ar-auth-oidc-client/src/lib/flows/callback-handling/user-callback-handler.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of } from 'rxjs';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { AuthStateService } from '../../auth-state/auth-state.service';
 import { LoggerService } from '../../logging/logger.service';
 import { UserService } from '../../user-data/user.service';
@@ -22,14 +22,11 @@ describe('UserCallbackHandlerService', () => {
     TestBed.configureTestingModule({
       providers: [
         UserCallbackHandlerService,
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        { provide: AuthStateService, useClass: mockClass(AuthStateService) },
-        { provide: FlowsDataService, useClass: mockClass(FlowsDataService) },
-        { provide: UserService, useClass: mockClass(UserService) },
-        {
-          provide: ResetAuthDataService,
-          useClass: mockClass(ResetAuthDataService),
-        },
+        mockProvider(LoggerService),
+        mockProvider(AuthStateService),
+        mockProvider(FlowsDataService),
+        mockProvider(UserService),
+        mockProvider(ResetAuthDataService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/flows/flows-data.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/flows/flows-data.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { mockClass } from '../../test/auto-mock';
+import { mockProvider } from '../../test/auto-mock';
 import { LoggerService } from '../logging/logger.service';
 import { StoragePersistenceService } from '../storage/storage-persistence.service';
 import { CryptoService } from '../utils/crypto/crypto.service';
@@ -16,11 +16,8 @@ describe('Flows Data Service', () => {
         FlowsDataService,
         RandomService,
         CryptoService,
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
+        mockProvider(LoggerService),
+        mockProvider(StoragePersistenceService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/flows/random/random.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/flows/random/random.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { mockClass } from '../../../test/auto-mock';
+import { mockProvider } from '../../../test/auto-mock';
 import { LoggerService } from '../../logging/logger.service';
 import { CryptoService } from '../../utils/crypto/crypto.service';
 import { RandomService } from './random.service';
@@ -9,11 +9,7 @@ describe('RandomService Tests', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        RandomService,
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        CryptoService,
-      ],
+      providers: [RandomService, mockProvider(LoggerService), CryptoService],
     });
   });
 

diff --git a/projects/angular-auth-oidc-client/src/lib/flows/reset-auth-data.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/flows/reset-auth-data.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { mockClass } from '../../test/auto-mock';
+import { mockProvider } from '../../test/auto-mock';
 import { AuthStateService } from '../auth-state/auth-state.service';
 import { LoggerService } from '../logging/logger.service';
 import { UserService } from '../user-data/user.service';
@@ -16,10 +16,10 @@ describe('ResetAuthDataService', () => {
     TestBed.configureTestingModule({
       providers: [
         ResetAuthDataService,
-        { provide: AuthStateService, useClass: mockClass(AuthStateService) },
-        { provide: FlowsDataService, useClass: mockClass(FlowsDataService) },
-        { provide: UserService, useClass: mockClass(UserService) },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
+        mockProvider(AuthStateService),
+        mockProvider(FlowsDataService),
+        mockProvider(UserService),
+        mockProvider(LoggerService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/flows/signin-key-data.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/flows/signin-key-data.service.spec.ts
@@ -1,7 +1,7 @@
 import { HttpResponse } from '@angular/common/http';
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { isObservable, of, throwError } from 'rxjs';
-import { mockClass } from '../../test/auto-mock';
+import { mockProvider } from '../../test/auto-mock';
 import { createRetriableStream } from '../../test/create-retriable-stream.helper';
 import { DataService } from '../api/data.service';
 import { LoggerService } from '../logging/logger.service';
@@ -34,12 +34,9 @@ describe('Signin Key Data Service', () => {
     TestBed.configureTestingModule({
       providers: [
         SigninKeyDataService,
-        { provide: DataService, useClass: mockClass(DataService) },
-        { provide: LoggerService, useClass: mockClass(LoggerService) },
-        {
-          provide: StoragePersistenceService,
-          useClass: mockClass(StoragePersistenceService),
-        },
+        mockProvider(DataService),
+        mockProvider(LoggerService),
+        mockProvider(StoragePersistenceService),
       ],
     });
   });