Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/ui/src/app/model/testrun-status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export enum StatusOfTestrun {
SmartReady = 'Smart Ready', // used for Completed
Idle = 'Idle',
Monitoring = 'Monitoring',
Error = 'Error',
}

export enum StatusOfTestResult {
Expand All @@ -69,7 +70,7 @@ export enum StatusOfTestResult {
CompliantHigh = 'Compliant (High)',
SmartReady = 'Smart Ready',
NonCompliant = 'Non-Compliant', // device does not support feature but feature is required
Skipped = 'Skipped',
NotPresent = 'Feature Not Present',
NotStarted = 'Not Started',
InProgress = 'In Progress',
Error = 'Error', // test failed to run
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ describe('ProgressStatusCardComponent', () => {
StatusOfTestrun.CompliantHigh,
];

const statusesForCompletedFailedClass = [
StatusOfTestrun.NonCompliant,
StatusOfTestrun.Error,
];

statusesForProgressClass.forEach(testCase => {
it(`should have class "progress" if status "${testCase}"`, () => {
const expectedResult = { ...availableClasses, progress: true };
Expand All @@ -90,15 +95,17 @@ describe('ProgressStatusCardComponent', () => {
});
});

it('should have class "completed-failed" if status "Non Compliant"', () => {
const expectedResult = {
...availableClasses,
'completed-failed': true,
};
statusesForCompletedFailedClass.forEach(testCase => {
it(`should have class "completed-failed" if status "${testCase}"`, () => {
const expectedResult = {
...availableClasses,
'completed-failed': true,
};

const result = component.getClass(StatusOfTestrun.NonCompliant);
const result = component.getClass(testCase);

expect(result).toEqual(expectedResult);
expect(result).toEqual(expectedResult);
});
});

it('should have class "canceled" if status "Cancelled"', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ export class ProgressStatusCardComponent {
status === StatusOfTestrun.CompliantLimited ||
status === StatusOfTestrun.CompliantHigh ||
status === StatusOfTestrun.SmartReady,
'completed-failed': status === StatusOfTestrun.NonCompliant,
'completed-failed':
status === StatusOfTestrun.NonCompliant ||
status === StatusOfTestrun.Error,
canceled:
status === StatusOfTestrun.Cancelled ||
status === StatusOfTestrun.Cancelling,
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/src/app/services/test-run.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ describe('TestRunService', () => {
];

const statusesForGreyRes = [
StatusOfTestResult.Skipped,
StatusOfTestResult.NotPresent,
StatusOfTestResult.NotStarted,
];

Expand Down
2 changes: 1 addition & 1 deletion modules/ui/src/app/services/test-run.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export class TestRunService {
result === StatusOfTestResult.Info ||
result === StatusOfTestResult.InProgress,
grey:
result === StatusOfTestResult.Skipped ||
result === StatusOfTestResult.NotPresent ||
result === StatusOfTestResult.NotStarted,
};
}
Expand Down