development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix editor service tests

Browse source
This commit is contained in:
Benjamin Pasero 2022-02-11 10:00:12 +01:00
parent bb221a61d2
commit f0d562f2fe
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
1 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/vs/workbench/services/editor/test/browser/editorService.test.ts
View file

@ -1915,60 +1915,44 @@ suite('EditorService', () => {
let otherInput = new TestFileEditorInput(URI.parse('my://resource2-active'), TEST_EDITOR_INPUT_ID);
let editorsChangeEventCounter = 0;
async function assertEditorsChangeEvent(expected: number) {
await Event.toPromise(service.onDidEditorsChange);
async function assertEditorsChangeEvent(fn: () => Promise<unknown>, expected: number) {
const p = Event.toPromise(service.onDidEditorsChange);
await fn();
await p;
editorsChangeEventCounter++;
assert.strictEqual(editorsChangeEventCounter, expected);
}
// open
let p: Promise<unknown> = service.openEditor(input, { pinned: true });
await assertEditorsChangeEvent(1);
await p;
await assertEditorsChangeEvent(() => service.openEditor(input, { pinned: true }), 1);
// open (other)
p = service.openEditor(otherInput, { pinned: true });
await assertEditorsChangeEvent(2);
await p;
await assertEditorsChangeEvent(() => service.openEditor(otherInput, { pinned: true }), 2);
// close (inactive)
p = rootGroup.closeEditor(input);
await assertEditorsChangeEvent(3);
await p;
await assertEditorsChangeEvent(() => rootGroup.closeEditor(input), 3);
// close (active)
p = rootGroup.closeEditor(otherInput);
await assertEditorsChangeEvent(4);
await p;
await assertEditorsChangeEvent(() => rootGroup.closeEditor(otherInput), 4);
input = new TestFileEditorInput(URI.parse('my://resource-active'), TEST_EDITOR_INPUT_ID);
otherInput = new TestFileEditorInput(URI.parse('my://resource2-active'), TEST_EDITOR_INPUT_ID);
// open editors
p = service.openEditors([{ editor: input, options: { pinned: true } }, { editor: otherInput, options: { pinned: true } }]);
await assertEditorsChangeEvent(5);
await p;
await assertEditorsChangeEvent(() => service.openEditors([{ editor: input, options: { pinned: true } }, { editor: otherInput, options: { pinned: true } }]), 5);
// active editor change
p = service.openEditor(otherInput);
await assertEditorsChangeEvent(6);
await p;
await assertEditorsChangeEvent(() => service.openEditor(otherInput), 6);
// move editor (in group)
p = service.openEditor(input, { pinned: true, index: 1 });
await assertEditorsChangeEvent(7);
await p;
await assertEditorsChangeEvent(() => service.openEditor(input, { pinned: true, index: 1 }), 7);
// TODO @lramos15 Find a way to re-enable these tests
// move editor (across groups)
// const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
// rootGroup.moveEditor(input, rightGroup);
// await assertEditorsChangeEvent(8);
const rightGroup = part.addGroup(part.activeGroup, GroupDirection.RIGHT);
await assertEditorsChangeEvent(async () => rootGroup.moveEditor(input, rightGroup), 8);
// // move group
// part.moveGroup(rightGroup, rootGroup, GroupDirection.LEFT);
// await assertEditorsChangeEvent(9);
// move group
await assertEditorsChangeEvent(async () => part.moveGroup(rightGroup, rootGroup, GroupDirection.LEFT), 9);
});
test('two active editor change events when opening editor to the side', async function () {