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

revert: "More test disposables cleanup" (#192593)

Browse Source 
Revert "More test disposables cleanup (#192575)"

This reverts commit 35c2ce3aac.
This commit is contained in:
Joyce Er
2023-09-08 09:04:34 -07:00
committed by GitHub
parent a4a2d8f0f4
commit a5b244bbc8
4 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/base/test/browser/actionbar.test.ts
+5 -8
View File
@@ -6,19 +6,16 @@
import * as assert from 'assert';
import { ActionBar, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
import { Action, Separator } from 'vs/base/common/actions';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
suite('Actionbar', () => {
const store = ensureNoDisposablesAreLeakedInTestSuite();
test('prepareActions()', function () {
const a1 = new Separator();
const a2 = new Separator();
const a3 = store.add(new Action('a3'));
const a3 = new Action('a3');
const a4 = new Separator();
const a5 = new Separator();
const a6 = store.add(new Action('a6'));
const a6 = new Action('a6');
const a7 = new Separator();
const actions = prepareActions([a1, a2, a3, a4, a5, a6, a7]);
@@ -30,10 +27,10 @@ suite('Actionbar', () => {
test('hasAction()', function () {
const container = document.createElement('div');
const actionbar = store.add(new ActionBar(container));
const actionbar = new ActionBar(container);
const a1 = store.add(new Action('a1'));
const a2 = store.add(new Action('a2'));
const a1 = new Action('a1');
const a2 = new Action('a2');
actionbar.push(a1);
assert.strictEqual(actionbar.hasAction(a1), true);
src/vs/base/test/common/async.test.ts
+17 -29
View File
@@ -11,17 +11,14 @@ import { isCancellationError } from 'vs/base/common/errors';
import { Event } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri';
import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
suite('Async', () => {
const store = ensureNoDisposablesAreLeakedInTestSuite();
suite('cancelablePromise', function () {
test('set token, don\'t wait for inner promise', function () {
let canceled = 0;
const promise = async.createCancelablePromise(token => {
store.add(token.onCancellationRequested(_ => { canceled += 1; }));
token.onCancellationRequested(_ => { canceled += 1; });
return new Promise(resolve => { /*never*/ });
});
const result = promise.then(_ => assert.ok(false), err => {
@@ -36,7 +33,7 @@ suite('Async', () => {
test('cancel despite inner promise being resolved', function () {
let canceled = 0;
const promise = async.createCancelablePromise(token => {
store.add(token.onCancellationRequested(_ => { canceled += 1; }));
token.onCancellationRequested(_ => { canceled += 1; });
return Promise.resolve(1234);
});
const result = promise.then(_ => assert.ok(false), err => {
@@ -54,7 +51,7 @@ suite('Async', () => {
const cancellablePromise = async.createCancelablePromise(token => {
order.push('in callback');
store.add(token.onCancellationRequested(_ => order.push('cancelled')));
token.onCancellationRequested(_ => order.push('cancelled'));
return Promise.resolve(1234);
});
@@ -76,7 +73,7 @@ suite('Async', () => {
const cancellablePromise = async.createCancelablePromise(token => {
order.push('in callback');
store.add(token.onCancellationRequested(_ => order.push('cancelled')));
token.onCancellationRequested(_ => order.push('cancelled'));
return new Promise(c => setTimeout(c.bind(1234), 0));
});
@@ -800,51 +797,42 @@ suite('Async', () => {
});
test('raceCancellation', async () => {
const cts = store.add(new CancellationTokenSource());
const ctsTimeout = store.add(new CancellationTokenSource());
const cts = new CancellationTokenSource();
let triggered = false;
const timeout = async.timeout(100, ctsTimeout.token);
const p = async.raceCancellation(timeout.then(() => triggered = true), cts.token);
const p = async.raceCancellation(async.timeout(100).then(() => triggered = true), cts.token);
cts.cancel();
await p;
assert.ok(!triggered);
ctsTimeout.cancel();
});
test('raceTimeout', async () => {
const cts = store.add(new CancellationTokenSource());
const cts = new CancellationTokenSource();
// timeout wins
let timedout = false;
let triggered = false;
const ctsTimeout1 = store.add(new CancellationTokenSource());
const timeout1 = async.timeout(100, ctsTimeout1.token);
const p1 = async.raceTimeout(timeout1.then(() => triggered = true), 1, () => timedout = true);
const p1 = async.raceTimeout(async.timeout(100).then(() => triggered = true), 1, () => timedout = true);
cts.cancel();
await p1;
assert.ok(!triggered);
assert.strictEqual(timedout, true);
ctsTimeout1.cancel();
// promise wins
timedout = false;
const ctsTimeout2 = store.add(new CancellationTokenSource());
const timeout2 = async.timeout(1, ctsTimeout2.token);
const p2 = async.raceTimeout(timeout2.then(() => triggered = true), 100, () => timedout = true);
const p2 = async.raceTimeout(async.timeout(1).then(() => triggered = true), 100, () => timedout = true);
cts.cancel();
await p2;
assert.ok(triggered);
assert.strictEqual(timedout, false);
ctsTimeout2.cancel();
});
test('SequencerByKey', async () => {
@@ -1123,11 +1111,11 @@ suite('Async', () => {
}
};
const worker = store.add(new async.ThrottledWorker<number>({
const worker = new async.ThrottledWorker<number>({
maxWorkChunkSize: 5,
maxBufferedWork: undefined,
throttleDelay: 1
}, handler));
}, handler);
// Work less than chunk size
@@ -1235,11 +1223,11 @@ suite('Async', () => {
const handled: number[] = [];
const handler = (units: readonly number[]) => handled.push(...units);
const worker = store.add(new async.ThrottledWorker<number>({
const worker = new async.ThrottledWorker<number>({
maxWorkChunkSize: 5,
maxBufferedWork: 5,
throttleDelay: 1
}, handler));
}, handler);
let worked = worker.work([1, 2, 3]);
assert.strictEqual(worked, true);
@@ -1261,11 +1249,11 @@ suite('Async', () => {
const handled: number[] = [];
const handler = (units: readonly number[]) => handled.push(...units);
const worker = store.add(new async.ThrottledWorker<number>({
const worker = new async.ThrottledWorker<number>({
maxWorkChunkSize: 5,
maxBufferedWork: 5,
throttleDelay: 1
}, handler));
}, handler);
let worked = worker.work([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
assert.strictEqual(worked, false);
@@ -1280,11 +1268,11 @@ suite('Async', () => {
const handled: number[] = [];
const handler = (units: readonly number[]) => handled.push(...units);
const worker = store.add(new async.ThrottledWorker<number>({
const worker = new async.ThrottledWorker<number>({
maxWorkChunkSize: 5,
maxBufferedWork: undefined,
throttleDelay: 1
}, handler));
}, handler);
worker.dispose();
const worked = worker.work([1, 2, 3]);
src/vs/base/test/common/buffer.test.ts
-3
View File
@@ -7,12 +7,9 @@ import * as assert from 'assert';
import { timeout } from 'vs/base/common/async';
import { bufferedStreamToBuffer, bufferToReadable, bufferToStream, decodeBase64, encodeBase64, newWriteableBufferStream, readableToBuffer, streamToBuffer, VSBuffer } from 'vs/base/common/buffer';
import { peekStream } from 'vs/base/common/stream';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
suite('Buffer', () => {
ensureNoDisposablesAreLeakedInTestSuite();
test('issue #71993 - VSBuffer#toString returns numbers', () => {
const data = new Uint8Array([1, 2, 3, 'h'.charCodeAt(0), 'i'.charCodeAt(0), 4, 5]).buffer;
const buffer = VSBuffer.wrap(new Uint8Array(data, 3, 2));
src/vs/base/test/common/cancellation.test.ts
+17 -13
View File
@@ -4,12 +4,9 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
suite('CancellationToken', function () {
const store = ensureNoDisposablesAreLeakedInTestSuite();
test('None', () => {
assert.strictEqual(CancellationToken.None.isCancellationRequested, false);
assert.strictEqual(typeof CancellationToken.None.onCancellationRequested, 'function');
@@ -38,7 +35,7 @@ suite('CancellationToken', function () {
cancelCount += 1;
}
store.add(source.token.onCancellationRequested(onCancel));
source.token.onCancellationRequested(onCancel);
source.cancel();
source.cancel();
@@ -51,9 +48,15 @@ suite('CancellationToken', function () {
let count = 0;
const source = new CancellationTokenSource();
store.add(source.token.onCancellationRequested(() => count++));
store.add(source.token.onCancellationRequested(() => count++));
store.add(source.token.onCancellationRequested(() => count++));
source.token.onCancellationRequested(function () {
count += 1;
});
source.token.onCancellationRequested(function () {
count += 1;
});
source.token.onCancellationRequested(function () {
count += 1;
});
source.cancel();
assert.strictEqual(count, 3);
@@ -82,7 +85,9 @@ suite('CancellationToken', function () {
let count = 0;
const source = new CancellationTokenSource();
store.add(source.token.onCancellationRequested(() => count++));
source.token.onCancellationRequested(function () {
count += 1;
});
source.dispose();
source.cancel();
@@ -94,7 +99,9 @@ suite('CancellationToken', function () {
let count = 0;
const source = new CancellationTokenSource();
store.add(source.token.onCancellationRequested(() => count++));
source.token.onCancellationRequested(function () {
count += 1;
});
source.dispose(true);
// source.cancel();
@@ -113,15 +120,12 @@ suite('CancellationToken', function () {
const child = new CancellationTokenSource(parent.token);
let count = 0;
store.add(child.token.onCancellationRequested(() => count++));
child.token.onCancellationRequested(() => count += 1);
parent.cancel();
assert.strictEqual(count, 1);
assert.strictEqual(child.token.isCancellationRequested, true);
assert.strictEqual(parent.token.isCancellationRequested, true);
child.dispose();
parent.dispose();
});
});