eslint

Author: ericsnowcurrently

src/client/testing/main.ts

@@ -60,7 +60,27 @@ import { TEST_OUTPUT_CHANNEL } from './constants';
 import { ITestingService } from './types';
 
 @injectable()
-export class UnitTestManagementService implements ITestingService, ITestManagementService, Disposable {
+export class TestingService implements ITestingService {
+    constructor(@inject(IServiceContainer) private serviceContainer: IServiceContainer) {}
+
+    public async activate(symbolProvider: DocumentSymbolProvider): Promise<void> {
+        const mgmt = this.serviceContainer.get<ITestManagementService>(ITestManagementService);
+        return ((mgmt as unknown) as ITestingService).activate(symbolProvider);
+    }
+
+    public register(): void {
+        const context = this.serviceContainer.get<ITestContextService>(ITestContextService);
+        context.register();
+    }
+
+    public getSettingsPropertyNames(product: Product): TestSettingsPropertyNames {
+        const helper = this.serviceContainer.get<ITestsHelper>(ITestsHelper);
+        return helper.getSettingsPropertyNames(product);
+    }
+}
+
+@injectable()
+export class UnitTestManagementService implements ITestManagementService, Disposable {
     private readonly outputChannel: OutputChannel;
     private activatedOnce: boolean = false;
     private readonly disposableRegistry: Disposable[];
@@ -97,10 +117,6 @@ export class UnitTestManagementService implements ITestingService, ITestManageme
     public get onDidStatusChange(): Event<WorkspaceTestStatus> {
         return this._onDidStatusChange.event;
     }
-    public register(): void {
-        const context = this.serviceContainer.get<ITestContextService>(ITestContextService);
-        context.register();
-    }
     public async activate(symbolProvider: DocumentSymbolProvider): Promise<void> {
         if (this.activatedOnce) {
             return;
@@ -118,10 +134,6 @@ export class UnitTestManagementService implements ITestingService, ITestManageme
         );
         await this.registerSymbolProvider(symbolProvider);
     }
-    public getSettingsPropertyNames(product: Product): TestSettingsPropertyNames {
-        const helper = this.serviceContainer.get<ITestsHelper>(ITestsHelper);
-        return helper.getSettingsPropertyNames(product);
-    }
     public checkExperiments() {
         const experiments = this.serviceContainer.get<IExperimentsManager>(IExperimentsManager);
         if (experiments.inExperiment(AlwaysDisplayTestExplorerGroups.experiment)) {

src/client/testing/serviceRegistry.ts

@@ -66,7 +66,7 @@ import { TestExplorerCommandHandler } from './explorer/commandHandlers';
 import { FailedTestHandler } from './explorer/failedTestHandler';
 import { TestTreeViewProvider } from './explorer/testTreeViewProvider';
 import { TreeViewService } from './explorer/treeView';
-import { UnitTestManagementService } from './main';
+import { TestingService, UnitTestManagementService } from './main';
 import { registerTypes as registerNavigationTypes } from './navigation/serviceRegistry';
 import { ITestExplorerCommandHandler } from './navigation/types';
 import { TestManager as NoseTestManager } from './nosetest/main';
@@ -133,10 +133,7 @@ export function registerTypes(serviceManager: IServiceManager) {
 
     serviceManager.addSingleton<ITestConfigurationService>(ITestConfigurationService, UnitTestConfigurationService);
     serviceManager.addSingleton<ITestManagementService>(ITestManagementService, UnitTestManagementService);
-    serviceManager.addSingletonInstance<ITestingService>(
-        ITestingService,
-        serviceManager.get<ITestingService>(ITestManagementService),
-    );
+    serviceManager.addSingleton<ITestingService>(ITestingService, TestingService);
 
     serviceManager.addSingleton<ITestResultDisplay>(ITestResultDisplay, TestResultDisplay);
     serviceManager.addSingleton<ITestDisplay>(ITestDisplay, TestDisplay);

src/test/activation/languageServer/languageServer.unit.test.ts

@@ -15,7 +15,7 @@ import { ICommandManager } from '../../../client/common/application/types';
 import '../../../client/common/extensions';
 import { IConfigurationService, IDisposable, IPythonSettings } from '../../../client/common/types';
 import { sleep } from '../../../client/common/utils/async';
-import { UnitTestManagementService } from '../../../client/testing/main';
+import { TestingService } from '../../../client/testing/main';
 import { ITestingService } from '../../../client/testing/types';
 
 //tslint:disable:no-require-imports no-require-imports no-var-requires no-any no-unnecessary-class max-func-body-length
@@ -36,7 +36,7 @@ suite('Language Server - LanguageServer', () => {
     setup(() => {
         client = typemoq.Mock.ofType<LanguageClient>();
         clientFactory = mock(DotNetLanguageClientFactory);
-        testManager = mock(UnitTestManagementService);
+        testManager = mock(TestingService);
         configService = typemoq.Mock.ofType<IConfigurationService>();
 
         commandManager = typemoq.Mock.ofType<ICommandManager>();