Tweaks for Policy Control UI
[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / services / ei / ei.service.spec.ts
index 5bf7d3d..13d8698 100644 (file)
@@ -20,7 +20,7 @@
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'
 import { TestBed } from '@angular/core/testing';
 
-import { EIJob, ProducerStatus, OperationalState, ProducerRegistrationInfo } from '../../interfaces/ei.types';
+import { EIJob, ProducerStatus, OperationalState, ProducerRegistrationInfo } from '@interfaces/ei.types';
 import { EIService } from './ei.service';
 
 describe('EIService', () => {
@@ -38,17 +38,17 @@ describe('EIService', () => {
   }));
 
   it('should be created', () => {
-    service = TestBed.get(EIService);
+    service = TestBed.inject(EIService);
     expect(service).toBeTruthy();
   });
 
   describe('#getProducerIds', () => {
-    let expectedEIProducerIds: String[];
+    let expectedEIProducerIds: string[];
 
     beforeEach(() => {
-      service = TestBed.get(EIService);
-      httpTestingController = TestBed.get(HttpTestingController);
-      expectedEIProducerIds = [ 'producer1', 'producer2' ] as String[];
+      service = TestBed.inject(EIService);
+      httpTestingController = TestBed.inject(HttpTestingController);
+      expectedEIProducerIds = [ 'producer1', 'producer2' ] as string[];
     });
 
   it('should return all producer IDs', () => {
@@ -70,8 +70,8 @@ describe('EIService', () => {
     let expectedEIJobs: EIJob[];
 
     beforeEach(() => {
-      service = TestBed.get(EIService);
-      httpTestingController = TestBed.get(HttpTestingController);
+      service = TestBed.inject(EIService);
+      httpTestingController = TestBed.inject(HttpTestingController);
       expectedEIJobs = [
         { ei_job_identity: '1', ei_job_data: 'data', ei_type_identity: 'Type ID 1',  target_uri: 'hhtp://url', owner: 'owner'},
         { ei_job_identity: '2', ei_job_data: 'EI Job 2', ei_type_identity: 'Type ID 2',  target_uri: 'hhtp://url', owner: 'owner'}
@@ -97,8 +97,8 @@ describe('EIService', () => {
     let expectedProducer: ProducerRegistrationInfo;
 
     beforeEach(() => {
-      service = TestBed.get(EIService);
-      httpTestingController = TestBed.get(HttpTestingController);
+      service = TestBed.inject(EIService);
+      httpTestingController = TestBed.inject(HttpTestingController);
       expectedProducer = {
         supported_ei_types: [ 'type1', 'type2' ]
       } as ProducerRegistrationInfo;
@@ -123,10 +123,10 @@ describe('EIService', () => {
     let expectedProducerStatus: ProducerStatus;
 
     beforeEach(() => {
-      service = TestBed.get(EIService);
-      httpTestingController = TestBed.get(HttpTestingController);
+      service = TestBed.inject(EIService);
+      httpTestingController = TestBed.inject(HttpTestingController);
       expectedProducerStatus = {
-        opState: OperationalState.ENABLED
+        operational_state: OperationalState.ENABLED
       } as ProducerStatus;
     });