testing and refinement

Author: eleanorjboyd

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

@@ -15,11 +15,12 @@ import { PythonEnvironment, PythonProject } from '../../../envExt/types';
 /**
  * Represents a single Python project with its own test infrastructure.
  * A project is defined as a combination of a Python executable + URI (folder/file).
+ * Projects are keyed by projectUri.toString()
  */
 export interface ProjectAdapter {
     // === IDENTITY ===
     /**
-     * Unique identifier for this project, generated by hashing the PythonProject object.
+     * Project identifier, which is the string representation of the project URI.
      */
     projectId: string;
 

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

@@ -1,36 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import * as crypto from 'crypto';
-import { PythonProject } from '../../../envExt/types';
+import { Uri } from 'vscode';
 
 /**
  * Separator used to scope test IDs to a specific project.
  * Format: {projectId}{SEPARATOR}{testPath}
- * Example: "project-abc123def456::test_file.py::test_name"
+ * Example: "file:///workspace/project||test_file.py::test_name"
  */
-export const PROJECT_ID_SEPARATOR = '::';
+export const PROJECT_ID_SEPARATOR = '||';
 
 /**
- * Generates a unique project ID by hashing the PythonProject object.
- * This ensures consistent IDs across extension reloads for the same project.
- * Uses 16 characters of the hash to reduce collision probability.
+ * Gets the project ID from a project URI.
+ * The project ID is simply the string representation of the URI, matching how
+ * the Python Environments extension stores projects in Map<string, PythonProject>.
  *
- * @param pythonProject The PythonProject object from the environment API
- * @returns A unique string identifier for the project
+ * @param projectUri The project URI
+ * @returns The project ID (URI as string)
  */
-export function generateProjectId(pythonProject: PythonProject): string {
-    // Create a stable string representation of the project
-    // Use URI as the primary identifier (stable across renames)
-    const projectString = JSON.stringify({
-        uri: pythonProject.uri.toString(),
-        name: pythonProject.name,
-    });
-
-    // Generate a hash to create a shorter, unique ID
-    // Using 16 chars (64 bits) instead of 12 (48 bits) for better collision resistance
-    const hash = crypto.createHash('sha256').update(projectString).digest('hex');
-    return `project-${hash.substring(0, 16)}`;
+export function getProjectId(projectUri: Uri): string {
+    return projectUri.toString();
 }
 
 /**

src/client/testing/testController/controller.ts

@@ -53,7 +53,7 @@ import { PythonResultResolver } from './common/resultResolver';
 import { onDidSaveTextDocument } from '../../common/vscodeApis/workspaceApis';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
 import { ProjectAdapter } from './common/projectAdapter';
-import { generateProjectId, createProjectDisplayName } from './common/projectUtils';
+import { getProjectId, createProjectDisplayName } from './common/projectUtils';
 import { PythonProject, PythonEnvironment } from '../../envExt/types';
 import { getEnvExtApi, useEnvExtension } from '../../envExt/api.internal';
 
@@ -66,11 +66,19 @@ type TriggerType = EventPropertyType[TriggerKeyType];
 export class PythonTestController implements ITestController, IExtensionSingleActivationService {
     public readonly supportedWorkspaceTypes = { untrustedWorkspace: false, virtualWorkspace: false };
 
+    /**
+     * Feature flag for project-based testing.
+     * Set to true to enable multi-project testing support (Phases 2-4 must be complete).
+     * Default: false (use legacy single-workspace mode)
+     */
+    private readonly useProjectBasedTesting = false;
+
     // Legacy: Single workspace test adapter per workspace (backward compatibility)
     private readonly testAdapters: Map<Uri, WorkspaceTestAdapter> = new Map();
 
     // === NEW: PROJECT-BASED STATE ===
-    // Map of workspace URI -> Map of project ID -> ProjectAdapter
+    // Map of workspace URI -> Map of project URI string -> ProjectAdapter
+    // Note: Project URI strings match Python Environments extension's Map<string, PythonProject> keys
     private readonly workspaceProjects: Map<Uri, Map<string, ProjectAdapter>> = new Map();
 
     // TODO: Phase 3-4 - Add these maps when implementing discovery and execution:
@@ -227,8 +235,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
     public async activate(): Promise<void> {
         const workspaces: readonly WorkspaceFolder[] = this.workspaceService.workspaceFolders || [];
 
-        // Try to use project-based testing if environment extension is enabled
-        if (useEnvExtension()) {
+        // Try to use project-based testing if feature flag is enabled AND environment extension is available
+        if (this.useProjectBasedTesting && useEnvExtension()) {
             traceInfo('[test-by-project] Activating project-based testing mode');
 
             // Use Promise.allSettled to allow partial success in multi-root workspaces
@@ -239,10 +247,11 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                     // Discover projects in this workspace
                     const projects = await this.discoverWorkspaceProjects(workspace.uri);
 
-                    // Create map for this workspace
+                    // Create map for this workspace, keyed by project URI (matches Python Environments extension)
                     const projectsMap = new Map<string, ProjectAdapter>();
                     projects.forEach((project) => {
-                        projectsMap.set(project.projectId, project);
+                        const projectKey = getProjectId(project.projectUri);
+                        projectsMap.set(projectKey, project);
                     });
 
                     traceInfo(
@@ -374,8 +383,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         traceInfo(
             `[test-by-project] Creating project adapter for: ${pythonProject.name} at ${pythonProject.uri.fsPath}`,
         );
-        // Generate unique project ID
-        const projectId = generateProjectId(pythonProject);
+        // Use project URI as the project ID (no hashing needed)
+        const projectId = getProjectId(pythonProject.uri);
 
         // Resolve the Python environment
         const envExtApi = await getEnvExtApi();
@@ -456,8 +465,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             uri: workspaceUri,
         };
 
-        // Use workspace URI as project ID for default project
-        const projectId = `default-${workspaceUri.fsPath}`;
+        // Use workspace URI as the project ID
+        const projectId = getProjectId(workspaceUri);
 
         return {
             projectId,