v2.1

Author: eleanorjboyd

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

@@ -1,43 +1,43 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
+// // Copyright (c) Microsoft Corporation. All rights reserved.
+// // Licensed under the MIT License.
 
-import { inject, injectable } from 'inversify';
-import {
-    ExecutionFactoryCreateWithEnvironmentOptions,
-    IPythonExecutionFactory,
-    SpawnOptions,
-} from '../../../common/process/types';
-import { TestDiscoveryOptions } from '../../common/types';
-import { ITestDiscoveryHelper, RawDiscoveredTests } from './types';
+// import { inject, injectable } from 'inversify';
+// import {
+//     ExecutionFactoryCreateWithEnvironmentOptions,
+//     IPythonExecutionFactory,
+//     SpawnOptions,
+// } from '../../../common/process/types';
+// import { TestDiscoveryOptions } from '../../common/types';
+// import { ITestDiscoveryHelper, RawDiscoveredTests } from './types';
 
-@injectable()
-export class TestDiscoveryHelper implements ITestDiscoveryHelper {
-    constructor(@inject(IPythonExecutionFactory) private readonly pythonExecFactory: IPythonExecutionFactory) {}
+// @injectable()
+// export class TestDiscoveryHelper implements ITestDiscoveryHelper {
+//     constructor(@inject(IPythonExecutionFactory) private readonly pythonExecFactory: IPythonExecutionFactory) {}
 
-    public async runTestDiscovery(options: TestDiscoveryOptions): Promise<RawDiscoveredTests[]> {
-        const creationOptions: ExecutionFactoryCreateWithEnvironmentOptions = {
-            allowEnvironmentFetchExceptions: false,
-            resource: options.workspaceFolder,
-        };
-        const execService = await this.pythonExecFactory.createActivatedEnvironment(creationOptions);
+//     public async runTestDiscovery(options: TestDiscoveryOptions): Promise<RawDiscoveredTests[]> {
+//         const creationOptions: ExecutionFactoryCreateWithEnvironmentOptions = {
+//             allowEnvironmentFetchExceptions: false,
+//             resource: options.workspaceFolder,
+//         };
+//         const execService = await this.pythonExecFactory.createActivatedEnvironment(creationOptions);
 
-        const spawnOptions: SpawnOptions = {
-            token: options.token,
-            cwd: options.cwd,
-            throwOnStdErr: true,
-        };
+//         const spawnOptions: SpawnOptions = {
+//             token: options.token,
+//             cwd: options.cwd,
+//             throwOnStdErr: true,
+//         };
 
-        if (options.outChannel) {
-            options.outChannel.appendLine(`python ${options.args.join(' ')}`);
-        }
+//         if (options.outChannel) {
+//             options.outChannel.appendLine(`python ${options.args.join(' ')}`);
+//         }
 
-        const proc = await execService.exec(options.args, spawnOptions);
-        try {
-            return JSON.parse(proc.stdout);
-        } catch (ex) {
-            const error = ex as SyntaxError;
-            error.message = proc.stdout;
-            throw ex; // re-throw
-        }
-    }
-}
+//         const proc = await execService.exec(options.args, spawnOptions);
+//         try {
+//             return JSON.parse(proc.stdout);
+//         } catch (ex) {
+//             const error = ex as SyntaxError;
+//             error.message = proc.stdout;
+//             throw ex; // re-throw
+//         }
+//     }
+// }

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

@@ -13,7 +13,7 @@ import {
     Uri,
     WorkspaceFolder,
 } from 'vscode';
-import { ITestDebugLauncher, TestDiscoveryOptions } from '../../common/types';
+import { ITestDebugLauncher } from '../../common/types';
 import { IPythonExecutionFactory } from '../../../common/process/types';
 import { EnvironmentVariables } from '../../../common/variables/types';
 import { PythonEnvironment } from '../../../pythonEnvironments/info';
@@ -39,11 +39,6 @@ export interface TestData {
     kind: TestDataKinds;
 }
 
-export const ITestDiscoveryHelper = Symbol('ITestDiscoveryHelper');
-export interface ITestDiscoveryHelper {
-    runTestDiscovery(options: TestDiscoveryOptions): Promise<RawDiscoveredTests[]>;
-}
-
 export type TestRefreshOptions = { forceRefresh: boolean };
 
 export const ITestController = Symbol('ITestController');
@@ -65,24 +60,10 @@ export interface ITestRun {
 export const ITestFrameworkController = Symbol('ITestFrameworkController');
 export interface ITestFrameworkController {
     resolveChildren(testController: TestController, item: TestItem, token?: CancellationToken): Promise<void>;
-    refreshTestData(testController: TestController, resource?: Uri, token?: CancellationToken): Promise<void>;
-    runTests(
-        testRun: ITestRun,
-        workspace: WorkspaceFolder,
-        token: CancellationToken,
-        testController?: TestController,
-    ): Promise<void>;
 }
 
 export const ITestsRunner = Symbol('ITestsRunner');
-export interface ITestsRunner {
-    runTests(
-        testRun: ITestRun,
-        options: TestRunOptions,
-        idToRawData: Map<string, TestData>,
-        testController?: TestController,
-    ): Promise<void>;
-}
+export interface ITestsRunner {}
 
 export type TestRunOptions = {
     workspaceFolder: Uri;