Skip to content

Commit 187c592

Browse files
aeschliaeschli
committed
TestWindowConfiguration
1 parent 9fce828 commit 187c592

6 files changed

Lines changed: 26 additions & 22 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,17 @@ import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textM
1616
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
1717
import { DefaultEndOfLine, ITextSnapshot } from 'vs/editor/common/model';
1818
import { Schemas } from 'vs/base/common/network';
19-
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
2019
import { FileService } from 'vs/platform/files/common/fileService';
2120
import { NullLogService } from 'vs/platform/log/common/log';
2221
import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
2322
import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
24-
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
2523
import { snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
2624
import { IFileService } from 'vs/platform/files/common/files';
2725
import { hashPath, BackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
2826
import { BACKUPS } from 'vs/platform/environment/common/environment';
2927
import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
3028
import { VSBuffer } from 'vs/base/common/buffer';
29+
import { TestWindowConfiguration } from 'vs/workbench/test/workbenchTestServices';
3130

3231
const userdataDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupfileservice');
3332
const appSettingsHome = path.join(userdataDir, 'User');
@@ -49,7 +48,7 @@ const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', hashPath(u
4948
class TestBackupEnvironmentService extends NativeWorkbenchEnvironmentService {
5049

5150
constructor(backupPath: string) {
52-
super({ ...parseArgs(process.argv, OPTIONS), ...{ backupPath, 'user-data-dir': userdataDir } } as IWindowConfiguration, process.execPath, 0);
51+
super({ ...TestWindowConfiguration, backupPath, 'user-data-dir': userdataDir }, TestWindowConfiguration.execPath, TestWindowConfiguration.windowId);
5352
}
5453
}
5554

‎src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import * as fs from 'fs';
1111
import * as json from 'vs/base/common/json';
1212
import { Registry } from 'vs/platform/registry/common/platform';
1313
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
14-
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
1514
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
16-
import { TestTextFileService, workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
15+
import { TestTextFileService, workbenchInstantiationService, TestWindowConfiguration } from 'vs/workbench/test/workbenchTestServices';
1716
import * as uuid from 'vs/base/common/uuid';
1817
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
1918
import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
@@ -40,13 +39,12 @@ import { IFileService } from 'vs/platform/files/common/files';
4039
import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache';
4140
import { KeybindingsEditingService, IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
4241
import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
43-
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
4442
import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
4543

4644
class TestEnvironmentService extends NativeWorkbenchEnvironmentService {
4745

4846
constructor(private _appSettingsHome: URI) {
49-
super(parseArgs(process.argv, OPTIONS) as IWindowConfiguration, process.execPath, 0);
47+
super(TestWindowConfiguration, TestWindowConfiguration.execPath, TestWindowConfiguration.windowId);
5048
}
5149

5250
get appSettingsHome() { return this._appSettingsHome; }

‎src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import * as os from 'os';
1111
import { URI } from 'vs/base/common/uri';
1212
import { Registry } from 'vs/platform/registry/common/platform';
1313
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
14-
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
1514
import * as pfs from 'vs/base/node/pfs';
1615
import * as uuid from 'vs/base/common/uuid';
1716
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
@@ -21,7 +20,7 @@ import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configurati
2120
import { IFileService } from 'vs/platform/files/common/files';
2221
import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
2322
import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
24-
import { workbenchInstantiationService, TestTextFileService, RemoteFileSystemProvider } from 'vs/workbench/test/workbenchTestServices';
23+
import { workbenchInstantiationService, TestTextFileService, RemoteFileSystemProvider, TestWindowConfiguration } from 'vs/workbench/test/workbenchTestServices';
2524
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
2625
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
2726
import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -32,7 +31,6 @@ import { createHash } from 'crypto';
3231
import { Schemas } from 'vs/base/common/network';
3332
import { originalFSPath } from 'vs/base/common/resources';
3433
import { isLinux } from 'vs/base/common/platform';
35-
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
3634
import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
3735
import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
3836
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
@@ -52,7 +50,7 @@ import { timeout } from 'vs/base/common/async';
5250
class TestEnvironmentService extends NativeWorkbenchEnvironmentService {
5351

5452
constructor(private _appSettingsHome: URI) {
55-
super(parseArgs(process.argv, OPTIONS) as IWindowConfiguration, process.execPath, 0);
53+
super(TestWindowConfiguration, TestWindowConfiguration.execPath, TestWindowConfiguration.windowId);
5654
}
5755

5856
get appSettingsHome() { return this._appSettingsHome; }
@@ -110,7 +108,7 @@ suite('WorkspaceContextService - Folder', () => {
110108
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
111109
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
112110
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, new DiskFileSystemProvider(new NullLogService()), environmentService));
113-
workspaceContextService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, new RemoteAgentService(<IWindowConfiguration>{}, environmentService, new RemoteAuthorityResolverService(), new SignService(undefined), new NullLogService()));
111+
workspaceContextService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, new RemoteAgentService(TestWindowConfiguration, environmentService, new RemoteAuthorityResolverService(), new SignService(undefined), new NullLogService()));
114112
return (<WorkspaceService>workspaceContextService).initialize(convertToWorkspacePayload(URI.file(folderDir)));
115113
});
116114
});

