Skip to content

Commit d0d9954

Browse files
committed
Fixed tests
1 parent 62cf681 commit d0d9954

File tree

5 files changed

+25
-1
lines changed

5 files changed

+25
-1
lines changed

src/test/common/installer.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as path from 'path';
2+
import { instance, mock } from 'ts-mockito';
23
import * as TypeMoq from 'typemoq';
34
import { ConfigurationTarget, Uri } from 'vscode';
45
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types';
@@ -14,6 +15,8 @@ import { PersistentStateFactory } from '../../client/common/persistentState';
1415
import { PathUtils } from '../../client/common/platform/pathUtils';
1516
import { CurrentProcess } from '../../client/common/process/currentProcess';
1617
import { IProcessServiceFactory } from '../../client/common/process/types';
18+
import { TerminalHelper } from '../../client/common/terminal/helper';
19+
import { ITerminalHelper } from '../../client/common/terminal/types';
1720
import { IConfigurationService, ICurrentProcess, IInstaller, ILogger, IPathUtils, IPersistentStateFactory, IsWindows, ModuleNamePurpose, Product, ProductType } from '../../client/common/types';
1821
import { createDeferred } from '../../client/common/utils/async';
1922
import { getNamesAndValues } from '../../client/common/utils/enum';
@@ -94,6 +97,7 @@ suite('Installer', () => {
9497
test(`Ensure isInstalled for Product: '${prod.name}' executes the right command`, async () => {
9598
ioc.serviceManager.addSingletonInstance<IModuleInstaller>(IModuleInstaller, new MockModuleInstaller('one', false));
9699
ioc.serviceManager.addSingletonInstance<IModuleInstaller>(IModuleInstaller, new MockModuleInstaller('two', true));
100+
ioc.serviceManager.addSingletonInstance<ITerminalHelper>(ITerminalHelper, instance(mock(TerminalHelper)));
97101
if (prod.value === Product.ctags || prod.value === Product.unittest || prod.value === Product.isort) {
98102
return;
99103
}
@@ -120,6 +124,7 @@ suite('Installer', () => {
120124
test(`Ensure install for Product: '${prod.name}' executes the right command in IModuleInstaller`, async () => {
121125
ioc.serviceManager.addSingletonInstance<IModuleInstaller>(IModuleInstaller, new MockModuleInstaller('one', false));
122126
ioc.serviceManager.addSingletonInstance<IModuleInstaller>(IModuleInstaller, new MockModuleInstaller('two', true));
127+
ioc.serviceManager.addSingletonInstance<ITerminalHelper>(ITerminalHelper, instance(mock(TerminalHelper)));
123128
if (prod.value === Product.unittest || prod.value === Product.ctags || prod.value === Product.isort) {
124129
return;
125130
}

src/test/common/moduleInstaller.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { expect } from 'chai';
44
import * as path from 'path';
55
import { SemVer } from 'semver';
6+
import { instance, mock } from 'ts-mockito';
67
import * as TypeMoq from 'typemoq';
78
import { ConfigurationTarget, Uri, WorkspaceConfiguration } from 'vscode';
89
import { IWorkspaceService } from '../../client/common/application/types';
@@ -20,7 +21,8 @@ import { PlatformService } from '../../client/common/platform/platformService';
2021
import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
2122
import { CurrentProcess } from '../../client/common/process/currentProcess';
2223
import { IProcessServiceFactory, IPythonExecutionFactory } from '../../client/common/process/types';
23-
import { ITerminalService, ITerminalServiceFactory } from '../../client/common/terminal/types';
24+
import { TerminalHelper } from '../../client/common/terminal/helper';
25+
import { ITerminalHelper, ITerminalService, ITerminalServiceFactory } from '../../client/common/terminal/types';
2426
import { IConfigurationService, ICurrentProcess, IInstaller, ILogger, IPathUtils, IPersistentStateFactory, IPythonSettings, IsWindows } from '../../client/common/types';
2527
import { Architecture } from '../../client/common/utils/platform';
2628
import { ICondaService, IInterpreterLocatorService, IInterpreterService, INTERPRETER_LOCATOR_SERVICE, InterpreterType, PIPENV_SERVICE, PythonInterpreter } from '../../client/interpreter/contracts';
@@ -132,6 +134,7 @@ suite('Module Installer', () => {
132134
mockInterpreterLocator.setup(p => p.getInterpreters(TypeMoq.It.isAny())).returns(() => Promise.resolve([]));
133135
ioc.serviceManager.addSingletonInstance<IInterpreterLocatorService>(IInterpreterLocatorService, mockInterpreterLocator.object, INTERPRETER_LOCATOR_SERVICE);
134136
ioc.serviceManager.addSingletonInstance<IInterpreterLocatorService>(IInterpreterLocatorService, TypeMoq.Mock.ofType<IInterpreterLocatorService>().object, PIPENV_SERVICE);
137+
ioc.serviceManager.addSingletonInstance<ITerminalHelper>(ITerminalHelper, instance(mock(TerminalHelper)));
135138

136139
const processService = await ioc.serviceContainer.get<IProcessServiceFactory>(IProcessServiceFactory).create() as MockProcessService;
137140
processService.onExec((file, args, options, callback) => {
@@ -167,6 +170,7 @@ suite('Module Installer', () => {
167170
]));
168171
ioc.serviceManager.addSingletonInstance<IInterpreterLocatorService>(IInterpreterLocatorService, mockInterpreterLocator.object, INTERPRETER_LOCATOR_SERVICE);
169172
ioc.serviceManager.addSingletonInstance<IInterpreterLocatorService>(IInterpreterLocatorService, TypeMoq.Mock.ofType<IInterpreterLocatorService>().object, PIPENV_SERVICE);
173+
ioc.serviceManager.addSingletonInstance<ITerminalHelper>(ITerminalHelper, instance(mock(TerminalHelper)));
170174

171175
const processService = await ioc.serviceContainer.get<IProcessServiceFactory>(IProcessServiceFactory).create() as MockProcessService;
172176
processService.onExec((file, args, options, callback) => {

src/test/format/extension.format.test.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44

55
import * as fs from 'fs-extra';
66
import * as path from 'path';
7+
import { instance, mock } from 'ts-mockito';
78
import {
89
CancellationTokenSource, Position, Uri, window, workspace
910
} from 'vscode';
1011
import {
1112
IProcessServiceFactory, IPythonExecutionFactory
1213
} from '../../client/common/process/types';
14+
import { TerminalHelper } from '../../client/common/terminal/helper';
15+
import { ITerminalHelper } from '../../client/common/terminal/types';
1316
import { AutoPep8Formatter } from '../../client/formatters/autoPep8Formatter';
1417
import { BlackFormatter } from '../../client/formatters/blackFormatter';
1518
import { YapfFormatter } from '../../client/formatters/yapfFormatter';
19+
import { ICondaService } from '../../client/interpreter/contracts';
20+
import { CondaService } from '../../client/interpreter/locators/services/condaService';
1621
import { isPythonVersionInProcess } from '../common';
1722
import { closeActiveWindows, initialize, initializeTest } from '../initialize';
1823
import { MockProcessService } from '../mocks/proc';
@@ -97,6 +102,8 @@ suite('Formatting - General', () => {
97102

98103
// Mocks.
99104
ioc.registerMockProcessTypes();
105+
ioc.serviceManager.addSingletonInstance<ITerminalHelper>(ITerminalHelper, instance(mock(TerminalHelper)));
106+
ioc.serviceManager.addSingletonInstance<ICondaService>(ICondaService, instance(mock(CondaService)));
100107
}
101108

102109
async function injectFormatOutput(outputFileName: string) {

src/test/format/extension.sort.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import { expect } from 'chai';
33
import * as fs from 'fs';
44
import { EOL } from 'os';
55
import * as path from 'path';
6+
import { instance, mock } from 'ts-mockito';
67
import { commands, ConfigurationTarget, Position, Range, Uri, window, workspace } from 'vscode';
78
import { Commands } from '../../client/common/constants';
9+
import { ICondaService } from '../../client/interpreter/contracts';
10+
import { CondaService } from '../../client/interpreter/locators/services/condaService';
811
import { SortImportsEditingProvider } from '../../client/providers/importSortProvider';
912
import { ISortImportsEditingProvider } from '../../client/providers/types';
1013
import { updateSetting } from '../common';
@@ -51,6 +54,7 @@ suite('Sorting', () => {
5154
ioc.registerCommonTypes();
5255
ioc.registerVariableTypes();
5356
ioc.registerProcessTypes();
57+
ioc.serviceManager.addSingletonInstance<ICondaService>(ICondaService, instance(mock(CondaService)));
5458
}
5559
test('Without Config', async () => {
5660
const textDocument = await workspace.openTextDocument(fileToFormatWithoutConfig);

src/test/refactor/extension.refactor.extract.method.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import * as assert from 'assert';
44
import * as fs from 'fs-extra';
55
import * as path from 'path';
6+
import { instance, mock } from 'ts-mockito';
67
import { commands, Position, Range, Selection, TextEditorCursorStyle, TextEditorLineNumbersStyle, TextEditorOptions, Uri, window, workspace } from 'vscode';
78
import { getTextEditsFromPatch } from '../../client/common/editor';
9+
import { ICondaService } from '../../client/interpreter/contracts';
10+
import { CondaService } from '../../client/interpreter/locators/services/condaService';
811
import { extractMethod } from '../../client/providers/simpleRefactorProvider';
912
import { RefactorProxy } from '../../client/refactor/proxy';
1013
import { getExtensionSettings } from '../common';
@@ -50,6 +53,7 @@ suite('Method Extraction', () => {
5053
ioc.registerCommonTypes();
5154
ioc.registerProcessTypes();
5255
ioc.registerVariableTypes();
56+
ioc.serviceManager.addSingletonInstance<ICondaService>(ICondaService, instance(mock(CondaService)));
5357
}
5458

5559
async function testingMethodExtraction(shouldError: boolean, startPos: Position, endPos: Position): Promise<void> {

0 commit comments

Comments
 (0)