From 7e44c71f7789430be49ae50063f363be01fdf579 Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Fri, 17 Oct 2025 11:25:23 +0000
Subject: [PATCH] Change the method to count test results

---
 modules/ui/src/app/mocks/testrun.mock.ts      |  2 +-
 .../testrun-status-card.component.spec.ts     |  2 +-
 .../testrun-status-card.component.ts          | 32 +++++++++----------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/modules/ui/src/app/mocks/testrun.mock.ts b/modules/ui/src/app/mocks/testrun.mock.ts
index 2064ba394..023dfb300 100644
--- a/modules/ui/src/app/mocks/testrun.mock.ts
+++ b/modules/ui/src/app/mocks/testrun.mock.ts
@@ -130,7 +130,7 @@ export const MOCK_PROGRESS_DATA_COMPLIANT: TestrunStatus =
   PROGRESS_DATA_RESPONSE(
     StatusOfTestrun.Complete,
     '2023-06-22T09:20:00.123Z',
-    TEST_DATA_RESULT,
+    TEST_DATA,
     'https://api.testrun.io/report.pdf',
     ResultOfTestrun.Compliant
   );
diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
index 2961577ae..2fdedcda7 100644
--- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
@@ -152,7 +152,7 @@ describe('ProgressStatusCardComponent', () => {
       });
 
       it('should return correct test result if status "Compliant"', () => {
-        const expectedResult = '2/3';
+        const expectedResult = '2/26';
 
         const result = component.getTestsResult(MOCK_PROGRESS_DATA_COMPLIANT);
 
diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
index a3458244e..efdb624ac 100644
--- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
+++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
@@ -15,7 +15,6 @@
  */
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import {
-  IResult,
   ResultOfTestrun,
   StatusOfTestResult,
   StatusOfTestrun,
@@ -97,17 +96,9 @@ export class TestrunStatusCardComponent {
       data.status === StatusOfTestrun.Stopping ||
       data.finished
     ) {
-      if (
-        (data.tests as TestsData)?.results?.length &&
-        (data.tests as TestsData)?.total
-      ) {
-        return `${(data.tests as TestsData)?.results?.filter(result => result.result !== StatusOfTestResult.NotStarted && result.result !== StatusOfTestResult.Error).length}/${
-          (data.tests as TestsData)?.total
-        }`;
-      } else if ((data.tests as IResult[])?.length) {
-        return `${(data.tests as IResult[])?.filter(result => result.result !== StatusOfTestResult.NotStarted && result.result !== StatusOfTestResult.Error).length}/${
-          (data.tests as IResult[])?.length
-        }`;
+      const testData = data.tests as TestsData;
+      if (testData && testData.total && testData.results?.length) {
+        return `${this.getTestsExecuted(testData)}/${testData.total}`;
       }
     }
     return '-/-';
@@ -150,13 +141,20 @@ export class TestrunStatusCardComponent {
 
     if (testData && testData.total && testData.results?.length) {
       return Math.round(
-        (testData.results.filter(
-          result => result.result !== StatusOfTestResult.NotStarted
-        ).length /
-          testData.total) *
-          100
+        (this.getTestsExecuted(testData) / testData.total) * 100
       );
     }
     return 0;
   }
+
+  private getTestsExecuted(testData: TestsData) {
+    if (testData && testData.results) {
+      return testData.results.filter(
+        result =>
+          result.result !== StatusOfTestResult.NotStarted &&
+          result.result !== StatusOfTestResult.Error
+      ).length;
+    }
+    return 0;
+  }
 }