Skip to content
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

Jump to bottom

adopt to ensureNoDisposablesAreLeakedInTestSuite #192522

Merged
merged 1 commit into from
Sep 8, 2023
Merged

adopt to ensureNoDisposablesAreLeakedInTestSuite #192522

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti

suite('GlobalStateSync', () => {

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();
const server = new UserDataSyncTestServer();
let testClient: UserDataSyncClient;
let client2: UserDataSyncClient;

let testObject: GlobalStateSynchroniser;

teardown(async () => {
await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
testClient = disposableStore.add(new UserDataSyncClient(server));
await testClient.setUp(true);
Expand All @@ -35,10 +40,6 @@ suite('GlobalStateSync', () => {
await client2.setUp(true);
});

teardown(async () => {
await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
});

test('when global state does not exist', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
assert.deepStrictEqual(await testObject.getLastSyncUserData(), null);
let manifest = await testClient.getResourceManifest();
Expand Down
13 changes: 7 additions & 6 deletions src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import * as assert from 'assert';
import { VSBuffer } from 'vs/base/common/buffer';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { IFileService } from 'vs/platform/files/common/files';
import { ILogService } from 'vs/platform/log/common/log';
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
Expand All @@ -15,22 +15,23 @@ import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userData

suite('KeybindingsSync', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;

let testObject: KeybindingsSynchroniser;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
client = disposableStore.add(new UserDataSyncClient(server));
await client.setUp(true);
testObject = client.getSynchronizer(SyncResource.Keybindings) as KeybindingsSynchroniser;
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('when keybindings file does not exist', async () => {
const fileService = client.instantiationService.get(IFileService);
Expand Down
27 changes: 13 additions & 14 deletions src/vs/platform/userDataSync/test/common/settingsSync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import * as assert from 'assert';
import { VSBuffer } from 'vs/base/common/buffer';
import { Event } from 'vs/base/common/event';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
import { IFileService } from 'vs/platform/files/common/files';
Expand All @@ -19,11 +19,16 @@ import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userData

suite('SettingsSync - Auto', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;
let testObject: SettingsSynchroniser;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
'id': 'settingsSync',
Expand All @@ -44,11 +49,6 @@ suite('SettingsSync - Auto', () => {
testObject = client.getSynchronizer(SyncResource.Settings) as SettingsSynchroniser;
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('when settings file does not exist', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const fileService = client.instantiationService.get(IFileService);
const settingResource = client.instantiationService.get(IUserDataProfilesService).defaultProfile.settingsResource;
Expand Down Expand Up @@ -529,23 +529,22 @@ suite('SettingsSync - Auto', () => {

suite('SettingsSync - Manual', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;
let testObject: SettingsSynchroniser;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
client = disposableStore.add(new UserDataSyncClient(server));
await client.setUp(true);
testObject = client.getSynchronizer(SyncResource.Settings) as SettingsSynchroniser;
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});


test('do not sync ignored settings', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const settingsContent =
`{
Expand Down
14 changes: 7 additions & 7 deletions src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import * as assert from 'assert';
import { VSBuffer } from 'vs/base/common/buffer';
import { IStringDictionary } from 'vs/base/common/collections';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { dirname, joinPath } from 'vs/base/common/resources';
import { URI } from 'vs/base/common/uri';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { IFileService } from 'vs/platform/files/common/files';
import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
Expand Down Expand Up @@ -148,13 +148,18 @@ const globalSnippet = `{

suite('SnippetsSync', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let testClient: UserDataSyncClient;
let client2: UserDataSyncClient;

let testObject: SnippetsSynchroniser;

teardown(async () => {
await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
testClient = disposableStore.add(new UserDataSyncClient(server));
await testClient.setUp(true);
Expand All @@ -164,11 +169,6 @@ suite('SnippetsSync', () => {
await client2.setUp(true);
});

teardown(async () => {
await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('when snippets does not exist', async () => {
const fileService = testClient.instantiationService.get(IFileService);
const snippetsResource = testClient.instantiationService.get(IUserDataProfilesService).defaultProfile.snippetsHome;
Expand Down
38 changes: 19 additions & 19 deletions src/vs/platform/userDataSync/test/common/synchronizer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { Barrier } from 'vs/base/common/async';
import { VSBuffer } from 'vs/base/common/buffer';
import { CancellationToken } from 'vs/base/common/cancellation';
import { Emitter, Event } from 'vs/base/common/event';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { isEqual, joinPath } from 'vs/base/common/resources';
import { URI } from 'vs/base/common/uri';
import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { IFileService } from 'vs/platform/files/common/files';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
Expand Down Expand Up @@ -177,20 +177,20 @@ class TestSynchroniser extends AbstractSynchroniser {

suite('TestSynchronizer - Auto Sync', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
client = disposableStore.add(new UserDataSyncClient(server));
await client.setUp();
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('status is syncing', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));

Expand Down Expand Up @@ -484,20 +484,20 @@ suite('TestSynchronizer - Auto Sync', () => {

suite('TestSynchronizer - Manual Sync', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
client = disposableStore.add(new UserDataSyncClient(server));
await client.setUp();
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('preview', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
testObject.syncResult = { hasConflicts: false, hasError: false };
Expand Down Expand Up @@ -1062,20 +1062,20 @@ suite('TestSynchronizer - Manual Sync', () => {
});

suite('TestSynchronizer - Last Sync Data', () => {
const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
client = disposableStore.add(new UserDataSyncClient(server));
await client.setUp();
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('last sync data is null when not synced before', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));

Expand Down
14 changes: 7 additions & 7 deletions src/vs/platform/userDataSync/test/common/tasksSync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import * as assert from 'assert';
import { VSBuffer } from 'vs/base/common/buffer';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { IFileService } from 'vs/platform/files/common/files';
import { ILogService } from 'vs/platform/log/common/log';
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
Expand All @@ -15,23 +15,23 @@ import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userData

suite('TasksSync', () => {

const disposableStore = new DisposableStore();
const server = new UserDataSyncTestServer();
let client: UserDataSyncClient;

let testObject: TasksSynchroniser;

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
});

const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();

setup(async () => {
client = disposableStore.add(new UserDataSyncClient(server));
await client.setUp(true);
testObject = client.getSynchronizer(SyncResource.Tasks) as TasksSynchroniser;
});

teardown(async () => {
await client.instantiationService.get(IUserDataSyncStoreService).clear();
disposableStore.clear();
});

test('when tasks file does not exist', async () => {
const fileService = client.instantiationService.get(IFileService);
const tasksResource = client.instantiationService.get(IUserDataProfilesService).defaultProfile.tasksResource;
Expand Down