Skip to content

Commit f99b8b6

Browse files
committed
Fix tests.
1 parent 4a36d53 commit f99b8b6

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

src/test/linters/lint.args.test.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ import { CancellationTokenSource, TextDocument, Uri, WorkspaceFolder } from 'vsc
1111
import { IDocumentManager, IWorkspaceService } from '../../client/common/application/types';
1212
import '../../client/common/extensions';
1313
import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
14-
import { IConfigurationService, IInstaller, ILintingSettings, IPythonSettings } from '../../client/common/types';
14+
import {
15+
IConfigurationService,
16+
IExtensions,
17+
IInstaller,
18+
ILintingSettings,
19+
IPythonSettings,
20+
} from '../../client/common/types';
1521
import {
1622
IInterpreterAutoSelectionService,
1723
IInterpreterAutoSelectionProxyService,
@@ -53,6 +59,7 @@ suite('Linting - Arguments', () => {
5359
let serviceContainer: ServiceContainer;
5460
let document: TypeMoq.IMock<TextDocument>;
5561
let workspaceService: TypeMoq.IMock<IWorkspaceService>;
62+
let extensionsService: TypeMoq.IMock<IExtensions>;
5663
const cancellationToken = new CancellationTokenSource().token;
5764
suiteSetup(initialize);
5865
setup(async () => {
@@ -122,6 +129,10 @@ suite('Linting - Arguments', () => {
122129
const platformService = TypeMoq.Mock.ofType<IPlatformService>();
123130
serviceManager.addSingletonInstance<IPlatformService>(IPlatformService, platformService.object);
124131

132+
extensionsService = TypeMoq.Mock.ofType<IExtensions>();
133+
extensionsService.setup((e) => e.getExtension(TypeMoq.It.isAny())).returns(() => undefined);
134+
serviceManager.addSingletonInstance<IExtensions>(IExtensions, extensionsService.object);
135+
125136
lm = new LinterManager(configService.object);
126137
serviceManager.addSingletonInstance<ILinterManager>(ILinterManager, lm);
127138
document = TypeMoq.Mock.ofType<TextDocument>();

src/test/linters/pylint.test.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { LanguageServerType } from '../../client/activation/types';
1818
import { IWorkspaceService } from '../../client/common/application/types';
1919
import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
2020
import { IPythonToolExecutionService } from '../../client/common/process/types';
21-
import { IConfigurationService, IInstaller, IPythonSettings } from '../../client/common/types';
21+
import { IConfigurationService, IExtensions, IInstaller, IPythonSettings } from '../../client/common/types';
2222
import {
2323
IInterpreterAutoSelectionService,
2424
IInterpreterAutoSelectionProxyService,
@@ -40,6 +40,7 @@ suite('Linting - Pylint', () => {
4040
let workspaceConfig: TypeMoq.IMock<WorkspaceConfiguration>;
4141
let pythonSettings: TypeMoq.IMock<IPythonSettings>;
4242
let serviceContainer: ServiceContainer;
43+
let extensionsService: TypeMoq.IMock<IExtensions>;
4344

4445
setup(() => {
4546
fileSystem = TypeMoq.Mock.ofType<IFileSystem>();
@@ -50,6 +51,9 @@ suite('Linting - Pylint', () => {
5051
platformService = TypeMoq.Mock.ofType<IPlatformService>();
5152
platformService.setup((x) => x.isWindows).returns(() => false);
5253

54+
extensionsService = TypeMoq.Mock.ofType<IExtensions>();
55+
extensionsService.setup((e) => e.getExtension(TypeMoq.It.isAny())).returns(() => undefined);
56+
5357
workspace = TypeMoq.Mock.ofType<IWorkspaceService>();
5458
execService = TypeMoq.Mock.ofType<IPythonToolExecutionService>();
5559

@@ -72,6 +76,7 @@ suite('Linting - Pylint', () => {
7276
IInterpreterAutoSelectionProxyService,
7377
MockAutoSelectionService,
7478
);
79+
serviceManager.addSingletonInstance<IExtensions>(IExtensions, extensionsService.object);
7580

7681
pythonSettings = TypeMoq.Mock.ofType<IPythonSettings>();
7782
pythonSettings.setup((p) => p.languageServer).returns(() => LanguageServerType.Jedi);

src/test/linters/pylint.unit.test.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq';
88
import * as vscode from 'vscode';
99
import { IWorkspaceService } from '../../client/common/application/types';
1010
import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
11-
import { IConfigurationService, IPythonSettings } from '../../client/common/types';
11+
import { IConfigurationService, IExtensions, IPythonSettings } from '../../client/common/types';
1212
import { IServiceContainer } from '../../client/ioc/types';
1313
import { IToolsExtensionPrompt } from '../../client/linters/prompts/types';
1414
import { Pylint } from '../../client/linters/pylint';
@@ -22,6 +22,7 @@ suite('Pylint - Function runLinter()', () => {
2222
let manager: TypeMoq.IMock<ILinterManager>;
2323
let _info: TypeMoq.IMock<ILinterInfo>;
2424
let platformService: TypeMoq.IMock<IPlatformService>;
25+
let extensionsService: TypeMoq.IMock<IExtensions>;
2526
let run: sinon.SinonStub;
2627
let parseMessagesSeverity: sinon.SinonStub;
2728
let extensionPrompt: TypeMoq.IMock<IToolsExtensionPrompt>;
@@ -77,6 +78,7 @@ suite('Pylint - Function runLinter()', () => {
7778
serviceContainer = TypeMoq.Mock.ofType<IServiceContainer>();
7879
workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();
7980
configService = TypeMoq.Mock.ofType<IConfigurationService>();
81+
extensionsService = TypeMoq.Mock.ofType<IExtensions>();
8082
manager = TypeMoq.Mock.ofType<ILinterManager>();
8183
serviceContainer.setup((c) => c.get(TypeMoq.It.isValue(ILinterManager))).returns(() => manager.object);
8284
serviceContainer
@@ -89,6 +91,7 @@ suite('Pylint - Function runLinter()', () => {
8991
serviceContainer
9092
.setup((c) => c.get(TypeMoq.It.isValue(IPlatformService)))
9193
.returns(() => platformService.object);
94+
serviceContainer.setup((c) => c.get(TypeMoq.It.isValue(IExtensions))).returns(() => extensionsService.object);
9295
fileSystem = TypeMoq.Mock.ofType<IFileSystem>();
9396
fileSystem
9497
.setup((x) => x.arePathsSame(TypeMoq.It.isAnyString(), TypeMoq.It.isAnyString()))

0 commit comments

Comments
 (0)