Merge pull request #288 from recca0120/feat/group-name

Feat/group name
recca0120 · Feb 24, 2025 · c89aa06 · c89aa06
2 parents 21e3839 + 2b447e5
commit c89aa06
Show file tree

Hide file tree

Showing 34 changed files with 294 additions and 286 deletions.
diff --git a/src/PHPUnit/PHPUnitXML.ts b/src/PHPUnit/PHPUnitXML.ts
@@ -91,9 +91,9 @@ export class PHPUnitXML {
     private readonly cached: Map<string, any> = new Map();
 
     load(text: string | Buffer | Uint8Array, file: string) {
+        this.element = new Element(parser.parse(text.toString()));
         this._file = file;
         this.setRoot(dirname(file));
-        this.element = new Element(parser.parse(text.toString()));
 
         return this;
     }

diff --git a/src/PHPUnit/ProblemMatcher/TestResultSummaryParser.ts b/src/PHPUnit/ProblemMatcher/TestResultSummaryParser.ts
@@ -38,10 +38,10 @@ export class TestResultSummaryParser implements IParser<TestResultSummary> {
 
         return [...text.matchAll(pattern)].reduce(
             (result: any, match) => {
-                const groups = match.groups!;
-                const [name, count] = groups.name
-                    ? [groups.name, groups.count]
-                    : [groups.name2, groups.count2];
+                const matched = match.groups!;
+                const [name, count] = matched.name
+                    ? [matched.name, matched.count]
+                    : [matched.name2, matched.count2];
                 result[this.normalize(name)] = parseInt(count, 10);
 
                 return result;

diff --git a/src/PHPUnit/ProblemMatcher/TestVersionParser.ts b/src/PHPUnit/ProblemMatcher/TestVersionParser.ts
@@ -12,12 +12,12 @@ export class TestVersionParser implements IParser<TestVersion> {
     }
 
     parse(text: string) {
-        const groups = text.match(this.pattern)!.groups!;
+        const matched = text.match(this.pattern)!.groups!;
 
         return {
             event: TeamcityEvent.testVersion,
-            phpunit: groups.phpunit,
-            paratest: groups.paratest,
+            phpunit: matched.phpunit,
+            paratest: matched.paratest,
             text,
         };
     }

diff --git a/src/PHPUnit/ProblemMatcher/ValueParser.ts b/src/PHPUnit/ProblemMatcher/ValueParser.ts
@@ -15,11 +15,11 @@ export abstract class ValueParser<T> implements IParser<T> {
     }
 
     parse(text: string) {
-        const groups = text.match(this.pattern)!.groups!;
+        const matched = text.match(this.pattern)!.groups!;
 
         return {
             event: this.event,
-            [this.name.toLowerCase()]: groups[this.name],
+            [this.name.toLowerCase()]: matched[this.name],
             text,
         } as T;
     }

diff --git a/src/PHPUnit/TestCollection/TestCollection.test.ts b/src/PHPUnit/TestCollection/TestCollection.test.ts
@@ -14,21 +14,21 @@ describe('TestCollection', () => {
         return testCollection;
     };
 
-    const shouldBe = async (collection: TestCollection, group: any) => {
+    const shouldBe = async (collection: TestCollection, testsuites: any) => {
         const phpUnitXML = new PHPUnitXML();
         phpUnitXML.setRoot(phpUnitProject(''));
-        for (const [name, files] of Object.entries(group)) {
+        for (const [testsuite, files] of Object.entries(testsuites)) {
             const expected: TestDefinition[] = [];
             for (const uri of (files as URI[])) {
                 const testParser = new TestParser(phpUnitXML);
                 testParser.on(TestType.method, (testDefinition) => expected.push(testDefinition));
                 testParser.on(TestType.class, (testDefinition) => expected.push(testDefinition));
                 testParser.on(TestType.namespace, (testDefinition) => expected.push(testDefinition));
 
-                await testParser.parseFile(uri.fsPath);
+                await testParser.parseFile(uri.fsPath, testsuite);
             }
             const actual: TestDefinition[] = [];
-            collection.items().get(name)?.items().forEach((item) => actual.push(...item));
+            collection.items().get(testsuite)?.items().forEach((item) => actual.push(...item));
             expect(actual).toEqual(expected);
         }
     };

diff --git a/src/PHPUnit/TestCollection/TestCollection.ts b/src/PHPUnit/TestCollection/TestCollection.ts
@@ -5,7 +5,7 @@ import { PHPUnitXML, TestDefinition, TestParser, TestSuite } from '../index';
 import { TestDefinitionBuilder } from './TestDefinitionBuilder';
 
 export interface File<T> {
-    group: string;
+    testsuite: string;
     uri: URI;
     tests: T[];
 }
@@ -99,17 +99,17 @@ export class TestCollection {
     }
 
     async change(uri: URI) {
-        const group = this.getGroup(uri);
-        if (!group) {
+        const testsuite = this.parseTestsuite(uri);
+        if (!testsuite) {
             return this;
         }
 
         const files = this.items();
-        const testDefinitions = await this.parseTests(uri);
+        const testDefinitions = await this.parseTests(uri, testsuite);
         if (testDefinitions.length === 0) {
             this.delete(uri);
         }
-        files.get(group)!.set(uri, testDefinitions);
+        files.get(testsuite)!.set(uri, testDefinitions);
 
         return this;
     }
@@ -147,9 +147,9 @@ export class TestCollection {
         return undefined;
     }
 
-    protected async parseTests(uri: URI) {
+    protected async parseTests(uri: URI, testsuite: string) {
         const { testParser, testDefinitionBuilder } = this.createTestParser();
-        await testParser.parseFile(uri.fsPath);
+        await testParser.parseFile(uri.fsPath, testsuite);
 
         return testDefinitionBuilder.get();
     }
@@ -162,34 +162,36 @@ export class TestCollection {
     }
 
     protected deleteFile(file: File<TestDefinition>) {
-        return this.items().get(file.group)?.delete(file.uri);
+        return this.items().get(file.testsuite)?.delete(file.uri);
     }
 
     private* gatherFiles() {
-        for (const [group, files] of this.items()) {
+        for (const [testsuite, files] of this.items()) {
             for (const [uri, tests] of files) {
-                yield { group, uri, tests };
+                yield { testsuite, uri, tests };
             }
         }
     }
 
-    private getGroup(uri: URI) {
+    private parseTestsuite(uri: URI) {
         const testSuites = this.phpUnitXML.getTestSuites();
-        const group = testSuites.find(item => {
+        const testsuite = testSuites.find(item => {
             return ['directory', 'file'].includes(item.tag) && this.match(item, uri);
         });
-        if (!group) {
+
+        if (!testsuite) {
             return;
         }
 
         const exclude = testSuites.find((item) => {
-            return item.name === group.name && item.tag === 'exclude' && this.match(item, uri);
+            return item.name === testsuite.name && item.tag === 'exclude' && this.match(item, uri);
         });
+
         if (exclude) {
             return;
         }
 
-        return group.name;
+        return testsuite.name;
     }
 
     private match(testSuite: TestSuite, uri: URI) {