X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-producer.datasource.spec.ts;h=d1f22e2e2b8def535e775a70f791a6f76c4041ff;hb=b3f060ed6175d6dab20e16f51cb96a8ed02a6fc2;hp=107daae2168b37d72db8e85ba840bc7ba5c9aa1a;hpb=d438de53c446413c5c3152fdfee1578a304f484e;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.spec.ts b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.spec.ts
index 107daae..d1f22e2 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.spec.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.spec.ts
@@ -18,10 +18,9 @@
  * ========================LICENSE_END===================================
  */
 import { TestBed } from '@angular/core/testing';
-import { BehaviorSubject, of } from 'rxjs';
+import { of } from 'rxjs';
 
 import { EIService } from '../services/ei/ei.service';
-import { NotificationService } from '../services/ui/notification.service';
 import { ToastrModule } from 'ngx-toastr';
 import { EIProducer, OperationalState, ProducerRegistrationInfo, ProducerStatus } from '../interfaces/ei.types';
 import { EIProducerDataSource } from './ei-producer.datasource';
@@ -31,54 +30,52 @@ describe('EIProducerDataSource', () => {
     let eiServiceSpy: any;
 
     let producer1 = {
-        supported_ei_types: [ 'type1', 'type2' ]
+        supported_ei_types: ['type1', 'type2']
     } as ProducerRegistrationInfo;
     let producer2 = {
-        supported_ei_types: [ 'type3', 'type4' ]
+        supported_ei_types: ['type3', 'type4']
     } as ProducerRegistrationInfo;
     let producerStatus1 = {
-        opState: OperationalState.ENABLED
+        operational_state: OperationalState.ENABLED
     } as ProducerStatus;
     let producerStatus2 = {
-        opState: OperationalState.DISABLED
+        operational_state: OperationalState.DISABLED
     } as ProducerStatus;
 
     let expectedProducer1 = {
         ei_producer_id: 'producer1',
-        ei_producer_types: [ 'type1', 'type2' ],
+        ei_producer_types: ['type1', 'type2'],
         status: 'ENABLED'
     } as EIProducer;
     let expectedProducer2 = {
         ei_producer_id: 'producer2',
-        ei_producer_types: [ 'type3', 'type4' ],
+        ei_producer_types: ['type3', 'type4'],
         status: 'DISABLED'
     } as EIProducer;
 
     beforeEach(() => {
         eiServiceSpy = jasmine.createSpyObj('EIService', ['getProducerIds', 'getProducer', 'getProducerStatus']);
 
-        eiServiceSpy.getProducerIds.and.returnValue(of([ 'producer1', 'producer2']));
+        eiServiceSpy.getProducerIds.and.returnValue(of(['producer1', 'producer2']));
         eiServiceSpy.getProducer.and.returnValues(of(producer1), of(producer2));
         eiServiceSpy.getProducerStatus.and.returnValues(of(producerStatus1), of(producerStatus2));
         TestBed.configureTestingModule({
             imports: [ToastrModule.forRoot()],
             providers: [
-                { provide: EIService, useValue: eiServiceSpy },
-                NotificationService
+                { provide: EIService, useValue: eiServiceSpy }
             ]
         });
     });
 
     it('should create', () => {
-        dataSource = TestBed.get(EIProducerDataSource);
+        dataSource = TestBed.inject(EIProducerDataSource);
         expect(dataSource).toBeTruthy();
     });
 
     it('#loadProducers', () => {
         dataSource.loadProducers();
-        const jobsSubject: BehaviorSubject<EIProducer[]> = dataSource.producerSubject;
-        const value = jobsSubject.getValue();
-        expect(value).toEqual([ expectedProducer1, expectedProducer2 ]);
+        const actualProducers: EIProducer[] = dataSource.eiProducers();
+        expect(actualProducers).toEqual([expectedProducer1, expectedProducer2]);
         expect(dataSource.rowCount).toEqual(2);
     });
 });