Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-29 09:09:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopt ensureNoDisposablesAreLeakedInTestSuite for MainThreadWorkspace tests

Browse Source
This commit is contained in:
Rob Lourens
2023-09-05 15:32:56 -07:00
parent 13fe2caa64
commit fc2d092a34
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
+11 -16
View File
@@ -3,35 +3,30 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { ISearchService, IFileQuery } from 'vs/workbench/services/search/common/search';
import { MainThreadWorkspace } from 'vs/workbench/api/browser/mainThreadWorkspace';
import * as assert from 'assert';
import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { MainThreadWorkspace } from 'vs/workbench/api/browser/mainThreadWorkspace';
import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
import { IFileQuery, ISearchService } from 'vs/workbench/services/search/common/search';
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
suite('MainThreadWorkspace', () => {
const disposables = ensureNoDisposablesAreLeakedInTestSuite();
let disposables: DisposableStore;
let configService: TestConfigurationService;
let instantiationService: TestInstantiationService;
setup(() => {
disposables = new DisposableStore();
instantiationService = workbenchInstantiationService(undefined, disposables) as TestInstantiationService;
configService = instantiationService.get(IConfigurationService) as TestConfigurationService;
configService.setUserConfiguration('search', {});
});
teardown(() => {
disposables.dispose();
});
test('simple', () => {
instantiationService.stub(ISearchService, {
fileSearch(query: IFileQuery) {
@@ -45,7 +40,7 @@ suite('MainThreadWorkspace', () => {
}
});
const mtw = instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
return mtw.$startFileSearch('foo', null, null, 10, new CancellationTokenSource().token);
});
@@ -67,7 +62,7 @@ suite('MainThreadWorkspace', () => {
}
});
const mtw = instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
return mtw.$startFileSearch('', null, null, 10, new CancellationTokenSource().token);
});
@@ -88,7 +83,7 @@ suite('MainThreadWorkspace', () => {
}
});
const mtw = instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
return mtw.$startFileSearch('', null, false, 10, new CancellationTokenSource().token);
});
@@ -102,7 +97,7 @@ suite('MainThreadWorkspace', () => {
}
});
const mtw = instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
return mtw.$startFileSearch('', null, 'exclude/**', 10, new CancellationTokenSource().token);
});
});
src/vs/workbench/test/browser/workbenchTestServices.ts
+1 -1
View File
@@ -241,7 +241,7 @@ export function workbenchInstantiationService(
contextKeyService?: (instantiationService: IInstantiationService) => IContextKeyService;
textEditorService?: (instantiationService: IInstantiationService) => ITextEditorService;
},
disposables: DisposableStore = new DisposableStore()
disposables: Pick<DisposableStore, 'add'> = new DisposableStore()
): TestInstantiationService {
const instantiationService = disposables.add(new TestInstantiationService(new ServiceCollection([ILifecycleService, new TestLifecycleService()])));