Merge pull request #269 from recca0120/fix/test-id

fix #268
recca0120 · Jan 22, 2025 · e2b280c · e2b280c
2 parents d61fb88 + 5316bf9
commit e2b280c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "displayName": "PHPUnit Test Explorer",
   "icon": "img/icon.png",
   "publisher": "recca0120",
-  "version": "3.5.16",
+  "version": "3.5.17",
   "private": true,
   "license": "MIT",
   "repository": {

diff --git a/src/PHPUnit/ProblemMatcher/PestProblemMatcher.test.ts b/src/PHPUnit/ProblemMatcher/PestProblemMatcher.test.ts
@@ -719,4 +719,18 @@ describe('Pest ProblemMatcher Text', () => {
             });
         });
     });
+
+    it('multi-word class names', () => {
+        resultShouldBe(`##teamcity[testStarted name='Login screen can be rendered' locationHint='pest_qn://Authentication Page (Tests\\Feature\\AuthenticationPage)::Login screen can be rendered' flowId='72545']`, {
+            event: TeamcityEvent.testStarted,
+            id: 'Authentication Page (Tests\\Feature\\AuthenticationPage)::Login screen can be rendered',
+            flowId: 72545,
+        });
+
+        resultShouldBe(`##teamcity[testFinished name='Login screen can be rendered' duration='1' flowId='72545']`, {
+            event: TeamcityEvent.testFinished,
+            id: 'Authentication Page (Tests\\Feature\\AuthenticationPage)::Login screen can be rendered',
+            flowId: 72545,
+        });
+    });
 });
diff --git a/src/PHPUnit/Transformer/PestTransformer.ts b/src/PHPUnit/Transformer/PestTransformer.ts
@@ -106,7 +106,7 @@ export class PestTransformer extends PHPUnitTransformer {
     };
 
     fromLocationHit(locationHint: string, name: string) {
-        const matched = locationHint.match(/(pest_qn|file):\/\/(?<id>(?<prefix>\w+)\s+\((?<classFQN>[\w\\]+)\)(::(?<method>.+))?)/);
+        const matched = locationHint.match(/(pest_qn|file):\/\/(?<id>(?<prefix>[\w\s]+)\((?<classFQN>[\w\\]+)\)(::(?<method>.+))?)/);
         if (!matched) {
             const location = PestV1Fixer.fixLocationHint(locationHint.replace(/(pest_qn|file):\/\//, '').replace(/\\/g, '/'));
             const id = this.removeDataset(this.normalizeMethodName(PestV2Fixer.fixId(location, name)));

diff --git a/src/PHPUnit/__tests__/fixtures/phpunit-stub/.vscode/.gitignore b/src/PHPUnit/__tests__/fixtures/phpunit-stub/.vscode/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/src/PHPUnit/__tests__/fixtures/phpunit-stub/.vscode/launch.json b/src/PHPUnit/__tests__/fixtures/phpunit-stub/.vscode/launch.json