Merge pull request #315 from recca0120/fix/test-result-without-details

fix without details

Author: recca0120

package.json

@@ -4,7 +4,7 @@
   "displayName": "PHPUnit Test Explorer",
   "icon": "img/icon.png",
   "publisher": "recca0120",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "private": true,
   "license": "MIT",
   "repository": {

src/PHPUnit/ProblemMatcher/PHPUnitProblemMatcher.test.ts

@@ -235,4 +235,50 @@ describe('PHPUnit ProblemMatcher Text', () => {
             }),
         );
     });
+
+    fit('fix PHPUnit 10 without details', () => {
+        const contents = [
+            `##teamcity[testSuiteStarted name='Tests\\Feature\\ChatControllerTest' locationHint='php_qn:///var/www/html/tests/Feature/ChatControllerTest.php::\\Tests\\Feature\\ChatControllerTest' flowId='22946']`,
+            `##teamcity[testIgnored name='test_permission' message='ChatControllerTest uses PlayerService' duration='0' flowId='22946']`,
+            `##teamcity[testIgnored name='test_grant_chat_token' message='ChatControllerTest uses PlayerService' duration='57' flowId='22946']`,
+            `##teamcity[testIgnored name='test_grant_chat_token_with_channels' message='ChatControllerTest uses PlayerService' duration='116' flowId='22946']`,
+            `##teamcity[testIgnored name='test_grant_chat_token_missing_token_without_ttl' message='ChatControllerTest uses PlayerService' duration='171' flowId='22946']`,
+            `##teamcity[testSuiteFinished name='Tests\\Feature\\ChatControllerTest' flowId='22946']`,
+        ];
+
+        problemMatcher.parse(contents[0]);
+        expect(problemMatcher.parse(contents[1])).toEqual(
+            expect.objectContaining({
+                event: TeamcityEvent.testIgnored,
+                name: 'test_permission',
+                locationHint: 'php_qn:///var/www/html/tests/Feature/ChatControllerTest.php::test_permission',
+                flowId: 22946,
+                id: '/var/www/html/tests/Feature/ChatControllerTest.php::test_permission',
+                file: '/var/www/html/tests/Feature/ChatControllerTest.php',
+                message: 'ChatControllerTest uses PlayerService',
+                details: [{
+                    file: '/var/www/html/tests/Feature/ChatControllerTest.php',
+                    line: 1,
+                }],
+                duration: 0,
+            }),
+        );
+
+        expect(problemMatcher.parse(contents[2])).toEqual(
+            expect.objectContaining({
+                event: TeamcityEvent.testIgnored,
+                name: 'test_grant_chat_token',
+                locationHint: 'php_qn:///var/www/html/tests/Feature/ChatControllerTest.php::test_grant_chat_token',
+                flowId: 22946,
+                id: '/var/www/html/tests/Feature/ChatControllerTest.php::test_grant_chat_token',
+                file: '/var/www/html/tests/Feature/ChatControllerTest.php',
+                message: 'ChatControllerTest uses PlayerService',
+                details: [{
+                    file: '/var/www/html/tests/Feature/ChatControllerTest.php',
+                    line: 1,
+                }],
+                duration: 0,
+            }),
+        );
+    });
 });

src/PHPUnit/ProblemMatcher/ProblemMatcher.ts

@@ -2,7 +2,7 @@ import {
     TeamcityEvent, TestFailed, TestFinished, TestIgnored, TestResult, TestResultParser, TestStarted, TestSuiteFinished,
     TestSuiteStarted,
 } from '.';
-import { PestV1Fixer } from '../Transformer';
+import { PestV1Fixer, PHPUnitFixer } from '../Transformer';
 
 export class ProblemMatcher {
     private results = new Map<string, TestResult>();
@@ -41,6 +41,7 @@ export class ProblemMatcher {
         let prevData = this.results.get(id) as (TestFailed | TestIgnored);
 
         if (!prevData) {
+            PHPUnitFixer.fixDetails(this.results, testResult);
             const file = testResult.details[0].file;
 
             return { ...testResult, id: [file, testResult.name].join('::'), file, duration: 0 };

src/PHPUnit/Transformer/PHPUnitTransformer.ts

@@ -1,7 +1,47 @@
+import { TeamcityEvent, TestResult, TestStarted, TestSuiteStarted } from '../ProblemMatcher';
 import { TestDefinition, TestType } from '../types';
 import { capitalize, snakeCase, titleCase } from '../utils';
 import { Transformer } from './Transformer';
 
+export class PHPUnitFixer {
+    static fixDetails(results = new Map<string, TestResult>(), testResult: TestResult & {
+        name: string,
+        locationHint?: string,
+        file?: string,
+        details?: Array<{ file: string, line: number }>,
+    }) {
+        if (testResult.details && testResult.file) {
+            return testResult;
+        }
+
+        const result = Array.from(results.values()).reverse().find((result) => {
+            return [TeamcityEvent.testSuiteStarted, TeamcityEvent.testStarted].includes(result.event);
+        }) as (TestSuiteStarted | TestStarted | undefined);
+
+        if (!result) {
+            return testResult;
+        }
+
+        const file = result.file!;
+        if (!testResult.file) {
+            testResult.file = file;
+        }
+
+        if (!testResult.details) {
+            testResult.details = [{ file: file, line: 1 }];
+        }
+
+        if (!testResult.locationHint) {
+            const locationHint = result.locationHint?.split('::').slice(0, 1).join('::');
+            testResult.locationHint = [locationHint, testResult.name]
+                .filter(value => !!value)
+                .join('::');
+        }
+
+        return testResult;
+    }
+}
+
 export class PHPUnitTransformer extends Transformer {
     uniqueId(testDefinition: Pick<TestDefinition, 'type' | 'classFQN' | 'methodName' | 'annotations'>): string {
         let { type, classFQN } = testDefinition;