From b7ab10b8a80443be71230dac4d1aac5b4d8018cc Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 5 Feb 2020 15:07:58 +0100 Subject: [PATCH] move most API tests to browser-layer --- .eslintrc.json | 4 ++++ .../api/extHost.api.impl.test.ts | 0 .../api/extHostApiCommands.test.ts | 3 ++- .../api/extHostCommands.test.ts | 2 +- .../api/extHostConfiguration.test.ts | 2 +- .../api/extHostDiagnostics.test.ts | 2 +- .../api/extHostDocumentData.test.ts | 2 +- .../api/extHostDocumentSaveParticipant.test.ts | 2 +- .../api/extHostDocumentsAndEditors.test.ts | 2 +- .../api/extHostFileSystemEventService.test.ts | 0 .../api/extHostLanguageFeatures.test.ts | 2 +- .../api/extHostMessagerService.test.ts | 5 +++-- .../api/extHostTextEditor.test.ts | 2 +- .../api/extHostTextEditors.test.ts | 4 ++-- .../api/extHostTreeViews.test.ts | 2 +- .../api/extHostTypeConverter.test.ts | 0 .../{electron-browser => browser}/api/extHostTypes.test.ts | 0 .../{electron-browser => browser}/api/extHostWebview.test.ts | 4 ++-- .../api/extHostWorkspace.test.ts | 2 +- .../api/mainThreadCommands.test.ts | 2 +- .../api/mainThreadConfiguration.test.ts | 0 .../api/mainThreadDiagnostics.test.ts | 0 .../api/mainThreadDocumentContentProviders.test.ts | 4 ++-- .../api/mainThreadDocuments.test.ts | 0 .../api/mainThreadDocumentsAndEditors.test.ts | 2 +- .../api/mainThreadEditors.test.ts | 2 +- .../workbench/test/{electron-browser => browser}/api/mock.ts | 0 .../{electron-browser => browser}/api/testRPCProtocol.ts | 0 .../test/electron-browser/api/extHostSearch.test.ts | 4 ++-- .../test/electron-browser/api/mainThreadWorkspace.test.ts | 2 +- 30 files changed, 31 insertions(+), 25 deletions(-) rename src/vs/workbench/test/{electron-browser => browser}/api/extHost.api.impl.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostApiCommands.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostCommands.test.ts (97%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostConfiguration.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostDiagnostics.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostDocumentData.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostDocumentSaveParticipant.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostDocumentsAndEditors.test.ts (94%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostFileSystemEventService.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostLanguageFeatures.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostMessagerService.test.ts (96%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostTextEditor.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostTextEditors.test.ts (95%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostTreeViews.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostTypeConverter.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostTypes.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostWebview.test.ts (98%) rename src/vs/workbench/test/{electron-browser => browser}/api/extHostWorkspace.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadCommands.test.ts (97%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadConfiguration.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadDiagnostics.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadDocumentContentProviders.test.ts (92%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadDocuments.test.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadDocumentsAndEditors.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/mainThreadEditors.test.ts (99%) rename src/vs/workbench/test/{electron-browser => browser}/api/mock.ts (100%) rename src/vs/workbench/test/{electron-browser => browser}/api/testRPCProtocol.ts (100%) diff --git a/.eslintrc.json b/.eslintrc.json index 2a086870704..e7506985bd3 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -614,6 +614,10 @@ "*" ] }, + { + "target": "{**/api/**.test.ts,}", + "restrictions": "{**/vs/**,assert,sinon,crypto,vscode}" + }, { "target": "{**/**.test.ts,**/test/**}", "restrictions": "{**/vs/**,assert,sinon,crypto}" diff --git a/src/vs/workbench/test/electron-browser/api/extHost.api.impl.test.ts b/src/vs/workbench/test/browser/api/extHost.api.impl.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/extHost.api.impl.test.ts rename to src/vs/workbench/test/browser/api/extHost.api.impl.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts rename to src/vs/workbench/test/browser/api/extHostApiCommands.test.ts index cdd10023315..523742542a2 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts +++ b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts @@ -30,7 +30,7 @@ import { ITextModel } from 'vs/editor/common/model'; import { nullExtensionDescription, IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { dispose } from 'vs/base/common/lifecycle'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { NullApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; @@ -85,6 +85,7 @@ suite('ExtHostLanguageFeatureCommands', function () { async activateByEvent() { } + }); services.set(ICommandService, new SyncDescriptor(class extends mock() { diff --git a/src/vs/workbench/test/electron-browser/api/extHostCommands.test.ts b/src/vs/workbench/test/browser/api/extHostCommands.test.ts similarity index 97% rename from src/vs/workbench/test/electron-browser/api/extHostCommands.test.ts rename to src/vs/workbench/test/browser/api/extHostCommands.test.ts index 94dee4ef4d3..b20a56ba1f1 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostCommands.test.ts +++ b/src/vs/workbench/test/browser/api/extHostCommands.test.ts @@ -8,7 +8,7 @@ import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands'; import { MainThreadCommandsShape } from 'vs/workbench/api/common/extHost.protocol'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { SingleProxyRPCProtocol } from './testRPCProtocol'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { NullLogService } from 'vs/platform/log/common/log'; suite('ExtHostCommands', function () { diff --git a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts b/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts rename to src/vs/workbench/test/browser/api/extHostConfiguration.test.ts index 69bba733204..31e2b101394 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts +++ b/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts @@ -10,7 +10,7 @@ import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfigurat import { MainThreadConfigurationShape, IConfigurationInitData } from 'vs/workbench/api/common/extHost.protocol'; import { ConfigurationModel, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels'; import { TestRPCProtocol } from './testRPCProtocol'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/workspace'; import { ConfigurationTarget, IConfigurationModel, IConfigurationChange } from 'vs/platform/configuration/common/configuration'; import { NullLogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts b/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts rename to src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts index 1a3f95ea4c3..4930298a384 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts +++ b/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts @@ -9,7 +9,7 @@ import { DiagnosticCollection, ExtHostDiagnostics } from 'vs/workbench/api/commo import { Diagnostic, DiagnosticSeverity, Range, DiagnosticRelatedInformation, Location } from 'vs/workbench/api/common/extHostTypes'; import { MainThreadDiagnosticsShape, IMainContext } from 'vs/workbench/api/common/extHost.protocol'; import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { Emitter, Event } from 'vs/base/common/event'; import { NullLogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts rename to src/vs/workbench/test/browser/api/extHostDocumentData.test.ts index 2610d0241bb..16a25b86b02 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts +++ b/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts @@ -10,7 +10,7 @@ import { Position } from 'vs/workbench/api/common/extHostTypes'; import { Range } from 'vs/editor/common/core/range'; import { MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol'; import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; suite('ExtHostDocumentData', () => { diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts rename to src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts index 5ee65cfa30c..89743a073e5 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts +++ b/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts @@ -12,7 +12,7 @@ import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/common/extHostD import { SingleProxyRPCProtocol } from './testRPCProtocol'; import { SaveReason } from 'vs/workbench/common/editor'; import type * as vscode from 'vscode'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { NullLogService } from 'vs/platform/log/common/log'; import { timeout } from 'vs/base/common/async'; import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts similarity index 94% rename from src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts rename to src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts index 6cd64c2c976..e3f031a03b2 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { URI } from 'vs/base/common/uri'; import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors'; -import { TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; import { NullLogService } from 'vs/platform/log/common/log'; suite('ExtHostDocumentsAndEditors', () => { diff --git a/src/vs/workbench/test/electron-browser/api/extHostFileSystemEventService.test.ts b/src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/extHostFileSystemEventService.test.ts rename to src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts rename to src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts index f00d6eec6c6..1471cd6e4ef 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts @@ -43,7 +43,7 @@ import { getColors } from 'vs/editor/contrib/colorPicker/color'; import { CancellationToken } from 'vs/base/common/cancellation'; import { nullExtensionDescription as defaultExtension } from 'vs/workbench/services/extensions/common/extensions'; import { provideSelectionRanges } from 'vs/editor/contrib/smartSelect/smartSelect'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { dispose } from 'vs/base/common/lifecycle'; import { withNullAsUndefined } from 'vs/base/common/types'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts b/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts similarity index 96% rename from src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts rename to src/vs/workbench/test/browser/api/extHostMessagerService.test.ts index 64105b9c089..004b4258742 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts +++ b/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts @@ -8,8 +8,9 @@ import { MainThreadMessageService } from 'vs/workbench/api/browser/mainThreadMes import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService, INotification, NoOpNotification, INotificationHandle, Severity, IPromptChoice, IPromptOptions, IStatusMessageOptions, NotificationsFilter } from 'vs/platform/notification/common/notification'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; +import * as platform from 'vs/base/common/platform'; const emptyDialogService = new class implements IDialogService { _serviceBrand: undefined; @@ -97,7 +98,7 @@ suite('ExtHostMessageService', function () { let service = new MainThreadMessageService(null!, new EmptyNotificationService(notification => { assert.equal(notification.actions!.primary!.length, 1); - setImmediate(() => notification.actions!.primary![0].run()); + platform.setImmediate(() => notification.actions!.primary![0].run()); }), emptyCommandService, emptyDialogService); const handle = await service.$showMessage(1, 'h', {}, [{ handle: 42, title: 'a thing', isCloseAffordance: true }]); diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts b/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts rename to src/vs/workbench/test/browser/api/extHostTextEditor.test.ts index b783bf6984f..aee71d8b8dd 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts +++ b/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts @@ -9,7 +9,7 @@ import { MainThreadTextEditorsShape, IResolvedTextEditorConfiguration, ITextEdit import { ExtHostTextEditorOptions, ExtHostTextEditor } from 'vs/workbench/api/common/extHostTextEditor'; import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData'; import { URI } from 'vs/base/common/uri'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { NullLogService } from 'vs/platform/log/common/log'; suite('ExtHostTextEditor', () => { diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts b/src/vs/workbench/test/browser/api/extHostTextEditors.test.ts similarity index 95% rename from src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts rename to src/vs/workbench/test/browser/api/extHostTextEditors.test.ts index eae86a47ac7..035cdeb9957 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts +++ b/src/vs/workbench/test/browser/api/extHostTextEditors.test.ts @@ -6,9 +6,9 @@ import * as assert from 'assert'; import * as extHostTypes from 'vs/workbench/api/common/extHostTypes'; import { MainContext, MainThreadTextEditorsShape, IWorkspaceEditDto } from 'vs/workbench/api/common/extHost.protocol'; import { URI } from 'vs/base/common/uri'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors'; -import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol'; +import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; import { ExtHostEditors } from 'vs/workbench/api/common/extHostTextEditors'; import { WorkspaceTextEdit } from 'vs/editor/common/modes'; import { NullLogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts rename to src/vs/workbench/test/browser/api/extHostTreeViews.test.ts index 236d753dc54..887d20ea7ca 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts @@ -14,7 +14,7 @@ import { TestRPCProtocol } from './testRPCProtocol'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { TreeItemCollapsibleState, ITreeItem } from 'vs/workbench/common/views'; import { NullLogService } from 'vs/platform/log/common/log'; import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypeConverter.test.ts b/src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/extHostTypeConverter.test.ts rename to src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts b/src/vs/workbench/test/browser/api/extHostTypes.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts rename to src/vs/workbench/test/browser/api/extHostTypes.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts b/src/vs/workbench/test/browser/api/extHostWebview.test.ts similarity index 98% rename from src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts rename to src/vs/workbench/test/browser/api/extHostWebview.test.ts index 3828c1f7811..f08947b6b03 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts +++ b/src/vs/workbench/test/browser/api/extHostWebview.test.ts @@ -3,6 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import type * as vscode from 'vscode'; import * as assert from 'assert'; import { URI } from 'vs/base/common/uri'; import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; @@ -10,8 +11,7 @@ import { NullLogService } from 'vs/platform/log/common/log'; import { MainThreadWebviews } from 'vs/workbench/api/browser/mainThreadWebview'; import { ExtHostWebviews } from 'vs/workbench/api/common/extHostWebview'; import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; -import type * as vscode from 'vscode'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { SingleProxyRPCProtocol } from './testRPCProtocol'; suite('ExtHostWebview', () => { diff --git a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts b/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts rename to src/vs/workbench/test/browser/api/extHostWorkspace.test.ts index c05a1d72fd8..deae2eab0fe 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts +++ b/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts @@ -14,7 +14,7 @@ import { MainThreadWorkspace } from 'vs/workbench/api/browser/mainThreadWorkspac import { IMainContext, IWorkspaceData, MainContext, ITextSearchComplete } from 'vs/workbench/api/common/extHost.protocol'; import { RelativePattern } from 'vs/workbench/api/common/extHostTypes'; import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { TestRPCProtocol } from './testRPCProtocol'; import { ExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService'; import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService'; diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts b/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts similarity index 97% rename from src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts rename to src/vs/workbench/test/browser/api/mainThreadCommands.test.ts index 8e1f8ac0fcb..cf5f3583914 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts +++ b/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts @@ -8,7 +8,7 @@ import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands' import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { SingleProxyRPCProtocol } from './testRPCProtocol'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; suite('MainThreadCommands', function () { diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts b/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts rename to src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts b/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts rename to src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts similarity index 92% rename from src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts rename to src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts index e77be2cb572..dfef5fee0f5 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts +++ b/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts @@ -7,10 +7,10 @@ import * as assert from 'assert'; import { URI } from 'vs/base/common/uri'; import { MainThreadDocumentContentProviders } from 'vs/workbench/api/browser/mainThreadDocumentContentProviders'; import { TextModel } from 'vs/editor/common/model/textModel'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { IModelService } from 'vs/editor/common/services/modelService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; -import { TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; import { TextEdit } from 'vs/editor/common/modes'; suite('MainThreadDocumentContentProviders', function () { diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDocuments.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/mainThreadDocuments.test.ts rename to src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts rename to src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts index 04fc91a7a76..2f7c6a1f2b6 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts @@ -12,7 +12,7 @@ import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta } from 'vs/workbench/api/common/extHost.protocol'; import { createTestCodeEditor, TestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { TestEditorService, TestEditorGroupsService, TestTextResourcePropertiesService, TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices'; import { Event } from 'vs/base/common/event'; import { ITextModel } from 'vs/editor/common/model'; diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts rename to src/vs/workbench/test/browser/api/mainThreadEditors.test.ts index 27d399d79da..dedc04cf8d3 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts @@ -11,7 +11,7 @@ import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { ExtHostDocumentsAndEditorsShape, ExtHostContext, ExtHostDocumentsShape, IWorkspaceTextEditDto } from 'vs/workbench/api/common/extHost.protocol'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { Event } from 'vs/base/common/event'; import { MainThreadTextEditors } from 'vs/workbench/api/browser/mainThreadEditors'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/test/electron-browser/api/mock.ts b/src/vs/workbench/test/browser/api/mock.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/mock.ts rename to src/vs/workbench/test/browser/api/mock.ts diff --git a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts b/src/vs/workbench/test/browser/api/testRPCProtocol.ts similarity index 100% rename from src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts rename to src/vs/workbench/test/browser/api/testRPCProtocol.ts diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts index ab0b20cdd86..342a63637b7 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts @@ -15,11 +15,11 @@ import { MainContext, MainThreadSearchShape } from 'vs/workbench/api/common/extH import { NativeExtHostSearch } from 'vs/workbench/api/node/extHostSearch'; import { Range } from 'vs/workbench/api/common/extHostTypes'; import { IFileMatch, IFileQuery, IPatternInfo, IRawFileMatch2, ISearchCompleteStats, ISearchQuery, ITextQuery, QueryType, resultIsMatch } from 'vs/workbench/services/search/common/search'; -import { TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; import type * as vscode from 'vscode'; import { NullLogService } from 'vs/platform/log/common/log'; import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService'; -import { mock } from 'vs/workbench/test/electron-browser/api/mock'; +import { mock } from 'vs/workbench/test/browser/api/mock'; import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService'; import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager'; import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager'; diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts index 62188e87d43..39a0ace843c 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts @@ -8,7 +8,7 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/ import { ISearchService, IFileQuery } from 'vs/workbench/services/search/common/search'; import { MainThreadWorkspace } from 'vs/workbench/api/browser/mainThreadWorkspace'; import * as assert from 'assert'; -import { SingleProxyRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; -- GitLab