Skip to content

Commit 4b800f0

Browse files
aeschliaeschli
committed
fix missing IThemeService in tests
1 parent 556eb1e commit 4b800f0

8 files changed

Lines changed: 23 additions & 2 deletions

File tree

‎src/vs/workbench/contrib/search/test/browser/searchActions.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import { IFileMatch } from 'vs/workbench/services/search/common/search';
1818
import { ReplaceAction } from 'vs/workbench/contrib/search/browser/searchActions';
1919
import { FileMatch, FileMatchOrMatch, Match } from 'vs/workbench/contrib/search/common/searchModel';
2020
import { MockObjectTree } from 'vs/workbench/contrib/search/test/browser/mockSearchTree';
21+
import { IThemeService } from 'vs/platform/theme/common/themeService';
22+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
2123

2224
suite('Search Actions', () => {
2325

@@ -153,6 +155,7 @@ suite('Search Actions', () => {
153155

154156
function stubModelService(instantiationService: TestInstantiationService): IModelService {
155157
instantiationService.stub(IConfigurationService, new TestConfigurationService());
158+
instantiationService.stub(IThemeService, new TestThemeService());
156159
return instantiationService.createInstance(ModelServiceImpl);
157160
}
158161
});

‎src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
1515
import { FileMatch, Match, searchMatchComparer, SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
1616
import { isWindows } from 'vs/base/common/platform';
1717
import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
18+
import { IThemeService } from 'vs/platform/theme/common/themeService';
19+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
1820

1921
suite('Search - Viewlet', () => {
2022
let instantiation: TestInstantiationService;
@@ -105,6 +107,7 @@ suite('Search - Viewlet', () => {
105107

106108
function stubModelService(instantiationService: TestInstantiationService): IModelService {
107109
instantiationService.stub(IConfigurationService, new TestConfigurationService());
110+
instantiationService.stub(IThemeService, new TestThemeService());
108111
return instantiationService.createInstance(ModelServiceImpl);
109112
}
110113
});

‎src/vs/workbench/contrib/search/test/common/searchModel.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1919
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
2020
import { SearchModel } from 'vs/workbench/contrib/search/common/searchModel';
2121
import * as process from 'vs/base/common/process';
22+
import { IThemeService } from 'vs/platform/theme/common/themeService';
23+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
2224

2325
const nullEvent = new class {
2426
id: number = -1;
@@ -328,6 +330,7 @@ suite('SearchModel', () => {
328330

329331
function stubModelService(instantiationService: TestInstantiationService): IModelService {
330332
instantiationService.stub(IConfigurationService, new TestConfigurationService());
333+
instantiationService.stub(IThemeService, new TestThemeService());
331334
return instantiationService.createInstance(ModelServiceImpl);
332335
}
333336

‎src/vs/workbench/contrib/search/test/common/searchResult.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
1616
import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
1717
import { IModelService } from 'vs/editor/common/services/modelService';
1818
import { IReplaceService } from 'vs/workbench/contrib/search/common/replace';
19+
import { IThemeService } from 'vs/platform/theme/common/themeService';
20+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
1921

2022
const lineOneRange = new OneLineRange(1, 0, 1);
2123

@@ -352,6 +354,7 @@ suite('SearchResult', () => {
352354

353355
function stubModelService(instantiationService: TestInstantiationService): IModelService {
354356
instantiationService.stub(IConfigurationService, new TestConfigurationService());
357+
instantiationService.stub(IThemeService, new TestThemeService());
355358
return instantiationService.createInstance(ModelServiceImpl);
356359
}
357360
});

‎src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ import { WorkingCopyFileService, IWorkingCopyFileService } from 'vs/workbench/se
5555
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
5656
import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
5757
import { TestTextResourcePropertiesService, TestContextService, TestWorkingCopyService } from 'vs/workbench/test/common/workbenchTestServices';
58+
import { IThemeService } from 'vs/platform/theme/common/themeService';
59+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
5860

5961
class TestEnvironmentService extends NativeWorkbenchEnvironmentService {
6062

@@ -107,6 +109,7 @@ suite('KeybindingsEditing', () => {
107109
instantiationService.stub(IFilesConfigurationService, instantiationService.createInstance(FilesConfigurationService));
108110
instantiationService.stub(ITextResourcePropertiesService, new TestTextResourcePropertiesService(instantiationService.get(IConfigurationService)));
109111
instantiationService.stub(IUndoRedoService, instantiationService.createInstance(UndoRedoService));
112+
instantiationService.stub(IThemeService, new TestThemeService());
110113
instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
111114
const fileService = new FileService(new NullLogService());
112115
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());

‎src/vs/workbench/test/browser/parts/editor/editorModel.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
2424
import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
2525
import { INotificationService } from 'vs/platform/notification/common/notification';
2626
import { TestTextResourcePropertiesService } from 'vs/workbench/test/common/workbenchTestServices';
27+
import { IThemeService } from 'vs/platform/theme/common/themeService';
28+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
2729

2830
class MyEditorModel extends EditorModel { }
2931
class MyTextEditorModel extends BaseTextEditorModel {
@@ -84,6 +86,7 @@ suite('Workbench editor model', () => {
8486
instantiationService.stub(IDialogService, dialogService);
8587
instantiationService.stub(INotificationService, notificationService);
8688
instantiationService.stub(IUndoRedoService, undoRedoService);
89+
instantiationService.stub(IThemeService, new TestThemeService());
8790
return instantiationService.createInstance(ModelServiceImpl);
8891
}
8992
});

‎src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import { CoreNavigationCommands } from 'vs/editor/browser/controller/coreCommand
2222
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
2323
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
2424
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
25+
import { IThemeService } from 'vs/platform/theme/common/themeService';
26+
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
2527

2628
suite('Editor - Range decorations', () => {
2729

@@ -157,6 +159,7 @@ suite('Editor - Range decorations', () => {
157159

158160
function stubModelService(instantiationService: TestInstantiationService): IModelService {
159161
instantiationService.stub(IConfigurationService, new TestConfigurationService());
162+
instantiationService.stub(IThemeService, new TestThemeService());
160163
return instantiationService.createInstance(ModelServiceImpl);
161164
}
162165
});

‎src/vs/workbench/test/browser/workbenchTestServices.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ export function workbenchInstantiationService(overrides?: { textFileService?: (i
141141
instantiationService.stub(IHistoryService, new TestHistoryService());
142142
instantiationService.stub(ITextResourcePropertiesService, new TestTextResourcePropertiesService(configService));
143143
instantiationService.stub(IUndoRedoService, instantiationService.createInstance(UndoRedoService));
144+
const themeService = new TestThemeService();
145+
instantiationService.stub(IThemeService, themeService);
144146
instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
145147
instantiationService.stub(IFileService, new TestFileService());
146148
instantiationService.stub(IBackupFileService, new TestBackupFileService());
@@ -156,8 +158,6 @@ export function workbenchInstantiationService(overrides?: { textFileService?: (i
156158
instantiationService.stub(ITextFileService, overrides?.textFileService ? overrides.textFileService(instantiationService) : <ITextFileService>instantiationService.createInstance(TestTextFileService));
157159
instantiationService.stub(IHostService, <IHostService>instantiationService.createInstance(TestHostService));
158160
instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
159-
const themeService = new TestThemeService();
160-
instantiationService.stub(IThemeService, themeService);
161161
instantiationService.stub(ILogService, new NullLogService());
162162
const editorGroupService = new TestEditorGroupsService([new TestEditorGroupView(0)]);
163163
instantiationService.stub(IEditorGroupsService, editorGroupService);

0 commit comments

Comments
 (0)