Code Review
/
portal
/
nonrtric-controlpanel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updated Control Panel for changed ECS NBI
[portal/nonrtric-controlpanel.git]
/
webapp-frontend
/
src
/
app
/
ei-coordinator
/
jobs-list
/
jobs-list.component.spec.ts
diff --git
a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
index
e76f20b
..
f5021df
100644
(file)
--- a/
webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
+++ b/
webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.spec.ts
@@
-41,8
+41,8
@@
import { MatTableModule } from "@angular/material/table";
import { MatTableHarness } from "@angular/material/table/testing";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { of } from "rxjs/observable/of";
import { MatTableHarness } from "@angular/material/table/testing";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { of } from "rxjs/observable/of";
-import {
EIJob } from "@interfaces/ei
.types";
-import {
EIService } from "@services/ei/ei
.service";
+import {
JobInfo } from "@interfaces/producer
.types";
+import {
ProducerService } from "@services/ei/producer
.service";
import { UiService } from "@services/ui/ui.service";
import { Job, JobsListComponent } from "./jobs-list.component";
import { UiService } from "@services/ui/ui.service";
import { Job, JobsListComponent } from "./jobs-list.component";
@@
-51,18
+51,18
@@
import { Subscription } from "rxjs";
let component: JobsListComponent;
let fixture: ComponentFixture<JobsListComponent>;
let component: JobsListComponent;
let fixture: ComponentFixture<JobsListComponent>;
-const
eijob
1 = {
-
ei
_job_identity: "job1",
-
ei
_type_identity: "type1",
+const
jobInfo
1 = {
+
info
_job_identity: "job1",
+
info
_type_identity: "type1",
owner: "owner1",
target_uri: "http://one",
owner: "owner1",
target_uri: "http://one",
-} as
EIJob
;
-const
eijob
2 = {
-
ei
_job_identity: "job2",
-
ei
_type_identity: "type2",
+} as
JobInfo
;
+const
jobInfo
2 = {
+
info
_job_identity: "job2",
+
info
_type_identity: "type2",
owner: "owner2",
target_uri: "http://two",
owner: "owner2",
target_uri: "http://two",
-} as
EIJob
;
+} as
JobInfo
;
const job1 = {
jobId: "job1",
const job1 = {
jobId: "job1",
@@
-115,7
+115,7
@@
describe("JobsListComponent", () => {
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [JobsListComponent],
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [JobsListComponent],
- providers: [{ provide:
EI
Service, useValue: spy }, UiService],
+ providers: [{ provide:
Producer
Service, useValue: spy }, UiService],
})
.compileComponents()
.then(() => {
})
.compileComponents()
.then(() => {
@@
-238,18
+238,18
@@
describe("JobsListComponent", () => {
it("should display default values for non required properties ", fakeAsync(() => {
const jobMissingProperties = {
it("should display default values for non required properties ", fakeAsync(() => {
const jobMissingProperties = {
-
ei
_job_identity: "job1",
-
ei
_job_data: {
+
info
_job_identity: "job1",
+
info
_job_data: {
jobparam2: "value2_job2",
jobparam3: "value3_job2",
jobparam1: "value1_job2",
},
target_uri: "http://one",
jobparam2: "value2_job2",
jobparam3: "value3_job2",
jobparam1: "value1_job2",
},
target_uri: "http://one",
- } as
EIJob
;
+ } as
JobInfo
;
- let
eiServiceSpy = TestBed.inject(EIService) as jasmine.SpyObj<EI
Service>;
-
ei
ServiceSpy.getProducerIds.and.returnValue(of(["producer1"]));
-
ei
ServiceSpy.getJobsForProducer.and.returnValue(
+ let
producerServiceSpy = TestBed.inject(ProducerService) as jasmine.SpyObj<Producer
Service>;
+
producer
ServiceSpy.getProducerIds.and.returnValue(of(["producer1"]));
+
producer
ServiceSpy.getJobsForProducer.and.returnValue(
of([jobMissingProperties])
);
of([jobMissingProperties])
);
@@
-525,14
+525,14
@@
describe("JobsListComponent", () => {
describe("#paging", () => {
it("should work properly on the table", fakeAsync(() => {
describe("#paging", () => {
it("should work properly on the table", fakeAsync(() => {
- let
ei
ServiceSpy = TestBed.inject(
-
EI
Service
- ) as jasmine.SpyObj<
EI
Service>;
-
ei
ServiceSpy.getProducerIds.and.returnValue(
+ let
producer
ServiceSpy = TestBed.inject(
+
Producer
Service
+ ) as jasmine.SpyObj<
Producer
Service>;
+
producer
ServiceSpy.getProducerIds.and.returnValue(
of(["producer1", "producer2"])
);
of(["producer1", "producer2"])
);
-
ei
ServiceSpy.getJobsForProducer.and.returnValue(
- of([
eijob1, eijob2, eijob
1])
+
producer
ServiceSpy.getJobsForProducer.and.returnValue(
+ of([
jobInfo1, jobInfo2, jobInfo
1])
);
tick(0);
);
tick(0);
@@
-570,7
+570,7
@@
describe("JobsListComponent", () => {
});
function setServiceSpy() {
});
function setServiceSpy() {
- let
eiServiceSpy = TestBed.inject(EIService) as jasmine.SpyObj<EI
Service>;
-
ei
ServiceSpy.getProducerIds.and.returnValue(of(["producer1", "producer2"]));
-
eiServiceSpy.getJobsForProducer.and.returnValue(of([eijob1, eijob
2]));
+ let
producerServiceSpy = TestBed.inject(ProducerService) as jasmine.SpyObj<Producer
Service>;
+
producer
ServiceSpy.getProducerIds.and.returnValue(of(["producer1", "producer2"]));
+
producerServiceSpy.getJobsForProducer.and.returnValue(of([jobInfo1, jobInfo
2]));
}
}