Fix terminal unit tests

Author: karthiknadig

src/test/common/terminals/activator/index.unit.test.ts

@@ -4,6 +4,7 @@
 'use strict';
 
 import { assert } from 'chai';
+import * as sinon from 'sinon';
 import * as TypeMoq from 'typemoq';
 import { Terminal } from 'vscode';
 import { TerminalActivator } from '../../../../client/common/terminal/activator';
@@ -18,6 +19,7 @@ import {
     IPythonSettings,
     ITerminalSettings,
 } from '../../../../client/common/types';
+import * as extapi from '../../../../client/envExt/api.internal';
 
 suite('Terminal Activator', () => {
     let activator: TerminalActivator;
@@ -26,7 +28,11 @@ suite('Terminal Activator', () => {
     let handler2: TypeMoq.IMock<ITerminalActivationHandler>;
     let terminalSettings: TypeMoq.IMock<ITerminalSettings>;
     let experimentService: TypeMoq.IMock<IExperimentService>;
+    let useEnvExtensionStub: sinon.SinonStub;
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         baseActivator = TypeMoq.Mock.ofType<ITerminalActivator>();
         terminalSettings = TypeMoq.Mock.ofType<ITerminalSettings>();
         experimentService = TypeMoq.Mock.ofType<IExperimentService>();
@@ -52,6 +58,10 @@ suite('Terminal Activator', () => {
             experimentService.object,
         );
     });
+    teardown(() => {
+        sinon.restore();
+    });
+
     async function testActivationAndHandlers(
         activationSuccessful: boolean,
         activateEnvironmentSetting: boolean,

src/test/common/terminals/service.unit.test.ts

@@ -25,6 +25,7 @@ import { ITerminalAutoActivation } from '../../../client/terminals/types';
 import { createPythonInterpreter } from '../../utils/interpreters';
 import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis';
 import * as platform from '../../../client/common/utils/platform';
+import * as extapi from '../../../client/envExt/api.internal';
 
 suite('Terminal Service', () => {
     let service: TerminalService;
@@ -44,8 +45,12 @@ suite('Terminal Service', () => {
     let pythonConfig: TypeMoq.IMock<WorkspaceConfiguration>;
     let editorConfig: TypeMoq.IMock<WorkspaceConfiguration>;
     let isWindowsStub: sinon.SinonStub;
+    let useEnvExtensionStub: sinon.SinonStub;
 
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         terminal = TypeMoq.Mock.ofType<VSCodeTerminal>();
         terminalShellIntegration = TypeMoq.Mock.ofType<TerminalShellIntegration>();
         terminal.setup((t) => t.shellIntegration).returns(() => terminalShellIntegration.object);

src/test/configuration/interpreterSelector/commands/resetInterpreter.unit.test.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import * as path from 'path';
+import * as sinon from 'sinon';
 import * as TypeMoq from 'typemoq';
 import { ConfigurationTarget, Uri } from 'vscode';
 import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../../../client/common/application/types';
@@ -10,6 +11,7 @@ import { IConfigurationService } from '../../../../client/common/types';
 import { Common, Interpreters } from '../../../../client/common/utils/localize';
 import { ResetInterpreterCommand } from '../../../../client/interpreter/configuration/interpreterSelector/commands/resetInterpreter';
 import { IPythonPathUpdaterServiceManager } from '../../../../client/interpreter/configuration/types';
+import * as extapi from '../../../../client/envExt/api.internal';
 
 suite('Reset Interpreter Command', () => {
     let workspace: TypeMoq.IMock<IWorkspaceService>;
@@ -21,8 +23,12 @@ suite('Reset Interpreter Command', () => {
     const folder2 = { name: 'two', uri: Uri.parse('two'), index: 2 };
 
     let resetInterpreterCommand: ResetInterpreterCommand;
+    let useEnvExtensionStub: sinon.SinonStub;
 
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         configurationService = TypeMoq.Mock.ofType<IConfigurationService>();
         configurationService
             .setup((c) => c.getSettings(TypeMoq.It.isAny()))
@@ -42,6 +48,9 @@ suite('Reset Interpreter Command', () => {
             configurationService.object,
         );
     });
+    teardown(() => {
+        sinon.restore();
+    });
 
     suite('Test method resetInterpreter()', async () => {
         test('Update Global settings when there are no workspaces', async () => {

src/test/configuration/interpreterSelector/commands/setInterpreter.unit.test.ts

@@ -48,6 +48,7 @@ import { IInterpreterService, PythonEnvironmentsChangedEvent } from '../../../..
 import { createDeferred, sleep } from '../../../../client/common/utils/async';
 import { SystemVariables } from '../../../../client/common/variables/systemVariables';
 import { untildify } from '../../../../client/common/helpers';
+import * as extapi from '../../../../client/envExt/api.internal';
 
 type TelemetryEventType = { eventName: EventName; properties: unknown };
 
@@ -62,12 +63,16 @@ suite('Set Interpreter Command', () => {
     let platformService: TypeMoq.IMock<IPlatformService>;
     let multiStepInputFactory: TypeMoq.IMock<IMultiStepInputFactory>;
     let interpreterService: IInterpreterService;
+    let useEnvExtensionStub: sinon.SinonStub;
     const folder1 = { name: 'one', uri: Uri.parse('one'), index: 1 };
     const folder2 = { name: 'two', uri: Uri.parse('two'), index: 2 };
 
     let setInterpreterCommand: SetInterpreterCommand;
 
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         interpreterSelector = TypeMoq.Mock.ofType<IInterpreterSelector>();
         multiStepInputFactory = TypeMoq.Mock.ofType<IMultiStepInputFactory>();
         platformService = TypeMoq.Mock.ofType<IPlatformService>();

src/test/interpreters/activation/indicatorPrompt.unit.test.ts

@@ -3,6 +3,7 @@
 
 'use strict';
 
+import * as sinon from 'sinon';
 import { mock, when, anything, instance, verify, reset } from 'ts-mockito';
 import { EventEmitter, Terminal, Uri } from 'vscode';
 import { IActiveResourceService, IApplicationShell, ITerminalManager } from '../../../client/common/application/types';
@@ -21,6 +22,7 @@ import { IInterpreterService } from '../../../client/interpreter/contracts';
 import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 import { ITerminalEnvVarCollectionService } from '../../../client/terminals/types';
 import { PythonEnvType } from '../../../client/pythonEnvironments/base/info';
+import * as extapi from '../../../client/envExt/api.internal';
 
 suite('Terminal Activation Indicator Prompt', () => {
     let shell: IApplicationShell;
@@ -34,12 +36,16 @@ suite('Terminal Activation Indicator Prompt', () => {
     let notificationEnabled: IPersistentState<boolean>;
     let configurationService: IConfigurationService;
     let interpreterService: IInterpreterService;
+    let useEnvExtensionStub: sinon.SinonStub;
     const prompts = [Common.doNotShowAgain];
     const envName = 'env';
     const type = PythonEnvType.Virtual;
     const expectedMessage = Interpreters.terminalEnvVarCollectionPrompt.format('Python virtual', `"(${envName})"`);
 
     setup(async () => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         shell = mock<IApplicationShell>();
         terminalManager = mock<ITerminalManager>();
         interpreterService = mock<IInterpreterService>();
@@ -77,6 +83,10 @@ suite('Terminal Activation Indicator Prompt', () => {
         );
     });
 
+    teardown(() => {
+        sinon.restore();
+    });
+
     test('Show notification when a new terminal is opened for which there is no prompt set', async () => {
         const resource = Uri.file('a');
         const terminal = ({

src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts

@@ -39,6 +39,7 @@ import { PythonEnvType } from '../../../client/pythonEnvironments/base/info';
 import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 import { IShellIntegrationDetectionService, ITerminalDeactivateService } from '../../../client/terminals/types';
 import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types';
+import * as extapi from '../../../client/envExt/api.internal';
 
 suite('Terminal Environment Variable Collection Service', () => {
     let platform: IPlatformService;
@@ -53,6 +54,7 @@ suite('Terminal Environment Variable Collection Service', () => {
     let workspaceService: IWorkspaceService;
     let terminalEnvVarCollectionService: TerminalEnvVarCollectionService;
     let terminalDeactivateService: ITerminalDeactivateService;
+    let useEnvExtensionStub: sinon.SinonStub;
     const progressOptions = {
         location: ProgressLocation.Window,
         title: Interpreters.activatingTerminals,
@@ -64,6 +66,9 @@ suite('Terminal Environment Variable Collection Service', () => {
     const defaultShell = defaultShells[getOSType()];
 
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         workspaceService = mock<IWorkspaceService>();
         terminalDeactivateService = mock<ITerminalDeactivateService>();
         when(terminalDeactivateService.getScriptLocation(anything(), anything())).thenResolve(undefined);

src/test/interpreters/display.unit.test.ts

@@ -32,6 +32,7 @@ import { IServiceContainer } from '../../client/ioc/types';
 import * as logging from '../../client/logging';
 import { EnvironmentType, PythonEnvironment } from '../../client/pythonEnvironments/info';
 import { ThemeColor } from '../mocks/vsc';
+import * as extapi from '../../client/envExt/api.internal';
 
 const info: PythonEnvironment = {
     architecture: Architecture.Unknown,
@@ -58,6 +59,7 @@ suite('Interpreters Display', () => {
     let pathUtils: TypeMoq.IMock<IPathUtils>;
     let languageStatusItem: TypeMoq.IMock<LanguageStatusItem>;
     let traceLogStub: sinon.SinonStub;
+    let useEnvExtensionStub: sinon.SinonStub;
     async function createInterpreterDisplay(filters: IInterpreterStatusbarVisibilityFilter[] = []) {
         interpreterDisplay = new InterpreterDisplay(serviceContainer.object);
         try {
@@ -67,6 +69,9 @@ suite('Interpreters Display', () => {
     }
 
     async function setupMocks(useLanguageStatus: boolean) {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         serviceContainer = TypeMoq.Mock.ofType<IServiceContainer>();
         workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();
         applicationShell = TypeMoq.Mock.ofType<IApplicationShell>();

src/test/interpreters/interpreterService.unit.test.ts

@@ -37,6 +37,7 @@ import { PYTHON_PATH } from '../common';
 import { MockAutoSelectionService } from '../mocks/autoSelector';
 import * as proposedApi from '../../client/environmentApi';
 import { createTypeMoq } from '../mocks/helper';
+import * as extapi from '../../client/envExt/api.internal';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -62,8 +63,12 @@ suite('Interpreters service', () => {
     let installer: TypeMoq.IMock<IInstaller>;
     let appShell: TypeMoq.IMock<IApplicationShell>;
     let reportActiveInterpreterChangedStub: sinon.SinonStub;
+    let useEnvExtensionStub: sinon.SinonStub;
 
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         const cont = new Container();
         serviceManager = new ServiceManager(cont);
         serviceContainer = new ServiceContainer(cont);

src/test/providers/terminal.unit.test.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import { expect } from 'chai';
 import * as TypeMoq from 'typemoq';
 import { Disposable, Terminal, Uri } from 'vscode';
@@ -18,6 +19,7 @@ import {
 } from '../../client/common/types';
 import { IServiceContainer } from '../../client/ioc/types';
 import { TerminalProvider } from '../../client/providers/terminalProvider';
+import * as extapi from '../../client/envExt/api.internal';
 
 suite('Terminal Provider', () => {
     let serviceContainer: TypeMoq.IMock<IServiceContainer>;
@@ -26,8 +28,12 @@ suite('Terminal Provider', () => {
     let activeResourceService: TypeMoq.IMock<IActiveResourceService>;
     let experimentService: TypeMoq.IMock<IExperimentService>;
     let terminalProvider: TerminalProvider;
+    let useEnvExtensionStub: sinon.SinonStub;
     const resource = Uri.parse('a');
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         serviceContainer = TypeMoq.Mock.ofType<IServiceContainer>();
         commandManager = TypeMoq.Mock.ofType<ICommandManager>();
         experimentService = TypeMoq.Mock.ofType<IExperimentService>();
@@ -40,6 +46,7 @@ suite('Terminal Provider', () => {
         serviceContainer.setup((c) => c.get(IActiveResourceService)).returns(() => activeResourceService.object);
     });
     teardown(() => {
+        sinon.restore();
         try {
             terminalProvider.dispose();
         } catch {

src/test/terminals/codeExecution/codeExecutionManager.unit.test.ts

@@ -14,6 +14,7 @@ import { IConfigurationService } from '../../../client/common/types';
 import { IInterpreterService } from '../../../client/interpreter/contracts';
 import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 import * as triggerApis from '../../../client/pythonEnvironments/creation/createEnvironmentTrigger';
+import * as extapi from '../../../client/envExt/api.internal';
 
 suite('Terminal - Code Execution Manager', () => {
     let executionManager: ICodeExecutionManager;
@@ -25,7 +26,11 @@ suite('Terminal - Code Execution Manager', () => {
     let configService: TypeMoq.IMock<IConfigurationService>;
     let interpreterService: TypeMoq.IMock<IInterpreterService>;
     let triggerCreateEnvironmentCheckNonBlockingStub: sinon.SinonStub;
+    let useEnvExtensionStub: sinon.SinonStub;
     setup(() => {
+        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
+        useEnvExtensionStub.returns(false);
+
         workspace = TypeMoq.Mock.ofType<IWorkspaceService>();
         workspace
             .setup((c) => c.onDidChangeWorkspaceFolders(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()))