grid - tests back to green

src/vs/workbench/services/actions/test/common/menuService.test.ts

@@ -10,66 +10,11 @@ import { MenuService } from 'vs/workbench/services/actions/common/menuService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { NullCommandService } from 'vs/platform/commands/common/commands';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ExtensionPointContribution, IExtensionDescription, IExtensionsStatus, IExtensionService, ProfileSession } from 'vs/workbench/services/extensions/common/extensions';
-import { Event, Emitter } from 'vs/base/common/event';
+import { TestExtensionService } from 'vs/workbench/test/workbenchTestServices';
 
 // --- service instances
 
-class MockExtensionService implements IExtensionService {
-
-	public _serviceBrand: any;
-
-	private _onDidRegisterExtensions = new Emitter<void>();
-	public get onDidRegisterExtensions(): Event<void> {
-		return this._onDidRegisterExtensions.event;
-	}
-
-	onDidChangeExtensionsStatus = null;
-
-	public activateByEvent(activationEvent: string): TPromise<void> {
-		throw new Error('Not implemented');
-	}
-
-	public whenInstalledExtensionsRegistered(): TPromise<boolean> {
-		return TPromise.as(true);
-	}
-
-	public getExtensions(): TPromise<IExtensionDescription[]> {
-		throw new Error('Not implemented');
-	}
-
-	public readExtensionPointContributions<T>(extPoint: IExtensionPoint<T>): TPromise<ExtensionPointContribution<T>[]> {
-		throw new Error('Not implemented');
-	}
-
-	public getExtensionsStatus(): { [id: string]: IExtensionsStatus; } {
-		throw new Error('Not implemented');
-	}
-
-	public canProfileExtensionHost() {
-		return false;
-	}
-
-	public startExtensionHostProfile(): TPromise<ProfileSession> {
-		throw new Error('Not implemented');
-	}
-
-	public restartExtensionHost(): void {
-		throw new Error('Method not implemented.');
-	}
-
-	public startExtensionHost(): void {
-		throw new Error('Method not implemented.');
-	}
-
-	public stopExtensionHost(): void {
-		throw new Error('Method not implemented.');
-	}
-}
-
-const extensionService = new MockExtensionService();
+const extensionService = new TestExtensionService();
 
 const contextKeyService = new class extends MockContextKeyService {
 	contextMatchesRules() {

src/vs/workbench/test/browser/parts/editor2/nextEditorPart.test.ts

@@ -136,6 +136,8 @@ suite('Next editor2 part tests', () => {
 		activeGroupChangeListener.dispose();
 		groupAddedListener.dispose();
 		groupRemovedListener.dispose();
+
+		part.dispose();
 	});
 
 	test('Editor part options', function () {
@@ -155,5 +157,7 @@ suite('Next editor2 part tests', () => {
 		assert.equal(part.partOptions.showTabs, false);
 		assert.equal(newOptions.showTabs, false);
 		assert.equal(oldOptions, currentOptions);
+
+		part.dispose();
 	});
 });

src/vs/workbench/test/workbenchTestServices.ts

@@ -56,15 +56,20 @@ import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderW
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IPosition, Position as EditorPosition } from 'vs/editor/common/core/position';
-import { ICommandAction } from 'vs/platform/actions/common/actions';
+import { ICommandAction, IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
 import { IConfirmation, IConfirmationResult, IDialogService, IDialogOptions } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { IExtensionService, ProfileSession, IExtensionsStatus, ExtensionPointContribution, IExtensionDescription } from '../services/extensions/common/extensions';
+import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { IKeybindingService } from '../../platform/keybinding/common/keybinding';
+import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/browser/decorations';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, void 0);
@@ -259,6 +264,10 @@ export function workbenchInstantiationService(): IInstantiationService {
 	instantiationService.stub(INotificationService, new TestNotificationService());
 	instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
 	instantiationService.stub(IWindowService, new TestWindowService());
+	instantiationService.stub(IMenuService, new TestMenuService());
+	instantiationService.stub(IKeybindingService, new MockKeybindingService());
+	instantiationService.stub(IDecorationsService, new TestDecorationsService());
+	instantiationService.stub(IExtensionService, new TestExtensionService());
 	instantiationService.stub(IWindowsService, new TestWindowsService());
 	instantiationService.stub(ITextFileService, <ITextFileService>instantiationService.createInstance(TestTextFileService));
 	instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
@@ -269,6 +278,42 @@ export function workbenchInstantiationService(): IInstantiationService {
 	return instantiationService;
 }
 
+export class TestDecorationsService implements IDecorationsService {
+	_serviceBrand: any;
+	onDidChangeDecorations: Event<IResourceDecorationChangeEvent> = Event.None;
+	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable { return toDisposable(); }
+	getDecoration(uri: URI, includeChildren: boolean, overwrite?: IDecorationData): IDecoration { return void 0; }
+}
+
+export class TestExtensionService implements IExtensionService {
+	_serviceBrand: any;
+	onDidRegisterExtensions: Event<void> = Event.None;
+	onDidChangeExtensionsStatus: Event<string[]> = Event.None;
+	activateByEvent(activationEvent: string): Promise<void> { return TPromise.as(void 0); }
+	whenInstalledExtensionsRegistered(): Promise<boolean> { return TPromise.as(true); }
+	getExtensions(): Promise<IExtensionDescription[]> { return TPromise.as([]); }
+	readExtensionPointContributions<T>(extPoint: IExtensionPoint<T>): Promise<ExtensionPointContribution<T>[]> { return TPromise.as(Object.create(null)); }
+	getExtensionsStatus(): { [id: string]: IExtensionsStatus; } { return Object.create(null); }
+	canProfileExtensionHost(): boolean { return false; }
+	startExtensionHostProfile(): Promise<ProfileSession> { return TPromise.as(Object.create(null)); }
+	restartExtensionHost(): void { }
+	startExtensionHost(): void { }
+	stopExtensionHost(): void { }
+}
+
+export class TestMenuService implements IMenuService {
+
+	public _serviceBrand: any;
+
+	createMenu(id: MenuId, scopedKeybindingService: IContextKeyService): IMenu {
+		return {
+			onDidChange: Event.None,
+			dispose: () => void 0,
+			getActions: () => []
+		};
+	}
+}
+
 export class TestHistoryService implements IHistoryService {
 
 	public _serviceBrand: any;