Move setup to suiteSetup

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

@@ -35,6 +35,11 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
 			instantiationService.get(IEnvironmentService) || instantiationService.stub(IEnvironmentService, TestEnvironmentService),
 			instantiationService.get(IExtensionManagementService) || instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: new Emitter() }));
 	}
+
+	public reset(): void {
+		this.getGloballyDisabledExtensions().forEach(d => this.setEnablement(d, true));
+		this.getWorkspaceDisabledExtensions().forEach(d => this.setEnablement(d, true, true));
+	}
 }
 
 suite('ExtensionEnablementService Test', () => {

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

@@ -26,33 +26,44 @@ import { IPager } from 'vs/base/common/paging';
 import { ITelemetryService, NullTelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 
-suite('ExtensionsActions Test => ', () => {
+suite('ExtensionsActions Test', () => {
 
 	let instantiationService: TestInstantiationService;
 
-	const installEvent: Emitter<InstallExtensionEvent> = new Emitter(),
-		didInstallEvent: Emitter<DidInstallExtensionEvent> = new Emitter(),
-		uninstallEvent: Emitter<string> = new Emitter(),
-		didUninstallEvent: Emitter<DidUninstallExtensionEvent> = new Emitter();
+	let installEvent: Emitter<InstallExtensionEvent>,
+		didInstallEvent: Emitter<DidInstallExtensionEvent>,
+		uninstallEvent: Emitter<string>,
+		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
+
+
+	suiteSetup(() => {
+		installEvent = new Emitter();
+		didInstallEvent = new Emitter();
+		uninstallEvent = new Emitter();
+		didUninstallEvent = new Emitter();
 
-	setup(() => {
 		instantiationService = new TestInstantiationService();
 		instantiationService.stub(IURLService, { onOpenURL: new Emitter().event });
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
 
 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
 		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidInstallExtension', didInstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
 
 		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
-		instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
+	});
+
+	setup(() => {
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
 		instantiationService.stub(IExtensionService, { getExtensions: () => TPromise.wrap([]) });
+		(<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
+
+		instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
 	});
 
 	teardown(() => {

src/vs/workbench/parts/extensions/test/node/extensionsWorkbenchService.test.ts

@@ -30,29 +30,38 @@ suite('ExtensionsWorkbenchService Test', () => {
 	let instantiationService: TestInstantiationService;
 	let testObject: IExtensionsWorkbenchService;
 
-	const installEvent: Emitter<InstallExtensionEvent> = new Emitter(),
-		didInstallEvent: Emitter<DidInstallExtensionEvent> = new Emitter(),
-		uninstallEvent: Emitter<string> = new Emitter(),
-		didUninstallEvent: Emitter<DidUninstallExtensionEvent> = new Emitter();
+	let installEvent: Emitter<InstallExtensionEvent>,
+		didInstallEvent: Emitter<DidInstallExtensionEvent>,
+		uninstallEvent: Emitter<string>,
+		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
+
+	suiteSetup(() => {
+		installEvent = new Emitter();
+		didInstallEvent = new Emitter();
+		uninstallEvent = new Emitter();
+		didUninstallEvent = new Emitter();
 
-	setup(() => {
 		instantiationService = new TestInstantiationService();
 		instantiationService.stub(IURLService, { onOpenURL: new Emitter().event });
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
 
 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
 		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidInstallExtension', didInstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
 
 		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
 	});
 
+	setup(() => {
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
+		(<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
+	});
+
 	teardown(() => {
 		(<ExtensionsWorkbenchService>testObject).dispose();
 	});