Adopt ensureNoDisposablesAreLeakedInTestSuite round 2 (microsoft#202230)

0YJ · Jan 11, 2024 · c30c5b3 · c30c5b3
1 parent 74f8c5c
commit c30c5b3
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 11 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -153,16 +153,11 @@
 							"src/vs/base/test/browser/comparers.test.ts",
 							"src/vs/base/test/browser/hash.test.ts",
 							"src/vs/base/test/browser/indexedDB.test.ts",
-							"src/vs/base/test/browser/ui/menu/menubar.test.ts",
 							"src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts",
 							"src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
 							"src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts",
 							"src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts",
 							"src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts",
-							"src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts",
-							"src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts",
-							"src/vs/editor/contrib/folding/test/browser/indentFold.test.ts",
-							"src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts",
 							"src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts",
 							"src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts",
 							"src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts",
@@ -193,7 +188,6 @@
 							"src/vs/platform/telemetry/test/browser/1dsAppender.test.ts",
 							"src/vs/platform/workspace/test/common/workspace.test.ts",
 							"src/vs/platform/workspaces/test/electron-main/workspaces.test.ts",
-							"src/vs/server/test/node/serverConnectionToken.test.ts",
 							"src/vs/workbench/api/test/browser/extHostApiCommands.test.ts",
 							"src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts",
 							"src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts",
@@ -223,7 +217,6 @@
 							"src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts",
 							"src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts",
 							"src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts",
-							"src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts",
 							"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
 							"src/vs/workbench/test/browser/quickAccess.test.ts"
 						]

diff --git a/src/vs/base/test/browser/ui/menu/menubar.test.ts b/src/vs/base/test/browser/ui/menu/menubar.test.ts
@@ -7,6 +7,7 @@ import * as assert from 'assert';
 import { $ } from 'vs/base/browser/dom';
 import { unthemedMenuStyles } from 'vs/base/browser/ui/menu/menu';
 import { MenuBar } from 'vs/base/browser/ui/menu/menubar';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 function getButtonElementByAriaLabel(menubarElement: HTMLElement, ariaLabel: string): HTMLElement | null {
 	let i;
@@ -61,6 +62,7 @@ function validateMenuBarItem(menubar: MenuBar, menubarContainer: HTMLElement, la
 }
 
 suite('Menubar', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
 	const container = $('.container');
 
 	const menubar = new MenuBar(container, {

diff --git a/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts b/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
@@ -86,6 +87,7 @@ export class TestDecorationProvider {
 }
 
 suite('Folding Model', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
 	function r(startLineNumber: number, endLineNumber: number, isCollapsed: boolean = false): ExpectedRegion {
 		return { startLineNumber, endLineNumber, isCollapsed };
 	}

diff --git a/src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts b/src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { FoldingMarkers } from 'vs/editor/common/languages/languageConfiguration';
 import { MAX_FOLDING_REGIONS, FoldRange, FoldingRegions, FoldSource } from 'vs/editor/contrib/folding/browser/foldingRanges';
 import { RangesCollector, computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
@@ -15,7 +16,7 @@ const markers: FoldingMarkers = {
 };
 
 suite('FoldingRanges', () => {
-
+	ensureNoDisposablesAreLeakedInTestSuite();
 	const foldRange = (from: number, to: number, collapsed: boolean | undefined = undefined, source: FoldSource = FoldSource.provider, type: string | undefined = undefined) =>
 		<FoldRange>{
 			startLineNumber: from,

diff --git a/src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts b/src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts
@@ -18,6 +18,8 @@ interface ExpectedRange {
 }
 
 suite('Hidden Range Model', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	function r(startLineNumber: number, endLineNumber: number): ExpectedRange {
 		return { startLineNumber, endLineNumber };
 	}
@@ -96,6 +98,4 @@ suite('Hidden Range Model', () => {
 			hiddenRangeModel.dispose();
 		}
 	});
-
-	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/editor/contrib/folding/test/browser/indentFold.test.ts b/src/vs/editor/contrib/folding/test/browser/indentFold.test.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
 import { createTextModel } from 'vs/editor/test/common/testTextModel';
 
@@ -12,6 +13,8 @@ interface IndentRange {
 }
 
 suite('Indentation Folding', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	function r(start: number, end: number): IndentRange {
 		return { start, end };
 	}

diff --git a/src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts b/src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { FoldingMarkers } from 'vs/editor/common/languages/languageConfiguration';
 import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
 import { createTextModel } from 'vs/editor/test/common/testTextModel';
@@ -31,6 +32,7 @@ function r(startLineNumber: number, endLineNumber: number, parentIndex: number,
 }
 
 suite('Indentation Folding', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
 	test('Fold one level', () => {
 		const range = [
 			'A',
@@ -151,6 +153,7 @@ const markers: FoldingMarkers = {
 };
 
 suite('Folding with regions', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
 	test('Inside region, indented', () => {
 		assertRanges([
 		/* 1*/	'class A {',

diff --git a/src/vs/editor/contrib/folding/test/browser/syntaxFold.test.ts b/src/vs/editor/contrib/folding/test/browser/syntaxFold.test.ts
@@ -29,6 +29,8 @@ class TestFoldingRangeProvider implements FoldingRangeProvider {
 }
 
 suite('Syntax folding', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	function r(start: number, end: number): IndentRange {
 		return { start, end };
 	}
@@ -109,5 +111,4 @@ suite('Syntax folding', () => {
 
 		model.dispose();
 	});
-	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/server/test/node/serverConnectionToken.test.ts b/src/vs/server/test/node/serverConnectionToken.test.ts
@@ -7,11 +7,13 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { parseServerConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
 import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
 
 suite('parseServerConnectionToken', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function isError(r: ServerConnectionToken | ServerConnectionTokenParseError): r is ServerConnectionTokenParseError {
 		return (r instanceof ServerConnectionTokenParseError);

diff --git a/src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts b/src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts
@@ -20,6 +20,7 @@ import { IRequestService } from 'vs/platform/request/common/request';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 const undefinedStyle = { bold: undefined, underline: undefined, italic: undefined };
 const unsetStyle = { bold: false, underline: false, italic: false };
@@ -97,6 +98,8 @@ suite('Themes - TokenStyleResolving', () => {
 		diskFileSystemProvider.dispose();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('color defaults', async () => {
 		const themeData = ColorThemeData.createUnloadedTheme('foo');
 		themeData.location = FileAccess.asFileUri('vs/workbench/services/themes/test/node/color-theme.json');