fix

Author: recca0120

package.json

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

src/PHPUnit/ProblemMatcher/ProblemMatcher.ts

@@ -5,7 +5,7 @@ import {
 import { PestFixer, PestV1Fixer, PHPUnitFixer } from '../Transformer';
 
 export class ProblemMatcher {
-    private results = new Map<string, TestResult>();
+    private cache = new Map<string, TestResult>();
 
     private lookup: { [p: string]: (result: any) => TestResult | undefined } = {
         [TeamcityEvent.testSuiteStarted]: this.handleStarted,
@@ -19,8 +19,8 @@ export class ProblemMatcher {
     constructor(private testResultParser: TestResultParser = new TestResultParser()) { }
 
     parse(input: string | Buffer): TestResult | undefined {
-        const result = this.testResultParser.parse(input.toString());
-        PestV1Fixer.fixFlowId(this.results, result);
+        let result = this.testResultParser.parse(input.toString());
+        result = PestV1Fixer.fixFlowId(this.cache, result);
 
         return this.isResult(result) ? this.lookup[result!.event]?.call(this, result) : result;
     }
@@ -30,50 +30,50 @@ export class ProblemMatcher {
     }
 
     private handleStarted(testResult: TestSuiteStarted | TestStarted) {
-        const id = this.generateId(testResult);
-        this.results.set(id, testResult);
+        const cacheId = this.cacheId(testResult);
+        this.cache.set(cacheId, testResult);
 
-        return this.results.get(id);
+        return this.cache.get(cacheId);
     }
 
     private handleFault(testResult: TestFailed | TestIgnored): TestResult | undefined {
-        const id = this.generateId(testResult);
-        let prevData = this.results.get(id) as (TestFailed | TestIgnored);
+        const cacheId = this.cacheId(testResult);
+        let prevTestResult = this.cache.get(cacheId) as (TestFailed | TestIgnored);
 
-        if (!prevData) {
-            PHPUnitFixer.fixNoTestStarted(this.results, testResult);
+        if (!prevTestResult) {
+            PHPUnitFixer.fixNoTestStarted(this.cache, testResult);
             PestFixer.fixNoTestStarted(testResult);
 
             return { ...testResult, duration: 0 };
         }
 
-        if (prevData.event === TeamcityEvent.testStarted) {
-            this.results.set(id, { ...(prevData ?? {}), ...testResult });
+        if (prevTestResult.event === TeamcityEvent.testStarted) {
+            this.cache.set(cacheId, { ...(prevTestResult ?? {}), ...testResult });
 
             return;
         }
 
         if (testResult.message) {
-            prevData.message += '\n\n' + testResult.message;
+            prevTestResult.message += '\n\n' + testResult.message;
         }
-        prevData.details.push(...testResult.details);
+        prevTestResult.details.push(...testResult.details);
 
-        this.results.set(id, prevData);
+        this.cache.set(cacheId, prevTestResult);
 
         return undefined;
     }
 
     private handleFinished(testResult: TestSuiteFinished | TestFinished) {
-        const id = this.generateId(testResult);
+        const cacheId = this.cacheId(testResult);
 
-        if (!this.results.has(id)) {
+        if (!this.cache.has(cacheId)) {
             return;
         }
 
-        const prevData = this.results.get(id)!;
-        const event = this.isFault(prevData) ? prevData.event : testResult.event;
-        const result = { ...prevData, ...testResult, event };
-        this.results.delete(id);
+        const prevTestResult = this.cache.get(cacheId)!;
+        const event = this.isFault(prevTestResult) ? prevTestResult.event : testResult.event;
+        const result = { ...prevTestResult, ...testResult, event };
+        this.cache.delete(cacheId);
 
         return result;
     }
@@ -82,7 +82,7 @@ export class ProblemMatcher {
         return [TeamcityEvent.testFailed, TeamcityEvent.testIgnored].includes(testResult.event);
     }
 
-    private generateId(testResult: TestSuiteStarted | TestStarted | TestFailed | TestIgnored | TestSuiteFinished | TestFinished) {
+    private cacheId(testResult: TestSuiteStarted | TestStarted | TestFailed | TestIgnored | TestSuiteFinished | TestFinished) {
         return `${testResult.name}-${testResult.flowId}`;
     }
 }

src/PHPUnit/Transformer/PHPUnitFixer.ts

@@ -1,16 +1,16 @@
 import { TeamcityEvent, TestFailed, TestIgnored, TestResult, TestStarted, TestSuiteStarted } from '../ProblemMatcher';
 import { TransformerFactory } from './TransformerFactory';
 
+
 export class PHPUnitFixer {
-    static fixNoTestStarted(results = new Map<string, TestResult>(), testResult: TestFailed | TestIgnored) {
+    static fixNoTestStarted(cache: Map<string, TestResult>, testResult: TestFailed | TestIgnored) {
+        // {"event":"testFailed","name":"error","message":"Exception: error","details":[{"file":"tests/Fixtures/CollisionTest.php","line":4}],"flowId":68573}
+        // {"event":"testFailed","name":"testProductNeedUpdateReturnsFalseWhenPriceSyncNotEnabled","message":"Error: Class \"App\\Ecommerce\\Offer\\Synchronizer\\PriceSynchronizer\" not found","details":[{"file":"/srv/app/tests/Ecommerce/Offer/Synchronizer/PriceSynchronizerTest.php","line":28}],"duration":0,"flowId":5161}
         if (testResult.id) {
             return testResult;
         }
 
-        const prevTestResult = Array.from(results.values()).reverse().find((result) => {
-            return [TeamcityEvent.testStarted, TeamcityEvent.testSuiteStarted].includes(result.event);
-        }) as (TestSuiteStarted | TestStarted | undefined);
-
+        const prevTestResult = this.getPrevTestResult(cache, testResult);
         if (!prevTestResult) {
             return testResult;
         }
@@ -30,4 +30,26 @@ export class PHPUnitFixer {
 
         return testResult;
     }
+
+    static getPrevTestResult(cache: Map<string, TestResult>, testResult: TestFailed | TestIgnored) {
+        for (const prev of Array.from(cache.values()).reverse()) {
+            if (this.isPhpUnitTestStarted(prev)) {
+                return prev as TestStarted | TestSuiteStarted;
+            }
+
+            if (prev.event !== testResult.event) {
+                break;
+            }
+        }
+
+        return undefined;
+    };
+
+    static isPhpUnitTestStarted(result: TestResult) {
+        if (![TeamcityEvent.testStarted, TeamcityEvent.testSuiteStarted].includes(result.event)) {
+            return false;
+        }
+
+        return /^php_qn/.test((result as TestSuiteStarted | TestStarted).locationHint ?? '');
+    }
 }

src/PHPUnit/Transformer/PestFixer.ts

@@ -31,7 +31,7 @@ export class PestV1Fixer {
         return this.fixDataSet(/^tests\//.test(locationHint) ? locationHint : locationHint.substring(locationHint.lastIndexOf('tests/')));
     }
 
-    static fixFlowId(results = new Map<string, TestResult>(), testResult?: TestResult) {
+    static fixFlowId(cache: Map<string, TestResult>, testResult?: TestResult) {
         if (!testResult) {
             return testResult;
         }
@@ -41,7 +41,7 @@ export class PestV1Fixer {
             return testResult;
         }
 
-        const result = Array.from(results.values()).reverse().find((result: TestResult) => {
+        const result = Array.from(cache.values()).reverse().find((result: TestResult) => {
             if (testResult.event !== TeamcityEvent.testStarted) {
                 return result.event === TeamcityEvent.testStarted && (result as any).name === (testResult as any).name;
             }