Skip to content

Commit 4f4e26a

Browse files
author
Benjamin Pasero
committed
debt - move tests to correct layers
1 parent 05cf2fc commit 4f4e26a

120 files changed

Lines changed: 603 additions & 410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/vs/platform/commands/test/commands.test.ts renamed to src/vs/platform/commands/test/common/commands.test.ts

File renamed without changes.

src/vs/platform/files/test/files.test.ts renamed to src/vs/platform/files/test/common/files.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { URI } from 'vs/base/common/uri';
88
import { isEqual, isEqualOrParent } from 'vs/base/common/extpath';
99
import { FileChangeType, FileChangesEvent, isParent } from 'vs/platform/files/common/files';
1010
import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
11+
// eslint-disable-next-line code-import-patterns
1112
import { toResource } from 'vs/base/test/common/utils';
1213

1314
suite('Files', () => {

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

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,93 @@ import * as pfs from 'vs/base/node/pfs';
1111
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
1212
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
1313
import { WorkspacesMainService, IStoredWorkspace } from 'vs/platform/workspaces/electron-main/workspacesMainService';
14-
import { WORKSPACE_EXTENSION, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder, rewriteWorkspaceFileForNewLocation } from 'vs/platform/workspaces/common/workspaces';
14+
import { WORKSPACE_EXTENSION, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder, rewriteWorkspaceFileForNewLocation, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
1515
import { NullLogService } from 'vs/platform/log/common/log';
1616
import { URI } from 'vs/base/common/uri';
1717
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1818
import { isWindows } from 'vs/base/common/platform';
1919
import { normalizeDriveLetter } from 'vs/base/common/labels';
2020
import { dirname, joinPath } from 'vs/base/common/resources';
21-
import { TestBackupMainService, TestDialogMainService } from 'vs/workbench/test/workbenchTestServices';
21+
import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
22+
import { INativeOpenDialogOptions } from 'vs/platform/dialogs/node/dialogs';
23+
import { IBackupMainService, IWorkspaceBackupInfo } from 'vs/platform/backup/electron-main/backup';
24+
import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
25+
26+
export class TestDialogMainService implements IDialogMainService {
27+
_serviceBrand: undefined;
28+
29+
pickFileFolder(options: INativeOpenDialogOptions, window?: Electron.BrowserWindow | undefined): Promise<string[] | undefined> {
30+
throw new Error('Method not implemented.');
31+
}
32+
33+
pickFolder(options: INativeOpenDialogOptions, window?: Electron.BrowserWindow | undefined): Promise<string[] | undefined> {
34+
throw new Error('Method not implemented.');
35+
}
36+
37+
pickFile(options: INativeOpenDialogOptions, window?: Electron.BrowserWindow | undefined): Promise<string[] | undefined> {
38+
throw new Error('Method not implemented.');
39+
}
40+
41+
pickWorkspace(options: INativeOpenDialogOptions, window?: Electron.BrowserWindow | undefined): Promise<string[] | undefined> {
42+
throw new Error('Method not implemented.');
43+
}
44+
45+
showMessageBox(options: Electron.MessageBoxOptions, window?: Electron.BrowserWindow | undefined): Promise<Electron.MessageBoxReturnValue> {
46+
throw new Error('Method not implemented.');
47+
}
48+
49+
showSaveDialog(options: Electron.SaveDialogOptions, window?: Electron.BrowserWindow | undefined): Promise<Electron.SaveDialogReturnValue> {
50+
throw new Error('Method not implemented.');
51+
}
52+
53+
showOpenDialog(options: Electron.OpenDialogOptions, window?: Electron.BrowserWindow | undefined): Promise<Electron.OpenDialogReturnValue> {
54+
throw new Error('Method not implemented.');
55+
}
56+
}
57+
58+
export class TestBackupMainService implements IBackupMainService {
59+
_serviceBrand: undefined;
60+
61+
isHotExitEnabled(): boolean {
62+
throw new Error('Method not implemented.');
63+
}
64+
65+
getWorkspaceBackups(): IWorkspaceBackupInfo[] {
66+
throw new Error('Method not implemented.');
67+
}
68+
69+
getFolderBackupPaths(): URI[] {
70+
throw new Error('Method not implemented.');
71+
}
72+
73+
getEmptyWindowBackupPaths(): IEmptyWindowBackupInfo[] {
74+
throw new Error('Method not implemented.');
75+
}
76+
77+
registerWorkspaceBackupSync(workspace: IWorkspaceBackupInfo, migrateFrom?: string | undefined): string {
78+
throw new Error('Method not implemented.');
79+
}
80+
81+
registerFolderBackupSync(folderUri: URI): string {
82+
throw new Error('Method not implemented.');
83+
}
84+
85+
registerEmptyWindowBackupSync(backupFolder?: string | undefined, remoteAuthority?: string | undefined): string {
86+
throw new Error('Method not implemented.');
87+
}
88+
89+
unregisterWorkspaceBackupSync(workspace: IWorkspaceIdentifier): void {
90+
throw new Error('Method not implemented.');
91+
}
92+
93+
unregisterFolderBackupSync(folderUri: URI): void {
94+
throw new Error('Method not implemented.');
95+
}
96+
97+
unregisterEmptyWindowBackupSync(backupFolder: string): void {
98+
throw new Error('Method not implemented.');
99+
}
100+
}
22101

23102
suite('WorkspacesMainService', () => {
24103
const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'workspacesservice');

‎src/vs/workbench/contrib/backup/test/electron-browser/backupRestorer.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { DefaultEndOfLine } from 'vs/editor/common/model';
1515
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
1616
import { hashPath } from 'vs/workbench/services/backup/node/backupFileService';
1717
import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-browser/backupTracker';
18-
import { TestTextFileService, workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
18+
import { TestTextFileService, workbenchInstantiationService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
1919
import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
2020
import { BackupRestorer } from 'vs/workbench/contrib/backup/common/backupRestorer';
2121
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';

‎src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1313
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
1414
import { hashPath } from 'vs/workbench/services/backup/node/backupFileService';
1515
import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-browser/backupTracker';
16-
import { TestTextFileService, workbenchInstantiationService, TestLifecycleService, TestFilesConfigurationService, TestContextService, TestFileService, TestElectronService, TestFileDialogService } from 'vs/workbench/test/workbenchTestServices';
16+
import { TestLifecycleService, TestFilesConfigurationService, TestContextService, TestFileService, TestFileDialogService } from 'vs/workbench/test/browser/workbenchTestServices';
1717
import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
1818
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1919
import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
@@ -42,6 +42,7 @@ import { IElectronService } from 'vs/platform/electron/node/electron';
4242
import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
4343
import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
4444
import { IModelService } from 'vs/editor/common/services/modelService';
45+
import { TestTextFileService, TestElectronService, workbenchInstantiationService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
4546

4647
const userdataDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backuprestorer');
4748
const backupHome = path.join(userdataDir, 'Backups');

‎src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { MockSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
1111
import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
1212
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
1313
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
14-
import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
14+
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
1515
import { createMockSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
1616
import { isStatusbarInDebugMode } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
1717
import { State } from 'vs/workbench/contrib/debug/common/debug';

‎src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as dom from 'vs/base/browser/dom';
88
import { generateUuid } from 'vs/base/common/uuid';
99
import { appendStylizedStringToContainer, handleANSIOutput, calcANSI8bitColor } from 'vs/workbench/contrib/debug/browser/debugANSIHandling';
1010
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
11-
import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
11+
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
1212
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
1313
import { Color, RGBA } from 'vs/base/common/color';
1414
import { IThemeService } from 'vs/platform/theme/common/themeService';

‎src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as assert from 'assert';
77
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
8-
import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
8+
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
99
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
1010
import { isWindows } from 'vs/base/common/platform';
1111
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';

‎src/vs/workbench/contrib/debug/test/node/debugger.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
1111
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
1212
import { URI } from 'vs/base/common/uri';
1313
import { ExecutableDebugAdapter } from 'vs/workbench/contrib/debug/node/debugAdapter';
14-
import { TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';
14+
import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/modelService.test';
1515
import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
1616

1717

‎src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as assert from 'assert';
77
import { ExperimentActionType, ExperimentState, IExperiment, ExperimentService } from 'vs/workbench/contrib/experiments/common/experimentService';
88
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
9-
import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
9+
import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
1010
import {
1111
IExtensionManagementService, DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, ILocalExtension
1212
} from 'vs/platform/extensionManagement/common/extensionManagement';

0 commit comments

Comments
 (0)