#17110 Move instantiation mock to platform/instantiaion layer

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

@@ -6,11 +6,12 @@
 
 import assert = require('assert');
 import WinJS = require('vs/base/common/winjs.base');
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { DeferredAction } from 'vs/platform/actions/common/actions';
 import Actions = require('vs/base/common/actions');
 import { AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IEventService } from 'vs/platform/event/common/event';
+import { EventService } from 'vs/platform/event/common/eventService';
 
 export class TestAction extends Actions.Action {
 	private service;
@@ -35,7 +36,7 @@ suite('Platform actions', () => {
 	test('DeferredAction', (done) => {
 
 		let instantiationService: TestInstantiationService = new TestInstantiationService();
-		instantiationService.stub(IEventService);
+		instantiationService.stub(IEventService, EventService);
 
 		let action = new DeferredAction(
 			instantiationService,

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

@@ -8,7 +8,7 @@ import * as sinon from 'sinon';
 import * as assert from 'assert';
 import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { TestEnvironmentService, TestWorkspace } from 'vs/test/utils/servicesTestUtils';
 import { Emitter } from 'vs/base/common/event';
 import { StorageService, InMemoryLocalStorage } from 'vs/platform/storage/common/storageService';

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

@@ -13,25 +13,6 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
-// Known services
-import { IEventService } from 'vs/platform/event/common/event';
-import { EventService } from 'vs/platform/event/common/eventService';
-import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ISearchService } from 'vs/platform/search/common/search';
-import { SearchService } from 'vs/workbench/services/search/node/searchService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { HistoryService } from 'vs/workbench/services/history/browser/history';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
-import { IExtensionService } from 'vs/platform/extensions/common/extensions';
-import { SimpleExtensionService } from 'vs/editor/browser/standalone/simpleServices';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
-import { ReplaceService } from 'vs/workbench/parts/search/browser/replaceService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
-
 interface IServiceMock<T> {
 	id: ServiceIdentifier<T>;
 	service: any;
@@ -45,15 +26,6 @@ export class TestInstantiationService extends InstantiationService {
 		super(_serviceCollection);
 
 		this._servciesMap = new LinkedMap<ServiceIdentifier<any>, any>();
-		this._servciesMap.set(ITelemetryService, NullTelemetryService);
-		this._servciesMap.set(IEventService, EventService);
-		this._servciesMap.set(ISearchService, SearchService);
-		this._servciesMap.set(IHistoryService, HistoryService);
-		this._servciesMap.set(IModeService, ModeServiceImpl);
-		this._servciesMap.set(IExtensionService, SimpleExtensionService);
-		this._servciesMap.set(IMarkerService, MarkerService);
-		this._servciesMap.set(IReplaceService, ReplaceService);
-		this._servciesMap.set(IKeybindingService, WorkbenchKeybindingService);
 	}
 
 	public get<T>(service: ServiceIdentifier<T>): T {

src/vs/test/utils/servicesTestUtils.ts

@@ -8,7 +8,7 @@
 import 'vs/workbench/parts/files/browser/files.contribution'; // load our contribution into the test
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { Promise, TPromise } from 'vs/base/common/winjs.base';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { EventEmitter } from 'vs/base/common/eventEmitter';
 import * as paths from 'vs/base/common/paths';
 import * as assert from 'assert';

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

@@ -21,7 +21,7 @@ import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-bro
 import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
 import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
 import { IURLService } from 'vs/platform/url/common/url';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Emitter } from 'vs/base/common/event';
 import { IPager } from 'vs/base/common/paging';
 import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';

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

@@ -22,7 +22,7 @@ import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-bro
 import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
 import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
 import { IURLService } from 'vs/platform/url/common/url';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import Event, { Emitter } from 'vs/base/common/event';
 import { IPager } from 'vs/base/common/paging';
 import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';

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

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

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

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import uri from 'vs/base/common/uri';
 import { Match, FileMatch, SearchResult } from 'vs/workbench/parts/search/common/searchModel';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { SearchSorter, SearchDataSource } from 'vs/workbench/parts/search/browser/searchResultsView';
 import { IFileMatch, ILineMatch } from 'vs/platform/search/common/search';
 import { createMockModelService } from 'vs/test/utils/servicesTestUtils';

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

@@ -6,14 +6,14 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { DeferredPPromise } from 'vs/test/utils/promiseTestUtils';
 import { PPromise } from 'vs/base/common/winjs.base';
 import { nullEvent } from 'vs/base/common/timer';
 import { SearchModel } from 'vs/workbench/parts/search/common/searchModel';
 import URI from 'vs/base/common/uri';
 import { IFileMatch, ILineMatch, ISearchService, ISearchComplete, ISearchProgressItem, IUncachedSearchStats } from 'vs/platform/search/common/search';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Range } from 'vs/editor/common/core/range';
 import { createMockModelService } from 'vs/test/utils/servicesTestUtils';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -37,8 +37,10 @@ suite('SearchModel', () => {
 	setup(() => {
 		restoreStubs = [];
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(ITelemetryService);
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(IModelService, createMockModelService(instantiationService));
+		instantiationService.stub(ISearchService, {});
+		instantiationService.stub(ISearchService, 'search', PPromise.as({ results: [] }));
 	});
 
 	teardown(() => {

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

@@ -6,11 +6,11 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Match, FileMatch, SearchResult, SearchModel } from 'vs/workbench/parts/search/common/searchModel';
 import URI from 'vs/base/common/uri';
 import { IFileMatch, ILineMatch } from 'vs/platform/search/common/search';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Range } from 'vs/editor/common/core/range';
 import { createMockModelService } from 'vs/test/utils/servicesTestUtils';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -22,8 +22,10 @@ suite('SearchResult', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(ITelemetryService);
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(IModelService, createMockModelService(instantiationService));
+		instantiationService.stubPromise(IReplaceService, {});
+		instantiationService.stubPromise(IReplaceService, 'replace', null);
 	});
 
 	test('Line Match', function () {

src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts

@@ -7,12 +7,11 @@
 
 import * as assert from 'assert';
 import * as os from 'os';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IMessageService } from 'vs/platform/message/common/message';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IWorkspace } from 'vs/platform/workspace/common/workspace';
 import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { TestMessageService } from 'vs/test/utils/servicesTestUtils';
 
 suite('Workbench - TerminalInstance', () => {
@@ -21,7 +20,6 @@ suite('Workbench - TerminalInstance', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(IKeybindingService);
 		instantiationService.stub(IMessageService, new TestMessageService());
 	});
 

src/vs/workbench/parts/terminal/test/electron-browser/terminalService.test.ts

@@ -13,7 +13,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 //import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
 import { TerminalService } from 'vs/workbench/parts/terminal/electron-browser/terminalService';
 import { TERMINAL_DEFAULT_SHELL_LINUX, TERMINAL_DEFAULT_SHELL_OSX, TERMINAL_DEFAULT_SHELL_WINDOWS } from 'vs/workbench/parts/terminal/common/terminal';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TPromise } from 'vs/base/common/winjs.base';
 

src/vs/workbench/parts/welcome/test/common/gettingStarted.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 // import * as assert from 'assert';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 

src/vs/workbench/test/browser/editorStacksModel.test.ts

@@ -11,7 +11,7 @@ import { EditorInput, IFileEditorInput, IEditorIdentifier, IEditorGroup, IStacks
 import URI from 'vs/base/common/uri';
 import { TestStorageService, TestLifecycleService, TestContextService } from 'vs/test/utils/servicesTestUtils';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';

src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts

@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { BaseEditor, EditorInputAction, EditorInputActionContributor, EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorInput, EditorOptions, Extensions, IEditorRegistry, IEditorInputFactory } from 'vs/workbench/common/editor';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import * as Platform from 'vs/platform/platform';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';

src/vs/workbench/test/common/editor/editorModel.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { EditorModel } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
 import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
@@ -14,6 +14,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { StringEditorInput } from 'vs/workbench/common/editor/stringEditorInput';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { createMockModelService } from 'vs/test/utils/servicesTestUtils';
 
 class MyEditorModel extends EditorModel { }
@@ -26,7 +27,7 @@ suite('Workbench - EditorModel', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		modeService = instantiationService.stub(IModeService);
+		modeService = instantiationService.stub(IModeService, ModeServiceImpl);
 	});
 
 	test('EditorModel', function (done) {

src/vs/workbench/test/common/editor/rangeDecorations.test.ts

@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import URI from 'vs/base/common/uri';
 import { createMockModelService, TestEditorService, workbenchInstantiationService } from 'vs/test/utils/servicesTestUtils';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import WorkbenchEditorService = require('vs/workbench/services/editor/common/editorService');
 import { RangeHighlightDecorations } from 'vs/workbench/common/editor/rangeDecorations';
 import { Model } from 'vs/editor/common/model/model';
@@ -37,7 +38,7 @@ suite('Editor - Range decorations', () => {
 	setup(() => {
 		instantiationService = <TestInstantiationService>workbenchInstantiationService();
 		editorService = <WorkbenchEditorService.IWorkbenchEditorService>instantiationService.stub(WorkbenchEditorService.IWorkbenchEditorService, new TestEditorService(function () { }));
-		modeService = instantiationService.stub(IModeService);
+		modeService = instantiationService.stub(IModeService, ModeServiceImpl);
 		modelService = <IModelService>instantiationService.stub(IModelService, createMockModelService(instantiationService));
 		text = 'LINE1' + '\n' + 'LINE2' + '\n' + 'LINE3' + '\n' + 'LINE4' + '\r\n' + 'LINE5';
 		model = aModel(URI.file('some_file'));

src/vs/workbench/test/common/editor/stringEditorInput.test.ts

@@ -6,13 +6,14 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import URI from 'vs/base/common/uri';
 import { StringEditorInput } from 'vs/workbench/common/editor/stringEditorInput';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { createMockModelService, TestEditorService } from 'vs/test/utils/servicesTestUtils';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import WorkbenchEditorService = require('vs/workbench/services/editor/common/editorService');
 
 suite('Workbench - StringEditorInput', () => {
@@ -25,7 +26,7 @@ suite('Workbench - StringEditorInput', () => {
 	setup(() => {
 		instantiationService = new TestInstantiationService();
 		editorService = <WorkbenchEditorService.IWorkbenchEditorService>instantiationService.stub(WorkbenchEditorService.IWorkbenchEditorService, new TestEditorService(function () { }));
-		modeService = instantiationService.stub(IModeService);
+		modeService = instantiationService.stub(IModeService, ModeServiceImpl);
 		modelService = <IModelService>instantiationService.stub(IModelService, createMockModelService(instantiationService));
 	});
 

src/vs/workbench/test/common/editor/stringEditorModel.test.ts

@@ -6,10 +6,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { StringEditorModel } from 'vs/workbench/common/editor/stringEditorModel';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { createMockModelService } from 'vs/test/utils/servicesTestUtils';
 
 suite('Workbench - StringEditorModel', () => {
@@ -18,7 +19,7 @@ suite('Workbench - StringEditorModel', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(IModeService);
+		instantiationService.stub(IModeService, ModeServiceImpl);
 	});
 
 	test('StringEditorModel', function (done) {

src/vs/workbench/test/node/api/extHostApiCommands.test.ts

@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import { setUnexpectedErrorHandler, errorHandler } from 'vs/base/common/errors';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/workbench/api/node/extHostTypes';

src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { setUnexpectedErrorHandler, errorHandler } from 'vs/base/common/errors';
 import URI from 'vs/base/common/uri';
 import * as types from 'vs/workbench/api/node/extHostTypes';
@@ -16,6 +16,7 @@ import { Position as EditorPosition } from 'vs/editor/common/core/position';
 import { Range as EditorRange } from 'vs/editor/common/core/range';
 import { TestThreadService } from './testThreadService';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { MarkerService } from 'vs/platform/markers/common/markerService';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
 import { MainThreadLanguageFeatures } from 'vs/workbench/api/node/mainThreadLanguageFeatures';
@@ -67,7 +68,7 @@ suite('ExtHostLanguageFeatures', function () {
 		threadService = new TestThreadService();
 		let instantiationService = new TestInstantiationService();
 		instantiationService.stub(IThreadService, threadService);
-		instantiationService.stub(IMarkerService);
+		instantiationService.stub(IMarkerService, MarkerService);
 		instantiationService.stub(IHeapService, {
 			_serviceBrand: undefined,
 			trackRecursive(args) {