Skip to content

Commit 7e92bd8

Browse files
sandy081sandy081
committed
microsoft#17110 Move instantiation mock to platform/instantiaion layer
1 parent 7e6dbe9 commit 7e92bd8

21 files changed

Lines changed: 42 additions & 61 deletions

File tree

‎src/vs/platform/actions/test/common/actions.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
import assert = require('assert');
88
import WinJS = require('vs/base/common/winjs.base');
9-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
9+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1010
import { DeferredAction } from 'vs/platform/actions/common/actions';
1111
import Actions = require('vs/base/common/actions');
1212
import { AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
1313
import { IEventService } from 'vs/platform/event/common/event';
14+
import { EventService } from 'vs/platform/event/common/eventService';
1415

1516
export class TestAction extends Actions.Action {
1617
private service;
@@ -35,7 +36,7 @@ suite('Platform actions', () => {
3536
test('DeferredAction', (done) => {
3637

3738
let instantiationService: TestInstantiationService = new TestInstantiationService();
38-
instantiationService.stub(IEventService);
39+
instantiationService.stub(IEventService, EventService);
3940

4041
let action = new DeferredAction(
4142
instantiationService,

‎src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as sinon from 'sinon';
88
import * as assert from 'assert';
99
import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement';
1010
import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
11-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
11+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1212
import { TestEnvironmentService, TestWorkspace } from 'vs/test/utils/servicesTestUtils';
1313
import { Emitter } from 'vs/base/common/event';
1414
import { StorageService, InMemoryLocalStorage } from 'vs/platform/storage/common/storageService';

src/vs/test/utils/instantiationTestUtils.ts renamed to src/vs/platform/instantiation/test/common/instantiationServiceMock.ts

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,6 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
1313
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
1414
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
1515

16-
// Known services
17-
import { IEventService } from 'vs/platform/event/common/event';
18-
import { EventService } from 'vs/platform/event/common/eventService';
19-
import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
20-
import { ISearchService } from 'vs/platform/search/common/search';
21-
import { SearchService } from 'vs/workbench/services/search/node/searchService';
22-
import { IHistoryService } from 'vs/workbench/services/history/common/history';
23-
import { HistoryService } from 'vs/workbench/services/history/browser/history';
24-
import { IModeService } from 'vs/editor/common/services/modeService';
25-
import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
26-
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
27-
import { SimpleExtensionService } from 'vs/editor/browser/standalone/simpleServices';
28-
import { MarkerService } from 'vs/platform/markers/common/markerService';
29-
import { IMarkerService } from 'vs/platform/markers/common/markers';
30-
import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
31-
import { ReplaceService } from 'vs/workbench/parts/search/browser/replaceService';
32-
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
33-
import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
34-
3516
interface IServiceMock<T> {
3617
id: ServiceIdentifier<T>;
3718
service: any;
@@ -45,15 +26,6 @@ export class TestInstantiationService extends InstantiationService {
4526
super(_serviceCollection);
4627

4728
this._servciesMap = new LinkedMap<ServiceIdentifier<any>, any>();
48-
this._servciesMap.set(ITelemetryService, NullTelemetryService);
49-
this._servciesMap.set(IEventService, EventService);
50-
this._servciesMap.set(ISearchService, SearchService);
51-
this._servciesMap.set(IHistoryService, HistoryService);
52-
this._servciesMap.set(IModeService, ModeServiceImpl);
53-
this._servciesMap.set(IExtensionService, SimpleExtensionService);
54-
this._servciesMap.set(IMarkerService, MarkerService);
55-
this._servciesMap.set(IReplaceService, ReplaceService);
56-
this._servciesMap.set(IKeybindingService, WorkbenchKeybindingService);
5729
}
5830

5931
public get<T>(service: ServiceIdentifier<T>): T {

‎src/vs/test/utils/servicesTestUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import 'vs/workbench/parts/files/browser/files.contribution'; // load our contribution into the test
99
import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
1010
import { Promise, TPromise } from 'vs/base/common/winjs.base';
11-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
11+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1212
import { EventEmitter } from 'vs/base/common/eventEmitter';
1313
import * as paths from 'vs/base/common/paths';
1414
import * as assert from 'assert';

‎src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-bro
2121
import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
2222
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
2323
import { IURLService } from 'vs/platform/url/common/url';
24-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
24+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
2525
import { Emitter } from 'vs/base/common/event';
2626
import { IPager } from 'vs/base/common/paging';
2727
import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';

‎src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-bro
2222
import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
2323
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
2424
import { IURLService } from 'vs/platform/url/common/url';
25-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
25+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
2626
import Event, { Emitter } from 'vs/base/common/event';
2727
import { IPager } from 'vs/base/common/paging';
2828
import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import * as assert from 'assert';
88
import URI from 'vs/base/common/uri';
9-
import { TestInstantiationService, stubFunction } from 'vs/test/utils/instantiationTestUtils';
9+
import { TestInstantiationService, stubFunction } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1010
import { Match, FileMatch, FileMatchOrMatch } from 'vs/workbench/parts/search/common/searchModel';
1111
import { ReplaceAction } from 'vs/workbench/parts/search/browser/searchActions';
1212
import { ArrayNavigator } from 'vs/base/common/iterator';
@@ -24,7 +24,8 @@ suite('Search Actions', () => {
2424
setup(() => {
2525
instantiationService = new TestInstantiationService();
2626
instantiationService.stub(IModelService, createMockModelService(instantiationService));
27-
instantiationService.stub(IKeybindingService);
27+
instantiationService.stub(IKeybindingService, {});
28+
instantiationService.stub(IKeybindingService, 'getLabelFor', () => '');
2829
counter = 0;
2930
});
3031

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import * as assert from 'assert';
88
import uri from 'vs/base/common/uri';
99
import { Match, FileMatch, SearchResult } from 'vs/workbench/parts/search/common/searchModel';
10-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
10+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1111
import { SearchSorter, SearchDataSource } from 'vs/workbench/parts/search/browser/searchResultsView';
1212
import { IFileMatch, ILineMatch } from 'vs/platform/search/common/search';
1313
import { createMockModelService } from 'vs/test/utils/servicesTestUtils';

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
import * as assert from 'assert';
88
import * as sinon from 'sinon';
9-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
9+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1010
import { DeferredPPromise } from 'vs/test/utils/promiseTestUtils';
1111
import { PPromise } from 'vs/base/common/winjs.base';
1212
import { nullEvent } from 'vs/base/common/timer';
1313
import { SearchModel } from 'vs/workbench/parts/search/common/searchModel';
1414
import URI from 'vs/base/common/uri';
1515
import { IFileMatch, ILineMatch, ISearchService, ISearchComplete, ISearchProgressItem, IUncachedSearchStats } from 'vs/platform/search/common/search';
16-
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
16+
import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
1717
import { Range } from 'vs/editor/common/core/range';
1818
import { createMockModelService } from 'vs/test/utils/servicesTestUtils';
1919
import { IModelService } from 'vs/editor/common/services/modelService';
@@ -37,8 +37,10 @@ suite('SearchModel', () => {
3737
setup(() => {
3838
restoreStubs = [];
3939
instantiationService = new TestInstantiationService();
40-
instantiationService.stub(ITelemetryService);
40+
instantiationService.stub(ITelemetryService, NullTelemetryService);
4141
instantiationService.stub(IModelService, createMockModelService(instantiationService));
42+
instantiationService.stub(ISearchService, {});
43+
instantiationService.stub(ISearchService, 'search', PPromise.as({ results: [] }));
4244
});
4345

4446
teardown(() => {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
import * as assert from 'assert';
88
import * as sinon from 'sinon';
9-
import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
9+
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1010
import { Match, FileMatch, SearchResult, SearchModel } from 'vs/workbench/parts/search/common/searchModel';
1111
import URI from 'vs/base/common/uri';
1212
import { IFileMatch, ILineMatch } from 'vs/platform/search/common/search';
13-
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
13+
import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
1414
import { Range } from 'vs/editor/common/core/range';
1515
import { createMockModelService } from 'vs/test/utils/servicesTestUtils';
1616
import { IModelService } from 'vs/editor/common/services/modelService';
@@ -22,8 +22,10 @@ suite('SearchResult', () => {
2222

2323
setup(() => {
2424
instantiationService = new TestInstantiationService();
25-
instantiationService.stub(ITelemetryService);
25+
instantiationService.stub(ITelemetryService, NullTelemetryService);
2626
instantiationService.stub(IModelService, createMockModelService(instantiationService));
27+
instantiationService.stubPromise(IReplaceService, {});
28+
instantiationService.stubPromise(IReplaceService, 'replace', null);
2729
});
2830

2931
test('Line Match', function () {

0 commit comments

Comments
 (0)