Merge pull request #261 from recca0120/fix/pest-v2-dataset

Fix/pest v2 dataset

package.json

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

src/Observers/Printers/CollisionPrinter.ts

@@ -1,5 +1,5 @@
 import { readFileSync } from 'node:fs';
-import { EOL, TestFailed, TestFinished, TestIgnored, TeamcityEvent, TestSuiteFinished } from '../../PHPUnit';
+import { EOL, TeamcityEvent, TestFailed, TestFinished, TestIgnored, TestSuiteFinished } from '../../PHPUnit';
 import { Printer } from './Printer';
 
 export class CollisionPrinter extends Printer {

src/Observers/Printers/PrettyPrinter.ts

@@ -1,4 +1,4 @@
-import { EOL, TestFailed, TestFinished, TeamcityEvent, TestSuiteFinished } from '../../PHPUnit';
+import { EOL, TeamcityEvent, TestFailed, TestFinished, TestSuiteFinished } from '../../PHPUnit';
 import { Printer } from './Printer';
 
 export class PrettyPrinter extends Printer {

src/Observers/Printers/Printer.ts

@@ -1,5 +1,5 @@
 import {
-    EOL, TestConfiguration, TestDuration, TestFailed, TestFinished, TestProcesses, TestResult, TeamcityEvent,
+    EOL, TeamcityEvent, TestConfiguration, TestDuration, TestFailed, TestFinished, TestProcesses, TestResult,
     TestResultSummary, TestRuntime, TestStarted, TestSuiteFinished, TestSuiteStarted, TestVersion,
 } from '../../PHPUnit';
 

src/Observers/TestResultObserver.ts

@@ -1,8 +1,8 @@
 import { Location, Position, Range, TestItem, TestMessage, TestMessageStackFrame, TestRun } from 'vscode';
 import { URI } from 'vscode-uri';
 import {
-    EOL, TestFailed, TestFinished, TestIgnored, TestResult, TestRunnerObserver, TestStarted, TestSuiteFinished,
-    TestSuiteStarted,
+    EOL, PestTransformer, TestFailed, TestFinished, TestIgnored, TestResult, TestRunnerObserver, TestStarted,
+    TestSuiteFinished, TestSuiteStarted,
 } from '../PHPUnit';
 import { TestCase } from '../TestCollection';
 
@@ -82,7 +82,16 @@ export class TestResultObserver implements TestRunnerObserver {
     private find(result: TestResult) {
         if ('id' in result) {
             for (const [_, testItem] of this.queue) {
-                if (testItem.id === result.id) {
+                if (result.id === testItem.id) {
+                    return testItem;
+                }
+
+                if (!PestTransformer.hasPrefix(result.id)) {
+                    continue;
+                }
+
+                const pestId = PestTransformer.pestId(testItem.id);
+                if (pestId === result.id) {
                     return testItem;
                 }
             }

src/PHPUnit/ProblemMatcher/PestProblemMatcher.test.ts

@@ -484,7 +484,7 @@ describe('Pest ProblemMatcher Text', () => {
         it('pest-v2 data set', () => {
             resultShouldBe(`##teamcity[testSuiteStarted name='Tests\\Unit\\ExampleTest::__pest_evaluable_it_has_emails' locationHint='file://tests/Unit/ExampleTest.php' flowId='57317']`, {
                 event: TeamcityEvent.testSuiteStarted,
-                id: 'tests/Unit/ExampleTest.php::it has emails',
+                id: 'Tests\\Unit\\ExampleTest::__pest_evaluable_it_has_emails',
                 name: 'Tests\\Unit\\ExampleTest::__pest_evaluable_it_has_emails',
                 file: 'tests/Unit/ExampleTest.php',
                 flowId: 57317,
@@ -524,7 +524,7 @@ describe('Pest ProblemMatcher Text', () => {
 
             resultShouldBe(`##teamcity[testSuiteFinished name='Tests\\Unit\\ExampleTest::__pest_evaluable_it_has_emails' flowId='57317']`, {
                 event: TeamcityEvent.testSuiteFinished,
-                id: 'tests/Unit/ExampleTest.php::it has emails',
+                id: 'Tests\\Unit\\ExampleTest::__pest_evaluable_it_has_emails',
                 name: 'Tests\\Unit\\ExampleTest::__pest_evaluable_it_has_emails',
                 file: 'tests/Unit/ExampleTest.php',
                 flowId: 57317,

src/PHPUnit/ProblemMatcher/ProblemMatcher.ts

@@ -1,6 +1,6 @@
 import {
-    TestFailed, TestFinished, TestIgnored, TestResult, TeamcityEvent, TestResultParser, TestStarted,
-    TestSuiteFinished, TestSuiteStarted,
+    TeamcityEvent, TestFailed, TestFinished, TestIgnored, TestResult, TestResultParser, TestStarted, TestSuiteFinished,
+    TestSuiteStarted,
 } from '.';
 
 export class ProblemMatcher {
@@ -24,7 +24,7 @@ export class ProblemMatcher {
     }
 
     private isResult(result?: TestResult): boolean {
-        return !!(result && 'event' in result && 'name' in result && 'flowId' in result);
+        return !!result && 'event' in result && 'name' in result && 'flowId' in result;
     }
 
     private handleStarted(testResult: TestSuiteStarted | TestStarted) {

src/PHPUnit/ProblemMatcher/TestConfigurationParser.ts

@@ -1,4 +1,4 @@
-import { TestConfiguration, TeamcityEvent } from './types';
+import { TeamcityEvent, TestConfiguration } from './types';
 import { ValueParser } from './ValueParser';
 
 export class TestConfigurationParser extends ValueParser<TestConfiguration> {

src/PHPUnit/ProblemMatcher/TestDurationParser.ts

@@ -1,4 +1,4 @@
-import { TestDuration, TeamcityEvent } from './types';
+import { TeamcityEvent, TestDuration } from './types';
 import { IParser } from './ValueParser';
 
 export class TestDurationParser implements IParser<TestDuration> {

src/PHPUnit/ProblemMatcher/TestProcessesParser.ts

@@ -1,4 +1,4 @@
-import { TestProcesses, TeamcityEvent } from './types';
+import { TeamcityEvent, TestProcesses } from './types';
 import { ValueParser } from './ValueParser';
 
 export class TestProcessesParser extends ValueParser<TestProcesses> {

src/PHPUnit/TestCollection/TestDefinitionBuilder.ts

@@ -1,4 +1,5 @@
-import { TestDefinition, TestParser, TestType } from '../TestParser';
+import { TestParser } from '../TestParser';
+import { TestDefinition, TestType } from '../types';
 
 export class TestDefinitionBuilder {
     private readonly testDefinitions: TestDefinition[] = [];

src/PHPUnit/TestParser/AnnotationParser.ts

@@ -1,14 +1,8 @@
 import { Declaration, Method } from 'php-parser';
+import { Annotations } from '../types';
 
 const lookup = ['depends', 'dataProvider', 'testdox'];
 
-export type Annotations = {
-    [p: string]: unknown;
-    depends?: string[];
-    dataProvider?: string[];
-    testdox?: string[];
-};
-
 export class AttributeParser {
     public parse(declaration: Declaration) {
         const parsed = this.parseAttributes(declaration);

src/PHPUnit/TestParser/PHPUnitParser.test.ts

@@ -1,7 +1,7 @@
 import { readFile } from 'fs/promises';
 import { phpUnitProject } from '../__tests__/utils';
+import { TestDefinition, TestType } from '../types';
 import { TestParser } from './TestParser';
-import { TestDefinition, TestType } from './types';
 
 export const parse = (buffer: Buffer | string, file: string) => {
     const tests: TestDefinition[] = [];

src/PHPUnit/TestParser/PHPUnitParser.ts

@@ -1,7 +1,7 @@
 import { Class, Declaration, Method, Namespace, Node, Program } from 'php-parser';
-import { Parser } from './Parser';
 import { TransformerFactory } from '../Transformer';
-import { TestDefinition, TestType } from './types';
+import { TestDefinition, TestType } from '../types';
+import { Parser } from './Parser';
 import { validator } from './Validator';
 
 export class PHPUnitParser extends Parser {

src/PHPUnit/TestParser/Parser.ts

@@ -1,8 +1,8 @@
 import { Call, Declaration, Identifier, Namespace, Node, Variable } from 'php-parser';
 import { PHPUnitXML } from '../PHPUnitXML';
-import { annotationParser, attributeParser } from './AnnotationParser';
 import { TransformerFactory } from '../Transformer';
-import { TestDefinition, TestType } from './types';
+import { TestDefinition, TestType } from '../types';
+import { annotationParser, attributeParser } from './AnnotationParser';
 
 export abstract class Parser {
     private phpUnitXML?: PHPUnitXML;

src/PHPUnit/TestParser/PestParser.test.ts

@@ -1,7 +1,7 @@
 import { pestProject } from '../__tests__/utils';
 import { PHPUnitXML } from '../PHPUnitXML';
+import { TestDefinition, TestType } from '../types';
 import { TestParser } from './TestParser';
-import { TestDefinition, TestType } from './types';
 
 export const parse = (buffer: Buffer | string, file: string) => {
     const tests: TestDefinition[] = [];

src/PHPUnit/TestParser/PestParser.ts

@@ -1,9 +1,9 @@
 import { basename, dirname, join, relative } from 'node:path';
 import { Block, Call, Closure, Declaration, ExpressionStatement, Node, Program, String } from 'php-parser';
+import { TransformerFactory } from '../Transformer';
+import { TestDefinition, TestType } from '../types';
 import { capitalize } from '../utils';
 import { Parser } from './Parser';
-import { TransformerFactory } from '../Transformer';
-import { TestDefinition, TestType } from './types';
 
 export class PestParser extends Parser {
     private converter = TransformerFactory.factory('pest');

src/PHPUnit/TestParser/TestParser.ts

@@ -2,11 +2,11 @@ import { EventEmitter } from 'node:events';
 import { readFile } from 'node:fs/promises';
 import { Declaration, Node } from 'php-parser';
 import { PHPUnitXML } from '../PHPUnitXML';
+import { TestDefinition, TestType } from '../types';
 import { engine } from '../utils';
 import { Parser } from './Parser';
 import { PestParser } from './PestParser';
 import { PHPUnitParser } from './PHPUnitParser';
-import { TestDefinition, TestType } from './types';
 
 const textDecoder = new TextDecoder('utf-8');
 

src/PHPUnit/TestParser/index.ts

@@ -1,4 +1,3 @@
 export * from './TestParser';
-export * from './types';
 export * from './PHPUnitParser';
 export * from './PestParser';

src/PHPUnit/TestRunner.test.ts

@@ -4,10 +4,10 @@ import { getPhpUnitVersion, phpUnitProject, phpUnitProjectWin } from './__tests_
 import { CommandBuilder } from './CommandBuilder';
 import { Configuration } from './Configuration';
 import { TeamcityEvent } from './ProblemMatcher';
-import { TestType } from './TestParser';
 import { TestRunner } from './TestRunner';
 import { TestRunnerEvent } from './TestRunnerObserver';
 import { TransformerFactory } from './Transformer';
+import { TestType } from './types';
 
 const PHPUNIT_VERSION: string = getPhpUnitVersion();
 

src/PHPUnit/Transformer/PHPUnitTransformer.ts

@@ -1,5 +1,5 @@
+import { TestDefinition, TestType } from '../types';
 import { capitalize, snakeCase, titleCase } from '../utils';
-import { TestDefinition, TestType } from '../TestParser/types';
 import { Transformer } from './Transformer';
 
 export class PHPUnitTransformer extends Transformer {