‎src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
1111
import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
1212
import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
1313
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
14-
import { TestEditorService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
14+
import { TestEditorService, TestContextService, TestWindowConfiguration } from 'vs/workbench/test/workbenchTestServices';
1515
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
1616
import { Disposable } from 'vs/base/common/lifecycle';
1717
import { IQuickInputService, IQuickPickItem, QuickPickInput, IPickOptions, Omit, IInputOptions, IQuickInputButton, IQuickPick, IInputBox, IQuickNavigateConfiguration } from 'vs/platform/quickinput/common/quickInput';
@@ -20,7 +20,6 @@ import * as Types from 'vs/base/common/types';
2020
import { EditorType } from 'vs/editor/common/editorCommon';
2121
import { Selection } from 'vs/editor/common/core/selection';
2222
import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
23-
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
2423
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
2524

2625
const mockLineNumber = 10;
@@ -618,7 +617,7 @@ class MockInputsConfigurationService extends TestConfigurationService {
618617

619618
class MockWorkbenchEnvironmentService extends NativeWorkbenchEnvironmentService {
620619

621-
constructor(env: platform.IProcessEnvironment) {
622-
super({ userEnv: env } as IWindowConfiguration, process.execPath, 0);
620+
constructor(userEnv: platform.IProcessEnvironment) {
621+
super({ ...TestWindowConfiguration, userEnv }, TestWindowConfiguration.execPath, TestWindowConfiguration.windowId);
623622
}
624623
}

‎src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,20 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
3838
import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
3939
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
4040
import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
41-
import { TestBackupFileService, TestContextService, TestEditorGroupsService, TestEditorService, TestLifecycleService, TestTextFileService, TestTextResourcePropertiesService, TestWorkingCopyService } from 'vs/workbench/test/workbenchTestServices';
41+
import { TestBackupFileService, TestContextService, TestEditorGroupsService, TestEditorService, TestLifecycleService, TestTextFileService, TestTextResourcePropertiesService, TestWorkingCopyService, TestWindowConfiguration } from 'vs/workbench/test/workbenchTestServices';
4242
import { FileService } from 'vs/platform/files/common/fileService';
4343
import { Schemas } from 'vs/base/common/network';
4444
import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
4545
import { URI } from 'vs/base/common/uri';
4646
import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
47-
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
4847
import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
49-
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
5048
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
5149
import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
5250

5351
class TestEnvironmentService extends NativeWorkbenchEnvironmentService {
5452

5553
constructor(private _appSettingsHome: URI) {
56-
super(parseArgs(process.argv, OPTIONS) as IWindowConfiguration, process.execPath, 0);
54+
super(TestWindowConfiguration, TestWindowConfiguration.execPath, TestWindowConfiguration.windowId);
5755
}
5856

5957
get appSettingsHome() { return this._appSettingsHome; }

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
6363
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
6464
import { EditorGroup } from 'vs/workbench/common/editor/editorGroup';
6565
import { Dimension } from 'vs/base/browser/dom';
66-
import { ILogService, NullLogService } from 'vs/platform/log/common/log';
66+
import { ILogService, NullLogService, LogLevel } from 'vs/platform/log/common/log';
6767
import { ILabelService } from 'vs/platform/label/common/label';
6868
import { timeout } from 'vs/base/common/async';
6969
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -100,7 +100,19 @@ export function createFileInput(instantiationService: IInstantiationService, res
100100
return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined);
101101
}
102102

103-
export const TestEnvironmentService = new NativeWorkbenchEnvironmentService(parseArgs(process.argv, OPTIONS) as IWindowConfiguration, process.execPath, 0);
103+
export const TestWindowConfiguration: IWindowConfiguration = {
104+
windowId: 0,
105+
sessionId: 'testSessionId',
106+
logLevel: LogLevel.Error,
107+
mainPid: 0,
108+
appRoot: '',
109+
userEnv: {},
110+
execPath: process.execPath,
111+
perfEntries: [],
112+
...parseArgs(process.argv, OPTIONS)
113+
};
114+
115+
export const TestEnvironmentService = new NativeWorkbenchEnvironmentService(TestWindowConfiguration, process.execPath, 0);
104116

105117
export class TestContextService implements IWorkspaceContextService {
106118
_serviceBrand: undefined;

0 commit comments

Comments
 (0)