fix microsoft#248686 (microsoft#250810)

* replace `wait` util with `timeout` usage

* remove `waitRandom`

* use `mock` over `mockObject` duplicate

Author: jrieken

src/vs/base/test/common/logTime.test.ts

@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { waitRandom } from './testUtils.js';
+import { timeout } from '../../common/async.js';
 import { randomInt } from '../../common/numbers.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 import { logExecutionTime, logTime } from '../../common/decorators/logTime.js';
@@ -46,7 +46,7 @@ suite('logTime', () => {
 
 				@logTime()
 				public async myAsyncMethod(): Promise<number> {
-					await waitRandom(10);
+					await timeout(10);
 
 					return this.returnValue;
 				}
@@ -146,7 +146,7 @@ suite('logTime', () => {
 
 			@logTime()
 			public async myAsyncMethod(): Promise<number> {
-				await waitRandom(10);
+				await timeout(10);
 
 				return this.returnValue;
 			}
@@ -196,7 +196,7 @@ suite('logTime', () => {
 			const resultPromise = logExecutionTime(
 				'my-async-function',
 				async () => {
-					await waitRandom(10);
+					await timeout(10);
 
 					return expectedReturnValue;
 				},

src/vs/base/test/common/mockObject.test.ts

@@ -6,7 +6,7 @@
 import assert from 'assert';
 import { spy } from 'sinon';
 import { ObjectCache } from '../../common/objectCache.js';
-import { wait } from '../../../base/test/common/testUtils.js';
+import { timeout } from '../../../base/common/async.js';
 import { ObservableDisposable } from '../../common/observableDisposable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
 
@@ -126,7 +126,7 @@ suite('ObjectCache', function () {
 			obj3.dispose();
 			// the object is removed from the cache asynchronously
 			// so add a small delay to ensure the object is removed
-			await wait(5);
+			await timeout(5);
 
 			const obj5 = cache.get(key1);
 			assert(

src/vs/base/test/common/objectCache.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { spy } from 'sinon';
-import { wait, waitRandom } from './testUtils.js';
+import { timeout } from '../../common/async.js';
 import { randomInt } from '../../common/numbers.js';
 import { Disposable, IDisposable } from '../../common/lifecycle.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
@@ -62,7 +62,7 @@ suite('ObservableDisposable', () => {
 				'`onDispose` callback must not be called yet.',
 			);
 
-			await waitRandom(10);
+			await timeout(10);
 
 			assert(
 				onDisposeSpy.notCalled,
@@ -71,7 +71,7 @@ suite('ObservableDisposable', () => {
 
 			// dispose object and wait for the event to be fired/received
 			object.dispose();
-			await wait(1);
+			await timeout(1);
 
 			/**
 			 * Validate that the callback was called.
@@ -93,7 +93,7 @@ suite('ObservableDisposable', () => {
 
 			object.dispose();
 			object.dispose();
-			await waitRandom(10, 5);
+			await timeout(10);
 			object.dispose();
 
 			assert(
@@ -115,23 +115,23 @@ suite('ObservableDisposable', () => {
 
 			// dispose object and wait for the event to be fired/received
 			object.dispose();
-			await wait(10);
+			await timeout(10);
 
 			const onDisposeSpy = spy();
 			disposables.add(object.onDispose(onDisposeSpy));
 
-			await wait(10);
+			await timeout(10);
 
 			assert(
 				onDisposeSpy.calledOnce,
 				'`onDispose` callback must be called immediately.',
 			);
 
-			await waitRandom(10, 5);
+			await timeout(10);
 
 			disposables.add(object.onDispose(onDisposeSpy));
 
-			await wait(10);
+			await timeout(10);
 
 			assert(
 				onDisposeSpy.calledTwice,
@@ -140,7 +140,7 @@ suite('ObservableDisposable', () => {
 
 			// dispose object and wait for the event to be fired/received
 			object.dispose();
-			await wait(10);
+			await timeout(10);
 
 			assert(
 				onDisposeSpy.calledTwice,
@@ -301,21 +301,21 @@ suite('ObservableDisposable', () => {
 				object.assertNotDisposed('Object must not be disposed.');
 			});
 
-			await waitRandom(10);
+			await timeout(10);
 
 			assert.doesNotThrow(() => {
 				object.assertNotDisposed('Object must not be disposed.');
 			});
 
 			// dispose object and wait for the event to be fired/received
 			object.dispose();
-			await wait(1);
+			await timeout(1);
 
 			assert.throws(() => {
 				object.assertNotDisposed('Object must not be disposed.');
 			});
 
-			await waitRandom(10);
+			await timeout(10);
 
 			assert.throws(() => {
 				object.assertNotDisposed('Object must not be disposed.');
@@ -335,7 +335,7 @@ suite('ObservableDisposable', () => {
 				);
 			});
 
-			await waitRandom(10);
+			await timeout(10);
 
 			assert.doesNotThrow(() => {
 				assertNotDisposed(
@@ -346,7 +346,7 @@ suite('ObservableDisposable', () => {
 
 			// dispose object and wait for the event to be fired/received
 			object.dispose();
-			await wait(1);
+			await timeout(1);
 
 			assert.throws(() => {
 				assertNotDisposed(
@@ -355,7 +355,7 @@ suite('ObservableDisposable', () => {
 				);
 			});
 
-			await waitRandom(10);
+			await timeout(10);
 
 			assert.throws(() => {
 				assertNotDisposed(

src/vs/base/test/common/observableDisposable.test.ts

@@ -3,9 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assert } from '../../common/assert.js';
-import { isOneOf } from '../../common/types.js';
-import { randomInt } from '../../common/numbers.js';
 
 export function flakySuite(title: string, fn: () => void) /* Suite */ {
 	return suite(title, function () {
@@ -22,22 +19,6 @@ export function flakySuite(title: string, fn: () => void) /* Suite */ {
 	});
 }
 
-/**
- * @deprecated use `async#timeout` instead
- */
-export const wait = (ms: number): Promise<void> => {
-	return new Promise(resolve => setTimeout(resolve, ms));
-};
-
-/**
- * Helper function that allows to await for a random amount of time.
- * @param maxMs The `maximum` amount of time to wait, in milliseconds.
- * @param minMs [`optional`] The `minimum` amount of time to wait, in milliseconds.
- */
-export const waitRandom = (maxMs: number, minMs: number = 0): Promise<void> => {
-	return wait(randomInt(maxMs, minMs));
-};
-
 /**
  * (pseudo)Random boolean generator.
  *
@@ -51,32 +32,3 @@ export const waitRandom = (maxMs: number, minMs: number = 0): Promise<void> => {
 export const randomBoolean = (): boolean => {
 	return Math.random() > 0.5;
 };
-
-/**
- * @deprecated use `mock.ts#mock` instead
- */
-export function mockObject<TObject extends Object>(
-	overrides: Partial<TObject>,
-): TObject {
-	// ensure that the overrides object cannot be modified afterward
-	overrides = Object.freeze(overrides);
-
-	const keys = Object.keys(overrides) as (keyof (typeof overrides))[];
-	const service = new Proxy(
-		{},
-		{
-			get: (_target, key: string | number | Symbol) => {
-				// sanity check for the provided `key`
-				assert(
-					isOneOf(key, keys),
-					`The '${key}' is not mocked.`,
-				);
-
-				return overrides[key];
-			},
-		});
-
-	// note! it's ok to `as TObject` here, because of
-	// 		 the runtime checks in the `Proxy` getter
-	return service as (typeof overrides) as TObject;
-}