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

tests - make some tests faster by smaller unit sizes #151606

Merged
merged 1 commit into from
Jun 9, 2022
Merged

tests - make some tests faster by smaller unit sizes #151606

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
22 changes: 20 additions & 2 deletions src/vs/platform/backup/test/electron-main/backupMainService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,16 @@ flakySuite('BackupMainService', () => {
return pfs.Promises.rm(testDir);
});

test('service validates backup workspaces on startup and cleans up (folder workspaces)', async function () {
test('service validates backup workspaces on startup and cleans up (folder workspaces) (1)', async function () {

// 1) backup workspace path does not exist
service.registerFolderBackupSync(toFolderBackupInfo(fooFile));
service.registerFolderBackupSync(toFolderBackupInfo(barFile));
await service.initialize();
assertEqualFolderInfos(service.getFolderBackupPaths(), []);
});

test('service validates backup workspaces on startup and cleans up (folder workspaces) (2)', async function () {

// 2) backup workspace path exists with empty contents within
fs.mkdirSync(service.toBackupPath(fooFile));
Expand All @@ -157,6 +160,9 @@ flakySuite('BackupMainService', () => {
assertEqualFolderInfos(service.getFolderBackupPaths(), []);
assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
});

test('service validates backup workspaces on startup and cleans up (folder workspaces) (3)', async function () {

// 3) backup workspace path exists with empty folders within
fs.mkdirSync(service.toBackupPath(fooFile));
Expand All @@ -169,6 +175,9 @@ flakySuite('BackupMainService', () => {
assertEqualFolderInfos(service.getFolderBackupPaths(), []);
assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
});

test('service validates backup workspaces on startup and cleans up (folder workspaces) (4)', async function () {

// 4) backup workspace path points to a workspace that no longer exists
// so it should convert the backup worspace to an empty workspace backup
Expand All @@ -185,13 +194,16 @@ flakySuite('BackupMainService', () => {
assert.strictEqual(service.getEmptyWindowBackupPaths().length, 1);
});

test('service validates backup workspaces on startup and cleans up (root workspaces)', async function () {
test('service validates backup workspaces on startup and cleans up (root workspaces) (1)', async function () {

// 1) backup workspace path does not exist
service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(fooFile.fsPath));
service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(barFile.fsPath));
await service.initialize();
assert.deepStrictEqual(service.getWorkspaceBackups(), []);
});

test('service validates backup workspaces on startup and cleans up (root workspaces) (2)', async function () {

// 2) backup workspace path exists with empty contents within
fs.mkdirSync(service.toBackupPath(fooFile));
Expand All @@ -202,6 +214,9 @@ flakySuite('BackupMainService', () => {
assert.deepStrictEqual(service.getWorkspaceBackups(), []);
assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
});

test('service validates backup workspaces on startup and cleans up (root workspaces) (3)', async function () {

// 3) backup workspace path exists with empty folders within
fs.mkdirSync(service.toBackupPath(fooFile));
Expand All @@ -214,6 +229,9 @@ flakySuite('BackupMainService', () => {
assert.deepStrictEqual(service.getWorkspaceBackups(), []);
assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
});

test('service validates backup workspaces on startup and cleans up (root workspaces) (4)', async function () {

// 4) backup workspace path points to a workspace that no longer exists
// so it should convert the backup worspace to an empty workspace backup
Expand Down
99 changes: 90 additions & 9 deletions src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ suite('StoredFileWorkingCopy', function () {
assert.strictEqual(backupContents, 'hello backup');
});

test('save (no errors)', async () => {
test('save (no errors) - simple', async () => {
let savedCounter = 0;
let lastSaveEvent: IStoredFileWorkingCopySaveEvent | undefined = undefined;
workingCopy.onDidSave(e => {
Expand Down Expand Up @@ -453,56 +453,137 @@ suite('StoredFileWorkingCopy', function () {
assert.ok(lastSaveEvent!.stat);
assert.ok(isStoredFileWorkingCopySaveEvent(lastSaveEvent!));
assert.strictEqual(workingCopy.model?.pushedStackElement, true);
});

test('save (no errors) - save reason', async () => {
let savedCounter = 0;
let lastSaveEvent: IStoredFileWorkingCopySaveEvent | undefined = undefined;
workingCopy.onDidSave(e => {
savedCounter++;
lastSaveEvent = e;
});

let saveErrorCounter = 0;
workingCopy.onDidSaveError(() => {
saveErrorCounter++;
});

// save reason
await workingCopy.resolve();
workingCopy.model?.updateContents('hello save');

const source = SaveSourceRegistry.registerSource('testSource', 'Hello Save');
await workingCopy.save({ reason: SaveReason.AUTO, source });

assert.strictEqual(savedCounter, 2);
assert.strictEqual(savedCounter, 1);
assert.strictEqual(saveErrorCounter, 0);
assert.strictEqual(workingCopy.isDirty(), false);
assert.strictEqual((lastSaveEvent as IStoredFileWorkingCopySaveEvent).reason, SaveReason.AUTO);
assert.strictEqual((lastSaveEvent as IStoredFileWorkingCopySaveEvent).source, source);
assert.strictEqual((lastSaveEvent! as IStoredFileWorkingCopySaveEvent).reason, SaveReason.AUTO);
assert.strictEqual((lastSaveEvent! as IStoredFileWorkingCopySaveEvent).source, source);
});

test('save (no errors) - multiple', async () => {
let savedCounter = 0;
workingCopy.onDidSave(e => {
savedCounter++;
});

let saveErrorCounter = 0;
workingCopy.onDidSaveError(() => {
saveErrorCounter++;
});

// multiple saves in parallel are fine and result
// in a single save when content does not change
await workingCopy.resolve();
workingCopy.model?.updateContents('hello save');
await Promises.settled([
workingCopy.save({ reason: SaveReason.AUTO }),
workingCopy.save({ reason: SaveReason.EXPLICIT }),
workingCopy.save({ reason: SaveReason.WINDOW_CHANGE })
]);

assert.strictEqual(savedCounter, 3);
assert.strictEqual(savedCounter, 1);
assert.strictEqual(saveErrorCounter, 0);
assert.strictEqual(workingCopy.isDirty(), false);
});

test('save (no errors) - multiple, cancellation', async () => {
let savedCounter = 0;
workingCopy.onDidSave(e => {
savedCounter++;
});

let saveErrorCounter = 0;
workingCopy.onDidSaveError(() => {
saveErrorCounter++;
});

// multiple saves in parallel are fine and result
// in just one save operation (the second one
// cancels the first)
await workingCopy.resolve();
workingCopy.model?.updateContents('hello save');
const firstSave = workingCopy.save();
workingCopy.model?.updateContents('hello save more');
const secondSave = workingCopy.save();

await Promises.settled([firstSave, secondSave]);
assert.strictEqual(savedCounter, 4);
assert.strictEqual(savedCounter, 1);
assert.strictEqual(saveErrorCounter, 0);
assert.strictEqual(workingCopy.isDirty(), false);
});

test('save (no errors) - not forced but not dirty', async () => {
let savedCounter = 0;
workingCopy.onDidSave(e => {
savedCounter++;
});

let saveErrorCounter = 0;
workingCopy.onDidSaveError(() => {
saveErrorCounter++;
});

// no save when not forced and not dirty
await workingCopy.resolve();
await workingCopy.save();
assert.strictEqual(savedCounter, 4);
assert.strictEqual(savedCounter, 0);
assert.strictEqual(saveErrorCounter, 0);
assert.strictEqual(workingCopy.isDirty(), false);
});

test('save (no errors) - forced but not dirty', async () => {
let savedCounter = 0;
workingCopy.onDidSave(e => {
savedCounter++;
});

let saveErrorCounter = 0;
workingCopy.onDidSaveError(() => {
saveErrorCounter++;
});

// save when forced even when not dirty
await workingCopy.resolve();
await workingCopy.save({ force: true });
assert.strictEqual(savedCounter, 5);
assert.strictEqual(savedCounter, 1);
assert.strictEqual(saveErrorCounter, 0);
assert.strictEqual(workingCopy.isDirty(), false);
});

test('save (no errors) - save clears orphaned', async () => {
let savedCounter = 0;
workingCopy.onDidSave(e => {
savedCounter++;
});

let saveErrorCounter = 0;
workingCopy.onDidSaveError(() => {
saveErrorCounter++;
});

await workingCopy.resolve();

// save clears orphaned
const orphanedPromise = Event.toPromise(workingCopy.onDidChangeOrphaned);
Expand All @@ -514,7 +595,7 @@ suite('StoredFileWorkingCopy', function () {
assert.strictEqual(workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN), true);

await workingCopy.save({ force: true });
assert.strictEqual(savedCounter, 6);
assert.strictEqual(savedCounter, 1);
assert.strictEqual(saveErrorCounter, 0);
assert.strictEqual(workingCopy.isDirty(), false);
assert.strictEqual(workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN), false);
Expand Down