fix to subtest issue

Author: eleanorjboyd

src/client/testing/testController/common/resultResolver.ts

@@ -4,7 +4,7 @@
 import { CancellationToken, TestController, TestItem, Uri, TestRun, FileCoverageDetail } from 'vscode';
 import { CoveragePayload, DiscoveredTestPayload, ExecutionTestPayload, ITestResultResolver } from './types';
 import { TestProvider } from '../../types';
-import { traceVerbose } from '../../../logging';
+import { traceInfo } from '../../../logging';
 import { sendTelemetryEvent } from '../../../telemetry';
 import { EventName } from '../../../telemetry/constants';
 import { TestItemIndex } from './testItemIndex';
@@ -24,8 +24,6 @@ export class PythonResultResolver implements ITestResultResolver {
     private static executionHandler: TestExecutionHandler = new TestExecutionHandler();
     private static coverageHandler: TestCoverageHandler = new TestCoverageHandler();
 
-    public subTestStats: Map<string, { passed: number; failed: number }> = new Map();
-
     public detailedCoverageMap = new Map<string, FileCoverageDetail[]>();
 
     constructor(testController: TestController, testProvider: TestProvider, private workspaceUri: Uri) {
@@ -71,13 +69,14 @@ export class PythonResultResolver implements ITestResultResolver {
     public resolveExecution(payload: ExecutionTestPayload | CoveragePayload, runInstance: TestRun): void {
         if ('coverage' in payload) {
             // coverage data is sent once per connection
-            traceVerbose('Coverage data received.');
+            traceInfo('Coverage data received, processing...');
             this.detailedCoverageMap = PythonResultResolver.coverageHandler.processCoverage(
                 payload as CoveragePayload,
                 runInstance,
             );
+            traceInfo('Coverage data processing complete.');
         } else {
-            this.subTestStats = PythonResultResolver.executionHandler.processExecution(
+            PythonResultResolver.executionHandler.processExecution(
                 payload as ExecutionTestPayload,
                 runInstance,
                 this.testItemIndex,

src/client/testing/testController/common/testExecutionHandler.ts

@@ -8,11 +8,6 @@ import { splitLines } from '../../../common/stringUtils';
 import { splitTestNameWithRegex } from './utils';
 import { clearAllChildren } from './testItemUtilities';
 
-export interface SubtestStats {
-    passed: number;
-    failed: number;
-}
-
 /**
  * Stateless handler for processing execution payloads and updating TestRun instances.
  * This handler is shared across all workspaces and contains no instance state.
@@ -21,27 +16,23 @@ export class TestExecutionHandler {
     /**
      * Process execution payload and update test run
      * Pure function - no instance state used
-     * Returns subtest statistics for caller to manage
      */
     public processExecution(
         payload: ExecutionTestPayload,
         runInstance: TestRun,
         testItemIndex: TestItemIndex,
         testController: TestController,
-    ): Map<string, SubtestStats> {
-        const subtestStats = new Map<string, SubtestStats>();
+    ): void {
         const rawTestExecData = payload as ExecutionTestPayload;
 
         if (rawTestExecData !== undefined && rawTestExecData.result !== undefined) {
             for (const keyTemp of Object.keys(rawTestExecData.result)) {
                 const testItem = rawTestExecData.result[keyTemp];
 
                 // Delegate to specific outcome handlers
-                this.handleTestOutcome(keyTemp, testItem, runInstance, testItemIndex, testController, subtestStats);
+                this.handleTestOutcome(keyTemp, testItem, runInstance, testItemIndex, testController);
             }
         }
-
-        return subtestStats;
     }
 
     /**
@@ -53,7 +44,6 @@ export class TestExecutionHandler {
         runInstance: TestRun,
         testItemIndex: TestItemIndex,
         testController: TestController,
-        subtestStats: Map<string, SubtestStats>,
     ): void {
         if (testItem.outcome === 'error') {
             this.handleTestError(runId, testItem, runInstance, testItemIndex, testController);
@@ -64,9 +54,9 @@ export class TestExecutionHandler {
         } else if (testItem.outcome === 'skipped') {
             this.handleTestSkipped(runId, runInstance, testItemIndex, testController);
         } else if (testItem.outcome === 'subtest-failure') {
-            this.handleSubtestFailure(runId, testItem, runInstance, testItemIndex, testController, subtestStats);
+            this.handleSubtestFailure(runId, testItem, runInstance, testItemIndex, testController);
         } else if (testItem.outcome === 'subtest-success') {
-            this.handleSubtestSuccess(runId, runInstance, testItemIndex, testController, subtestStats);
+            this.handleSubtestSuccess(runId, runInstance, testItemIndex, testController);
         }
     }
 
@@ -168,17 +158,16 @@ export class TestExecutionHandler {
         runInstance: TestRun,
         testItemIndex: TestItemIndex,
         testController: TestController,
-        subtestStats: Map<string, SubtestStats>,
     ): void {
         const [parentTestCaseId, subtestId] = splitTestNameWithRegex(runId);
         const parentTestItem = testItemIndex.getTestItem(parentTestCaseId, testController);
 
         if (parentTestItem) {
-            const stats = subtestStats.get(parentTestCaseId);
+            const stats = testItemIndex.getSubtestStats(parentTestCaseId);
             if (stats) {
                 stats.failed += 1;
             } else {
-                subtestStats.set(parentTestCaseId, {
+                testItemIndex.setSubtestStats(parentTestCaseId, {
                     failed: 1,
                     passed: 0,
                 });
@@ -213,17 +202,16 @@ export class TestExecutionHandler {
         runInstance: TestRun,
         testItemIndex: TestItemIndex,
         testController: TestController,
-        subtestStats: Map<string, SubtestStats>,
     ): void {
         const [parentTestCaseId, subtestId] = splitTestNameWithRegex(runId);
         const parentTestItem = testItemIndex.getTestItem(parentTestCaseId, testController);
 
         if (parentTestItem) {
-            const stats = subtestStats.get(parentTestCaseId);
+            const stats = testItemIndex.getSubtestStats(parentTestCaseId);
             if (stats) {
                 stats.passed += 1;
             } else {
-                subtestStats.set(parentTestCaseId, { failed: 0, passed: 1 });
+                testItemIndex.setSubtestStats(parentTestCaseId, { failed: 0, passed: 1 });
                 clearAllChildren(parentTestItem);
             }
 

src/client/testing/testController/common/testItemIndex.ts

@@ -5,6 +5,11 @@ import { TestController, TestItem } from 'vscode';
 import { traceError, traceVerbose } from '../../../logging';
 import { getTestCaseNodes } from './testItemUtilities';
 
+export interface SubtestStats {
+    passed: number;
+    failed: number;
+}
+
 /**
  * Maintains persistent ID mappings between Python test IDs and VS Code TestItems.
  * This is a stateful component that bridges discovery and execution phases.
@@ -21,11 +26,13 @@ export class TestItemIndex {
     private runIdToTestItem: Map<string, TestItem>;
     private runIdToVSid: Map<string, string>;
     private vsIdToRunId: Map<string, string>;
+    private subtestStatsMap: Map<string, SubtestStats>;
 
     constructor() {
         this.runIdToTestItem = new Map<string, TestItem>();
         this.runIdToVSid = new Map<string, string>();
         this.vsIdToRunId = new Map<string, string>();
+        this.subtestStatsMap = new Map<string, SubtestStats>();
     }
 
     /**
@@ -133,6 +140,21 @@ export class TestItemIndex {
         return testController.items.get(testItem.id) === testItem;
     }
 
+    /**
+     * Get subtest statistics for a parent test case
+     * Returns undefined if no stats exist yet for this parent
+     */
+    public getSubtestStats(parentId: string): SubtestStats | undefined {
+        return this.subtestStatsMap.get(parentId);
+    }
+
+    /**
+     * Set subtest statistics for a parent test case
+     */
+    public setSubtestStats(parentId: string, stats: SubtestStats): void {
+        this.subtestStatsMap.set(parentId, stats);
+    }
+
     /**
      * Remove all mappings
      * Called at the start of discovery to ensure clean state
@@ -141,6 +163,7 @@ export class TestItemIndex {
         this.runIdToTestItem.clear();
         this.runIdToVSid.clear();
         this.vsIdToRunId.clear();
+        this.subtestStatsMap.clear();
     }
 
     /**