Skip to content

Register test services after starting LS #4135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DonJayamanne merged 1 commit into from
Jan 24, 2019
Merged

Register test services after starting LS #4135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/client/activation/languageServer/languageServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ import '../../common/extensions';
import { traceDecorators, traceError } from '../../common/logger';
import { Resource } from '../../common/types';
import { createDeferred, Deferred, sleep } from '../../common/utils/async';
import { swallowExceptions } from '../../common/utils/decorators';
import { noop } from '../../common/utils/misc';
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
import { EventName } from '../../telemetry/constants';
import { IUnitTestManagementService } from '../../unittests/types';
import { ILanguageClientFactory, ILanguageServer, LanguageClientFactory } from '../types';
import { ProgressReporting } from './progress';

Expand All @@ -26,7 +29,8 @@ export class LanguageServer implements ILanguageServer {
constructor(
@inject(ILanguageClientFactory)
@named(LanguageClientFactory.base)
private readonly factory: ILanguageClientFactory
private readonly factory: ILanguageClientFactory,
@inject(IUnitTestManagementService) private readonly testManager: IUnitTestManagementService
) {
this.startupCompleted = createDeferred<void>();
}
Expand Down Expand Up @@ -58,6 +62,7 @@ export class LanguageServer implements ILanguageServer {
const eventName = telemetryEvent.EventName || EventName.PYTHON_LANGUAGE_SERVER_TELEMETRY;
sendTelemetryEvent(eventName, telemetryEvent.Measurements, telemetryEvent.Properties);
});
await this.registerTestServices();
}
@traceDecorators.error('Failed to load Language Server extension')
public loadExtension(args?: {}) {
Expand All @@ -74,10 +79,18 @@ export class LanguageServer implements ILanguageServer {
.ignoreErrors();
}
@captureTelemetry(EventName.PYTHON_LANGUAGE_SERVER_READY, undefined, true)
private async serverReady(): Promise<void> {
protected async serverReady(): Promise<void> {
while (this.languageClient && !this.languageClient!.initializeResult) {
await sleep(100);
}
this.startupCompleted.resolve();
}
@swallowExceptions('Activating Unit Tests Manager for Language Server')
protected async registerTestServices() {
if (!this.languageClient) {
throw new Error('languageClient not initialized');
}
await this.testManager.activate();
await this.testManager.activateCodeLenses(new LanguageServerSymbolProvider(this.languageClient!));
}
}
26 changes: 22 additions & 4 deletions src/test/activation/languageServer/languageServer.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,37 @@
'use strict';

import { expect } from 'chai';
import { instance, mock, when } from 'ts-mockito';
import { anything, instance, mock, verify, when } from 'ts-mockito';
import * as typemoq from 'typemoq';
import { Uri } from 'vscode';
import { LanguageClient, LanguageClientOptions } from 'vscode-languageclient';
import { BaseLanguageClientFactory } from '../../../client/activation/languageServer/languageClientFactory';
import { LanguageServer } from '../../../client/activation/languageServer/languageServer';
import { ILanguageClientFactory, ILanguageServer } from '../../../client/activation/types';
import { ILanguageClientFactory } from '../../../client/activation/types';
import '../../../client/common/extensions';
import { IDisposable } from '../../../client/common/types';
import { sleep } from '../../../client/common/utils/async';
import { UnitTestManagementService } from '../../../client/unittests/main';
import { IUnitTestManagementService } from '../../../client/unittests/types';

//tslint:disable:no-require-imports no-require-imports no-var-requires no-any no-unnecessary-class max-func-body-length

suite('Language Server - LanguageServer', () => {
class LanguageServerTest extends LanguageServer{
// tslint:disable-next-line:no-unnecessary-override
public async registerTestServices() {
return super.registerTestServices();
}
}
let clientFactory: ILanguageClientFactory;
let server: ILanguageServer;
let server: LanguageServerTest;
let client: typemoq.IMock<LanguageClient>;
let testManager: IUnitTestManagementService;
setup(() => {
client = typemoq.Mock.ofType<LanguageClient>();
clientFactory = mock(BaseLanguageClientFactory);
server = new LanguageServer(instance(clientFactory));
testManager = mock(UnitTestManagementService);
server = new LanguageServerTest(instance(clientFactory), instance(testManager));
});
teardown(() => {
client.setup(c => c.stop()).returns(() => Promise.resolve());
Expand Down Expand Up @@ -77,6 +87,8 @@ suite('Language Server - LanguageServer', () => {
.verifiable(typemoq.Times.once());
await sleep(120);

verify(testManager.activate()).once();
verify(testManager.activateCodeLenses(anything())).once();
client.verify(c => c.sendRequest(typemoq.It.isAny(), typemoq.It.isAny()), typemoq.Times.atLeast(2));
});
test('Send telemetry when LS has started and disposes appropriately', async () => {
Expand Down Expand Up @@ -117,6 +129,9 @@ suite('Language Server - LanguageServer', () => {
.returns(() => true as any)
.verifiable(typemoq.Times.once());
await sleep(120);

verify(testManager.activate()).once();
verify(testManager.activateCodeLenses(anything())).once();
expect(() => server.loadExtension(loadExtensionArgs)).to.not.throw();
client.verify(c => c.sendRequest(typemoq.It.isAny(), typemoq.It.isAny()), typemoq.Times.once());
client.verify(c => c.stop(), typemoq.Times.never());
Expand All @@ -127,4 +142,7 @@ suite('Language Server - LanguageServer', () => {
client.verify(c => c.stop(), typemoq.Times.once());
startDisposable.verify(d => d.dispose(), typemoq.Times.once());
});
test('Ensure Errors raised when starting test manager are not bubbled up', async () => {
await server.registerTestServices();
});
});