Merge branch 'feat/dot-colors'

Author: recca0120

packages/phpunit/docs/printer-presets.md

@@ -7,6 +7,9 @@ export interface ColorTheme {
     info: string;
     diffExpected: string;
     diffActual: string;
+    failedDot: string;
+    errorDot: string;
+    skippedDot: string;
 }
 
 export const DEFAULT_THEME: ColorTheme = {
@@ -16,6 +19,9 @@ export const DEFAULT_THEME: ColorTheme = {
     info: 'dim',
     diffExpected: 'red',
     diffActual: 'green',
+    failedDot: 'bgRed.white',
+    errorDot: 'red.bold',
+    skippedDot: 'cyan.bold',
 };
 
 type StyleEntry = { open: string; close: string };
@@ -126,6 +132,18 @@ export class AnsiStyle {
         return this.apply('gray', text);
     }
 
+    failedDot(text: string): string {
+        return this.apply(this.theme.failedDot, text);
+    }
+
+    errorDot(text: string): string {
+        return this.apply(this.theme.errorDot, text);
+    }
+
+    skippedDot(text: string): string {
+        return this.apply(this.theme.skippedDot, text);
+    }
+
     diffExpected(text: string): string {
         return this.apply(this.theme.diffExpected, text);
     }

packages/phpunit/src/Printer/AnsiStyle.ts

@@ -791,6 +791,69 @@ describe('Printer suite filtering', () => {
     });
 });
 
+describe('Printer PRESET_PROGRESS dot colors', () => {
+    const phpUnitXML = new PHPUnitXML().setRoot(phpUnitProject(''));
+    const file = phpUnitProject('tests/AssertionsTest.php');
+    const printer = new Printer(phpUnitXML, PRESET_PROGRESS);
+
+    beforeEach(() => printer.start());
+    afterEach(() => printer.close());
+
+    it('failed dot F uses bgRed + white', () => {
+        const output = printer.testFinished({
+            event: TeamcityEvent.testFailed,
+            name: 'test_failed',
+            locationHint: '',
+            flowId: 1,
+            id: 'Foo::test_failed',
+            file,
+            message: 'Failed asserting that false is true.',
+            details: [{ file, line: 27 }],
+            duration: 0,
+        });
+
+        expect(output).toContain('\x1b[41m'); // bgRed
+        expect(output).toContain('\x1b[37m'); // white (fg)
+        expect(output).toContain('F');
+    });
+
+    it('ignored dot S uses cyan + bold', () => {
+        const output = printer.testIgnored({
+            event: TeamcityEvent.testIgnored,
+            name: 'test_skipped',
+            locationHint: '',
+            flowId: 1,
+            id: 'Foo::test_skipped',
+            file,
+            message: 'Skipped.',
+            details: [],
+            duration: 0,
+        });
+
+        expect(output).toContain('\x1b[36m'); // cyan
+        expect(output).toContain('\x1b[1m'); // bold
+        expect(output).toContain('S');
+    });
+
+    it('error dot E uses red + bold (not bgRed)', () => {
+        const output = printer.testFinished({
+            event: TeamcityEvent.testFailed,
+            name: 'test_error',
+            locationHint: '',
+            flowId: 1,
+            id: 'Foo::test_error',
+            file,
+            message: 'RuntimeException: something broke',
+            details: [{ file, line: 10 }],
+            duration: 0,
+        });
+
+        expect(output).toContain('\x1b[31m'); // red
+        expect(output).toContain('\x1b[1m'); // bold
+        expect(output).toContain('E');
+    });
+});
+
 describe('Printer inline error display', () => {
     const phpUnitXML = new PHPUnitXML().setRoot(phpUnitProject(''));
     const file = phpUnitProject('tests/AssertionsTest.php');

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

@@ -152,9 +152,10 @@ export class Printer {
             this.errors.push(result as TestFailed);
         }
 
-        const statusDot = isFailed ? 'F' : '.';
+        const isError = isFailed && this.classify(result as TestFailed) === 'error';
+        const statusDot = isFailed ? (isError ? 'E' : 'F') : '.';
         const template = isFailed ? this.format.failed : this.format.finished;
-        const vars = this.resultVars(result, statusDot);
+        const vars = this.resultVars(result, statusDot, isError);
         const text = this.interpolate(template, vars);
 
         return this.isDotMode ? text : this.line(text);
@@ -370,14 +371,15 @@ export class Printer {
     private resultVars(
         result: TestFinished | TestFailed | TestIgnored,
         statusDot: string,
+        isError = false,
     ): Record<string, string | undefined> {
         const [icon, label] = this.getIcon(result.event);
         const name = this.formatTestName(result);
         const colorize = this.getColorizer(result.event);
         const isFailed = result.event === TeamcityEvent.testFailed;
 
         return {
-            status_dot: colorize(statusDot),
+            status_dot: this.colorizeStatusDot(statusDot, result.event, isError),
             icon: colorize(icon),
             label: colorize(label),
             name: isFailed ? name : this.style.info(name),
@@ -400,6 +402,21 @@ export class Printer {
         return this.style.passed.bind(this.style);
     }
 
+    private colorizeStatusDot(dot: string, event: TeamcityEvent, isError: boolean): string {
+        if (!this.isDotMode) {
+            return this.getColorizer(event)(dot);
+        }
+
+        if (event === TeamcityEvent.testFailed) {
+            return isError ? this.style.errorDot(dot) : this.style.failedDot(dot);
+        }
+        if (event === TeamcityEvent.testIgnored) {
+            return this.style.skippedDot(dot);
+        }
+
+        return this.style.info(dot);
+    }
+
     private infoVars(
         key: keyof IconSet,
         result: { text: string },