Skip to content

Commit 862e5fb

Browse files
alexdimaalexdima
committed
Reduce layer breaking imports in tests
1 parent 7753554 commit 862e5fb

9 files changed

Lines changed: 20 additions & 12 deletions

File tree

‎src/vs/base/test/node/testUtils.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { join } from 'vs/base/common/path';
7+
import { generateUuid } from 'vs/base/common/uuid';
8+
9+
export function getRandomTestPath(tmpdir: string, ...segments: string[]): string {
10+
return join(tmpdir, ...segments, generateUuid());
11+
}

‎src/vs/platform/backup/test/electron-main/backupMainService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
1919
import { ConsoleLogMainService } from 'vs/platform/log/common/log';
2020
import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
2121
import { createHash } from 'crypto';
22-
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
22+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
2323
import { Schemas } from 'vs/base/common/network';
2424

2525
suite('BackupMainService', () => {

‎src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as os from 'os';
88
import * as extfs from 'vs/base/node/extfs';
99
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
1010
import { parseArgs } from 'vs/platform/environment/node/argv';
11-
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
11+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1212
import { join } from 'vs/base/common/path';
1313
import { mkdirp } from 'vs/base/node/pfs';
1414
import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/node/extensionGalleryService';

‎src/vs/platform/state/test/node/state.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as assert from 'assert';
77
import * as os from 'os';
88
import * as path from 'vs/base/common/path';
99
import * as extfs from 'vs/base/node/extfs';
10-
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
10+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1111
import { FileStorage } from 'vs/platform/state/node/stateService';
1212

1313
suite('StateService', () => {

‎src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as path from 'vs/base/common/path';
77
import * as os from 'os';
88
import * as fs from 'fs';
99
import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties';
10-
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
10+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1111
import { IStorageService, StorageScope, InMemoryStorageService } from 'vs/platform/storage/common/storage';
1212
import { del } from 'vs/base/node/extfs';
1313
import { mkdirp } from 'vs/base/node/pfs';

‎src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { WorkspacesMainService, IStoredWorkspace } from 'vs/platform/workspaces/
1515
import { WORKSPACE_EXTENSION, IWorkspaceIdentifier, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
1616
import { NullLogService } from 'vs/platform/log/common/log';
1717
import { URI } from 'vs/base/common/uri';
18-
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
18+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1919
import { isWindows } from 'vs/base/common/platform';
2020
import { normalizeDriveLetter } from 'vs/base/common/labels';
2121

‎src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import { URI as Uri } from 'vs/base/common/uri';
1313
import { BackupFileService, BackupFilesModel, hashPath } from 'vs/workbench/services/backup/node/backupFileService';
1414
import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
1515
import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textModel';
16-
import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
16+
import { TestContextService, TestTextResourceConfigurationService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
17+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1718
import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
1819
import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
1920
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';

‎src/vs/workbench/services/files/test/electron-browser/fileService.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import * as uuid from 'vs/base/common/uuid';
1414
import * as pfs from 'vs/base/node/pfs';
1515
import * as encodingLib from 'vs/base/node/encoding';
1616
import * as utils from 'vs/workbench/services/files/test/electron-browser/utils';
17-
import { TestEnvironmentService, TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
17+
import { TestEnvironmentService, TestContextService, TestTextResourceConfigurationService, TestLifecycleService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
18+
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1819
import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
1920
import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
2021
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';

‎src/vs/workbench/test/workbenchTestServices.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
4242
import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
4343
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
4444
import { IThemeService } from 'vs/platform/theme/common/themeService';
45-
import { generateUuid } from 'vs/base/common/uuid';
4645
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
4746
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
4847
import { IRecentlyOpened } from 'vs/platform/history/common/history';
@@ -1473,7 +1472,3 @@ export class TestViewletService implements IViewletService {
14731472

14741473
getProgressIndicator(_id: string): IProgressService | null { return null; }
14751474
}
1476-
1477-
export function getRandomTestPath(tmpdir: string, ...segments: string[]): string {
1478-
return join(tmpdir, ...segments, generateUuid());
1479-
}

0 commit comments

Comments
 (0)