Improving test infra. Tests for search model

microsoft · Jul 12, 2016 · ffd594a · ffd594a
1 parent 5d008fa
commit ffd594a
Show file tree

Hide file tree

Showing 31 changed files with 1,458 additions and 933 deletions.
diff --git a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts
@@ -5,11 +5,12 @@
 'use strict';
 
 import * as assert from 'assert';
+import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
 import URI from 'vs/base/common/uri';
 import {Range} from 'vs/editor/common/core/range';
 import {IMode, IndentAction} from 'vs/editor/common/modes';
 import {TokenSelectionSupport} from 'vs/editor/contrib/smartSelect/common/tokenSelectionSupport';
-import {createMockModelService} from 'vs/editor/test/common/servicesTestUtils';
+import {createMockModelService} from 'vs/test/utils/servicesTestUtils';
 import {MockTokenizingMode} from 'vs/editor/test/common/mocks/mockMode';
 import {LanguageConfigurationRegistry} from 'vs/editor/common/modes/languageConfigurationRegistry';
 
@@ -59,10 +60,15 @@ class MockJSMode extends MockTokenizingMode {
 
 suite('TokenSelectionSupport', () => {
 
-	let modelService = createMockModelService();
-	let tokenSelectionSupport = new TokenSelectionSupport(modelService);
+	let modelService;
+	let tokenSelectionSupport;
 	let _mode: IMode = new MockJSMode();
 
+	setup(() => {
+		modelService= createMockModelService(new TestInstantiationService());
+		tokenSelectionSupport = new TokenSelectionSupport(modelService);
+	});
+
 	function assertGetRangesToPosition(text:string[], lineNumber:number, column:number, ranges:Range[]): void {
 		let uri = URI.file('test.js');
 		modelService.createModel(text.join('\n'), _mode, uri);

diff --git a/src/vs/editor/test/common/modes/modesRegistry.test.ts b/src/vs/editor/test/common/modes/modesRegistry.test.ts
@@ -5,12 +5,22 @@
 'use strict';
 
 import 'vs/languages/html/common/html.contribution';
+import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
 import * as assert from 'assert';
-import {createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
+import {IExtensionService} from 'vs/platform/extensions/common/extensions';
 
 suite('Editor Modes - Modes Registry', () => {
+
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		instantiationService= new TestInstantiationService();
+		instantiationService.stub(IExtensionService);
+	});
+
 	test('Bug 12104: [f12] createModel not successfully handling mime type list?', () => {
-		let modeService = createMockModeService();
+		let modeService = instantiationService.createInstance(ModeServiceImpl);
 		assert.equal(modeService.getModeId('text/html,text/plain'), 'html');
 	});
 });

diff --git a/src/vs/editor/test/common/servicesTestUtils.ts b/src/vs/editor/test/common/servicesTestUtils.ts
diff --git a/src/vs/platform/actions/test/common/actions.test.ts b/src/vs/platform/actions/test/common/actions.test.ts
@@ -6,11 +6,10 @@
 
 import assert = require('assert');
 import WinJS = require('vs/base/common/winjs.base');
+import { TestInstantiationService } from 'vs/test/utils/instantiationTestUtils';
 import {DeferredAction} from 'vs/platform/actions/common/actions';
 import Actions = require('vs/base/common/actions');
 import EventEmitter = require('vs/base/common/eventEmitter');
-import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
-import {InstantiationService} from 'vs/platform/instantiation/common/instantiationService';
 import {AsyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
 import {IEventService} from 'vs/platform/event/common/event';
 
@@ -36,10 +35,11 @@ class TestEventService extends EventEmitter.EventEmitter {
 }
 
 suite('Platform actions', () => {
+
 	test('DeferredAction', (done) => {
 
-		let services = new ServiceCollection([IEventService, <any>{}]);
-		let instantiationService = new InstantiationService(services);
+		let instantiationService: TestInstantiationService= new TestInstantiationService();
+		instantiationService.stub(IEventService);
 
 		let action = new DeferredAction(
 			instantiationService,

diff --git a/src/vs/platform/telemetry/test/node/commonProperties.test.ts b/src/vs/platform/telemetry/test/node/commonProperties.test.ts
@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {resolveWorkbenchCommonProperties} from 'vs/platform/telemetry/node/workbenchCommonProperties';
-import {TestStorageService, TestContextService} from 'vs/workbench/test/common/servicesTestUtils';
+import {TestStorageService, TestContextService} from 'vs/test/utils/servicesTestUtils';
 
 suite('Telemetry - common properties', function () {