Merge pull request #396 from recca0120/refactor/result-summary

refactor: use parsed result summary and align detail index

Author: recca0120

packages/phpunit/src/Printer/Printer.test.ts

@@ -1,3 +1,4 @@
+import styles from 'ansi-styles';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import { phpUnitProject } from '../../tests/utils';
 import { PHPUnitXML } from '../Configuration/PHPUnitXML';
@@ -918,3 +919,39 @@ describe('Printer inline error display', () => {
         expect(printer.end()).toBeUndefined();
     });
 });
+
+describe('Printer testResultSummary colorizes each status segment', () => {
+    const phpUnitXML = new PHPUnitXML().setRoot(phpUnitProject(''));
+
+    it('colors passed count green when all tests pass', () => {
+        const printer = new Printer(phpUnitXML, resolveFormat('collision'));
+        printer.start();
+
+        const output = printer.testResultSummary({
+            text: '  Tests:    78 passed (85 assertions)',
+            passed: 78,
+            assertions: 85,
+        } as unknown as TestResultSummary);
+
+        expect(output).toContain(`${styles.green.open}78 passed${styles.green.close}`);
+        expect(output).toContain('(85 assertions)');
+    });
+
+    it('colors failed red, skipped yellow, passed green separately', () => {
+        const printer = new Printer(phpUnitXML, resolveFormat('collision'));
+        printer.start();
+
+        const output = printer.testResultSummary({
+            text: '  Tests:    1 failed, 2 skipped, 78 passed (85 assertions)',
+            failed: 1,
+            skipped: 2,
+            passed: 78,
+            assertions: 85,
+        } as unknown as TestResultSummary);
+
+        expect(output).toContain(`${styles.red.open}1 failed${styles.red.close}`);
+        expect(output).toContain(`${styles.yellow.open}2 skipped${styles.yellow.close}`);
+        expect(output).toContain(`${styles.green.open}78 passed${styles.green.close}`);
+        expect(output).toContain('(85 assertions)');
+    });
+});

packages/phpunit/src/Printer/Printer.ts

@@ -185,23 +185,20 @@ export class Printer {
     }
 
     testResultSummary(result: TestResultSummary) {
-        const hasFailures = (result.errors ?? 0) > 0 || (result.failures ?? 0) > 0;
+        const hasFailures = (result.failed ?? result.failures ?? result.errors ?? 0) > 0;
         const countColor = hasFailures
             ? this.style.failed.bind(this.style)
             : this.style.passed.bind(this.style);
 
         const parts: string[] = [];
-        const failedCount = (result.errors ?? 0) + (result.failures ?? 0) + (result.warnings ?? 0);
-        if (failedCount > 0) {
-            parts.push(this.style.failed(`${failedCount} failed`));
+        if ((result.failed ?? 0) > 0) {
+            parts.push(this.style.failed(`${result.failed} failed`));
         }
         if ((result.skipped ?? 0) > 0) {
             parts.push(this.style.ignored(`${result.skipped} skipped`));
         }
-        const passedCount =
-            (result.tests ?? 0) - failedCount - (result.skipped ?? 0) - (result.incomplete ?? 0);
-        if (passedCount > 0) {
-            parts.push(this.style.passed(`${passedCount} passed`));
+        if ((result.passed ?? 0) > 0) {
+            parts.push(this.style.passed(`${result.passed} passed`));
         }
 
         const summary =
@@ -218,6 +215,8 @@ export class Printer {
             'skipped',
             'incomplete',
             'risky',
+            'passed',
+            'failed',
         ] as const;
         const vars: Record<string, string | undefined> = {
             text: result.text.trim(),
@@ -511,11 +510,13 @@ export class Printer {
             return undefined;
         }
 
+        const maxIndexWidth = String(result.details.length).length;
+
         return [
             '',
             ...result.details.map(({ file, line }, index) =>
                 this.interpolate(this.format.error.detail.line, {
-                    index: String(index + 1),
+                    index: String(index + 1).padStart(maxIndexWidth),
                     file: fileFormat(file, line),
                 }),
             ),

packages/phpunit/src/Printer/PrinterForPreset.test.ts

@@ -139,6 +139,8 @@ function runLifecycle(printer: Printer) {
             tests: 4,
             assertions: 4,
             failures: 2,
+            failed: 2,
+            passed: 2,
         } as unknown as TestResultSummary),
     ]);
 }

packages/phpunit/src/TestOutput/PHPUnitTestOutputParser.test.ts

@@ -225,6 +225,8 @@ describe('PHPUnit TestOutputParser Text', () => {
                     skipped: 1,
                     incomplete: 1,
                     risky: 2,
+                    failed: 6,
+                    passed: 11,
                 },
             );
         });

packages/phpunit/src/TestOutput/TeamcityLineParser.test.ts

@@ -393,6 +393,7 @@ describe('TeamcityLineParser', () => {
             event: TeamcityEvent.testResultSummary,
             tests: 1,
             assertions: 1,
+            passed: 1,
             text,
         });
     });
@@ -410,6 +411,8 @@ describe('TeamcityLineParser', () => {
             skipped: 1,
             incomplete: 1,
             risky: 2,
+            failed: 6,
+            passed: 11,
             text,
         });
     });
@@ -423,6 +426,7 @@ describe('TeamcityLineParser', () => {
             assertions: 1,
             phpunitDeprecations: 1,
             risky: 1,
+            passed: 1,
             text,
         });
     });

packages/phpunit/src/TestOutput/TestResultSummaryParser.ts

@@ -44,6 +44,24 @@ export class TestResultSummaryParser implements IParser<TestResultSummary> {
                 : [matched.name2, matched.count2];
             result[this.normalize(name)] = parseInt(count, 10);
         }
+
+        if (result.failed == null && result.tests != null) {
+            const failed = (result.errors ?? 0) + (result.failures ?? 0) + (result.warnings ?? 0);
+            if (failed > 0) {
+                result.failed = failed;
+            }
+        }
+        if (result.passed == null && result.tests != null) {
+            const passed =
+                (result.tests ?? 0) -
+                (result.failed ?? 0) -
+                (result.skipped ?? 0) -
+                (result.incomplete ?? 0);
+            if (passed > 0) {
+                result.passed = passed;
+            }
+        }
+
         return result;
     }
 

packages/phpunit/src/TestOutput/types.ts

@@ -103,6 +103,8 @@ export type TestResultSummary = InfoResult & {
     skipped?: number;
     incomplete?: number;
     risky?: number;
+    passed?: number;
+    failed?: number;
     phpunitDeprecations?: number;
 };