Fixup running parameterized tests a second time

Author: plemarquand

src/TestExplorer/TestRunArguments.ts

@@ -14,6 +14,7 @@
 
 import * as vscode from "vscode";
 import { reduceTestItemChildren } from "./TestUtils";
+import { TestRunProxy } from "./TestRunner";
 
 type ProcessResult = {
     testItems: vscode.TestItem[];
@@ -93,7 +94,7 @@ export class TestRunArguments {
                 const terminator = hasChildren ? "/" : "$";
                 // Debugging XCTests requires exact matches, so we don't need a trailing terminator.
                 return isDebug ? arg.id : `${arg.id}${terminator}`;
-            } else if (hasChildren) {
+            } else if (hasChildren && !this.hasParameterizedTestChildren(arg)) {
                 // Append a trailing slash to match a suite name exactly.
                 // This prevents TestTarget.MySuite matching TestTarget.MySuite2.
                 return `${arg.id}/`;
@@ -102,6 +103,12 @@ export class TestRunArguments {
         });
     }
 
+    private hasParameterizedTestChildren(testItem: vscode.TestItem): boolean {
+        return Array.from(testItem.children).some(arr =>
+            arr[1].tags.some(tag => tag.id === TestRunProxy.Tags.PARAMETERIZED_TEST_RESULT)
+        );
+    }
+
     private createTestItemReducer(
         include: readonly vscode.TestItem[],
         exclude: readonly vscode.TestItem[],

src/TestExplorer/TestRunner.ts

@@ -164,7 +164,7 @@ export class TestRunProxy {
                 // https://github.com/swiftlang/swift-testing/issues/671 is resolved.
                 testClass.tags = compactMap(parent.tags, t =>
                     t.id === runnableTag.id ? null : new vscode.TestTag(t.id)
-                );
+                ).concat(new vscode.TestTag(TestRunProxy.Tags.PARAMETERIZED_TEST_RESULT));
 
                 const added = upsertTestItem(this.controller, testClass, parent);
 
@@ -406,9 +406,10 @@ export class TestRunProxy {
         await this.coverage.computeCoverage(this.testRun);
     }
 
-    private static Tags = {
+    static Tags = {
         SKIPPED: "skipped",
         HAS_ATTACHMENT: "hasAttachment",
+        PARAMETERIZED_TEST_RESULT: "parameterizedTestResult",
     };
 
     // Remove any tags that were added due to test results