From 7cde8b945f917aa6494112a6071cefefbcae63ea Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 20 Jan 2022 13:41:35 +0100 Subject: [PATCH] move API tests (#140993) (#141056) --- .../browser/api => api/test/browser}/extHost.api.impl.test.ts | 0 .../browser/api => api/test/browser}/extHostApiCommands.test.ts | 2 +- .../api => api/test/browser}/extHostAuthentication.test.ts | 2 +- .../browser/api => api/test/browser}/extHostBulkEdits.test.ts | 2 +- .../browser/api => api/test/browser}/extHostCommands.test.ts | 2 +- .../api => api/test/browser}/extHostConfiguration.test.ts | 2 +- .../browser/api => api/test/browser}/extHostDecorations.test.ts | 0 .../browser/api => api/test/browser}/extHostDiagnostics.test.ts | 0 .../test/browser}/extHostDocumentData.test.perf-data.ts | 0 .../api => api/test/browser}/extHostDocumentData.test.ts | 0 .../test/browser}/extHostDocumentSaveParticipant.test.ts | 2 +- .../api => api/test/browser}/extHostDocumentsAndEditors.test.ts | 2 +- .../test/browser}/extHostFileSystemEventService.test.ts | 0 .../api => api/test/browser}/extHostLanguageFeatures.test.ts | 2 +- .../api => api/test/browser}/extHostMessagerService.test.ts | 0 .../browser/api => api/test/browser}/extHostNotebook.test.ts | 2 +- .../test/browser}/extHostNotebookConcatDocument.test.ts | 2 +- .../api => api/test/browser}/extHostNotebookKernel.test.ts | 2 +- .../browser/api => api/test/browser}/extHostTesting.test.ts | 0 .../browser/api => api/test/browser}/extHostTextEditor.test.ts | 0 .../browser/api => api/test/browser}/extHostTreeViews.test.ts | 2 +- .../api => api/test/browser}/extHostTypeConverter.test.ts | 0 .../{test/browser/api => api/test/browser}/extHostTypes.test.ts | 0 .../browser/api => api/test/browser}/extHostWebview.test.ts | 2 +- .../browser/api => api/test/browser}/extHostWorkspace.test.ts | 2 +- .../browser/api => api/test/browser}/mainThreadCommands.test.ts | 2 +- .../api => api/test/browser}/mainThreadConfiguration.test.ts | 2 +- .../api => api/test/browser}/mainThreadDiagnostics.test.ts | 0 .../test/browser}/mainThreadDocumentContentProviders.test.ts | 2 +- .../api => api/test/browser}/mainThreadDocuments.test.ts | 0 .../test/browser}/mainThreadDocumentsAndEditors.test.ts | 2 +- .../browser/api => api/test/browser}/mainThreadEditors.test.ts | 2 +- .../api => api/test/browser}/mainThreadTreeViews.test.ts | 0 .../api => api/test/browser}/mainThreadWorkspace.test.ts | 2 +- .../{test/browser/api => api/test/common}/testRPCProtocol.ts | 0 .../api => api/test/node}/extHostSearch.test.ts | 2 +- .../node/api => api/test/node}/extHostTunnelService.test.ts | 0 37 files changed, 21 insertions(+), 21 deletions(-) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHost.api.impl.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostApiCommands.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostAuthentication.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostBulkEdits.test.ts (98%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostCommands.test.ts (96%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostConfiguration.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostDecorations.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostDiagnostics.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostDocumentData.test.perf-data.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostDocumentData.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostDocumentSaveParticipant.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostDocumentsAndEditors.test.ts (94%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostFileSystemEventService.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostLanguageFeatures.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostMessagerService.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostNotebook.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostNotebookConcatDocument.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostNotebookKernel.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostTesting.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostTextEditor.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostTreeViews.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostTypeConverter.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostTypes.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostWebview.test.ts (98%) rename src/vs/workbench/{test/browser/api => api/test/browser}/extHostWorkspace.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadCommands.test.ts (97%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadConfiguration.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadDiagnostics.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadDocumentContentProviders.test.ts (96%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadDocuments.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadDocumentsAndEditors.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadEditors.test.ts (99%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadTreeViews.test.ts (100%) rename src/vs/workbench/{test/browser/api => api/test/browser}/mainThreadWorkspace.test.ts (98%) rename src/vs/workbench/{test/browser/api => api/test/common}/testRPCProtocol.ts (100%) rename src/vs/workbench/{test/electron-browser/api => api/test/node}/extHostSearch.test.ts (99%) rename src/vs/workbench/{test/node/api => api/test/node}/extHostTunnelService.test.ts (100%) diff --git a/src/vs/workbench/test/browser/api/extHost.api.impl.test.ts b/src/vs/workbench/api/test/browser/extHost.api.impl.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHost.api.impl.test.ts rename to src/vs/workbench/api/test/browser/extHost.api.impl.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts b/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostApiCommands.test.ts rename to src/vs/workbench/api/test/browser/extHostApiCommands.test.ts index 4fa271dea68..6d34b27f106 100644 --- a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts +++ b/src/vs/workbench/api/test/browser/extHostApiCommands.test.ts @@ -9,7 +9,7 @@ import { URI } from 'vs/base/common/uri'; import { Event } from 'vs/base/common/event'; import * as types from 'vs/workbench/api/common/extHostTypes'; import { createTextModel } from 'vs/editor/test/common/testTextModel'; -import { TestRPCProtocol } from './testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { MarkerService } from 'vs/platform/markers/common/markerService'; import { IMarkerService } from 'vs/platform/markers/common/markers'; import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; diff --git a/src/vs/workbench/test/browser/api/extHostAuthentication.test.ts b/src/vs/workbench/api/test/browser/extHostAuthentication.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostAuthentication.test.ts rename to src/vs/workbench/api/test/browser/extHostAuthentication.test.ts index 5c89130cbb8..3577b2c17fa 100644 --- a/src/vs/workbench/test/browser/api/extHostAuthentication.test.ts +++ b/src/vs/workbench/api/test/browser/extHostAuthentication.test.ts @@ -22,7 +22,7 @@ import { AuthenticationService, IAuthenticationService } from 'vs/workbench/serv import { IExtensionService, nullExtensionDescription as extensionDescription } from 'vs/workbench/services/extensions/common/extensions'; import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; import { TestRemoteAgentService } from 'vs/workbench/services/remote/test/common/testServices'; -import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { TestQuickInputService } from 'vs/workbench/test/browser/workbenchTestServices'; import { TestActivityService, TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; import type { AuthenticationProvider, AuthenticationSession } from 'vscode'; diff --git a/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts b/src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts similarity index 98% rename from src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts rename to src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts index 23a895c6037..e634cad36c4 100644 --- a/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts +++ b/src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts @@ -8,7 +8,7 @@ import { MainContext, IWorkspaceEditDto, WorkspaceEditType, MainThreadBulkEditsS import { URI } from 'vs/base/common/uri'; import { mock } from 'vs/base/test/common/mock'; import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors'; -import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { NullLogService } from 'vs/platform/log/common/log'; import { assertType } from 'vs/base/common/types'; import { ExtHostBulkEdits } from 'vs/workbench/api/common/extHostBulkEdits'; diff --git a/src/vs/workbench/test/browser/api/extHostCommands.test.ts b/src/vs/workbench/api/test/browser/extHostCommands.test.ts similarity index 96% rename from src/vs/workbench/test/browser/api/extHostCommands.test.ts rename to src/vs/workbench/api/test/browser/extHostCommands.test.ts index c9c02395ccb..da9b47ccda9 100644 --- a/src/vs/workbench/test/browser/api/extHostCommands.test.ts +++ b/src/vs/workbench/api/test/browser/extHostCommands.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; 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 { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { mock } from 'vs/base/test/common/mock'; import { NullLogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts b/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostConfiguration.test.ts rename to src/vs/workbench/api/test/browser/extHostConfiguration.test.ts index ed9d51dd34f..764c1c294b1 100644 --- a/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts +++ b/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts @@ -9,7 +9,7 @@ import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace'; import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration'; import { MainThreadConfigurationShape, IConfigurationInitData } from 'vs/workbench/api/common/extHost.protocol'; import { ConfigurationModel, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels'; -import { TestRPCProtocol } from './testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { mock } from 'vs/base/test/common/mock'; import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/workspace'; import { ConfigurationTarget, IConfigurationModel, IConfigurationChange } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/test/browser/api/extHostDecorations.test.ts b/src/vs/workbench/api/test/browser/extHostDecorations.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostDecorations.test.ts rename to src/vs/workbench/api/test/browser/extHostDecorations.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts b/src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts rename to src/vs/workbench/api/test/browser/extHostDiagnostics.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts b/src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts rename to src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts diff --git a/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentData.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostDocumentData.test.ts rename to src/vs/workbench/api/test/browser/extHostDocumentData.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts rename to src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts index 4859a1f9086..60d1caefa3d 100644 --- a/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts +++ b/src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts @@ -9,7 +9,7 @@ import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocum import { TextDocumentSaveReason, TextEdit, Position, EndOfLine } from 'vs/workbench/api/common/extHostTypes'; import { MainThreadTextEditorsShape, IWorkspaceEditDto, IWorkspaceTextEditDto, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol'; import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/common/extHostDocumentSaveParticipant'; -import { SingleProxyRPCProtocol } from './testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { SaveReason } from 'vs/workbench/common/editor'; import type * as vscode from 'vscode'; import { mock } from 'vs/base/test/common/mock'; diff --git a/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/extHostDocumentsAndEditors.test.ts similarity index 94% rename from src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts rename to src/vs/workbench/api/test/browser/extHostDocumentsAndEditors.test.ts index 95248a34a40..22e8c4a4a11 100644 --- a/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts +++ b/src/vs/workbench/api/test/browser/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/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { NullLogService } from 'vs/platform/log/common/log'; suite('ExtHostDocumentsAndEditors', () => { diff --git a/src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts b/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts rename to src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts rename to src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts index f73188ba2d1..7eeab18154b 100644 --- a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts @@ -11,7 +11,7 @@ import * as types from 'vs/workbench/api/common/extHostTypes'; import { createTextModel } from 'vs/editor/test/common/testTextModel'; import { Position as EditorPosition, Position } from 'vs/editor/common/core/position'; import { Range as EditorRange } from 'vs/editor/common/core/range'; -import { TestRPCProtocol } from './testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { IMarkerService } from 'vs/platform/markers/common/markers'; import { MarkerService } from 'vs/platform/markers/common/markerService'; import { ExtHostLanguageFeatures } from 'vs/workbench/api/common/extHostLanguageFeatures'; diff --git a/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts b/src/vs/workbench/api/test/browser/extHostMessagerService.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostMessagerService.test.ts rename to src/vs/workbench/api/test/browser/extHostMessagerService.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostNotebook.test.ts rename to src/vs/workbench/api/test/browser/extHostNotebook.test.ts index f7bc550ce7a..9930ad289b2 100644 --- a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts +++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as vscode from 'vscode'; import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors'; -import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { DisposableStore } from 'vs/base/common/lifecycle'; import { NullLogService } from 'vs/platform/log/common/log'; import { mock } from 'vs/base/test/common/mock'; diff --git a/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts b/src/vs/workbench/api/test/browser/extHostNotebookConcatDocument.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts rename to src/vs/workbench/api/test/browser/extHostNotebookConcatDocument.test.ts index b969649d253..58cb2c03b7e 100644 --- a/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts +++ b/src/vs/workbench/api/test/browser/extHostNotebookConcatDocument.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments'; import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors'; import { NullLogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/workbench/test/browser/api/extHostNotebookKernel.test.ts b/src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostNotebookKernel.test.ts rename to src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts index 5be085d8326..44114ba972d 100644 --- a/src/vs/workbench/test/browser/api/extHostNotebookKernel.test.ts +++ b/src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts @@ -25,7 +25,7 @@ import { CellKind, CellUri, NotebookCellsChangeType } from 'vs/workbench/contrib import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService'; import { nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier'; -import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { mock } from 'vs/workbench/test/common/workbenchTestServices'; suite('NotebookKernel', function () { diff --git a/src/vs/workbench/test/browser/api/extHostTesting.test.ts b/src/vs/workbench/api/test/browser/extHostTesting.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostTesting.test.ts rename to src/vs/workbench/api/test/browser/extHostTesting.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts b/src/vs/workbench/api/test/browser/extHostTextEditor.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostTextEditor.test.ts rename to src/vs/workbench/api/test/browser/extHostTextEditor.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts b/src/vs/workbench/api/test/browser/extHostTreeViews.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostTreeViews.test.ts rename to src/vs/workbench/api/test/browser/extHostTreeViews.test.ts index db66293a7e9..4b1b2544afc 100644 --- a/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/api/test/browser/extHostTreeViews.test.ts @@ -10,7 +10,7 @@ import { ExtHostTreeViews } from 'vs/workbench/api/common/extHostTreeViews'; import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands'; import { MainThreadTreeViewsShape, MainContext } from 'vs/workbench/api/common/extHost.protocol'; import { TreeDataProvider, TreeItem } from 'vscode'; -import { TestRPCProtocol } from './testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/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'; diff --git a/src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts b/src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts rename to src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostTypes.test.ts b/src/vs/workbench/api/test/browser/extHostTypes.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/extHostTypes.test.ts rename to src/vs/workbench/api/test/browser/extHostTypes.test.ts diff --git a/src/vs/workbench/test/browser/api/extHostWebview.test.ts b/src/vs/workbench/api/test/browser/extHostWebview.test.ts similarity index 98% rename from src/vs/workbench/test/browser/api/extHostWebview.test.ts rename to src/vs/workbench/api/test/browser/extHostWebview.test.ts index 2a514c5f7fe..d76f5b42e41 100644 --- a/src/vs/workbench/test/browser/api/extHostWebview.test.ts +++ b/src/vs/workbench/api/test/browser/extHostWebview.test.ts @@ -18,7 +18,7 @@ import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPane import { decodeAuthority, webviewResourceBaseHost } from 'vs/workbench/api/common/shared/webview'; import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn'; import type * as vscode from 'vscode'; -import { SingleProxyRPCProtocol } from './testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; suite('ExtHostWebview', () => { diff --git a/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/extHostWorkspace.test.ts rename to src/vs/workbench/api/test/browser/extHostWorkspace.test.ts index 983a78c7311..30bc9e45870 100644 --- a/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts +++ b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts @@ -15,7 +15,7 @@ import { IMainContext, IWorkspaceData, MainContext, ITextSearchComplete } from ' import { RelativePattern } from 'vs/workbench/api/common/extHostTypes'; import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace'; import { mock } from 'vs/base/test/common/mock'; -import { TestRPCProtocol } from './testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { ExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService'; import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService'; import { ITextQueryBuilderOptions } from 'vs/workbench/contrib/search/common/queryBuilder'; diff --git a/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts b/src/vs/workbench/api/test/browser/mainThreadCommands.test.ts similarity index 97% rename from src/vs/workbench/test/browser/api/mainThreadCommands.test.ts rename to src/vs/workbench/api/test/browser/mainThreadCommands.test.ts index 3b2f85bdaff..fe6133d11ad 100644 --- a/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts +++ b/src/vs/workbench/api/test/browser/mainThreadCommands.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands'; import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; -import { SingleProxyRPCProtocol } from './testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { mock } from 'vs/base/test/common/mock'; diff --git a/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts b/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts rename to src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts index 23455e4ef1b..c367473c822 100644 --- a/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts +++ b/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts @@ -11,7 +11,7 @@ import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platf import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { MainThreadConfiguration } from 'vs/workbench/api/browser/mainThreadConfiguration'; -import { SingleProxyRPCProtocol } from './testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; diff --git a/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts b/src/vs/workbench/api/test/browser/mainThreadDiagnostics.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts rename to src/vs/workbench/api/test/browser/mainThreadDiagnostics.test.ts diff --git a/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts similarity index 96% rename from src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts rename to src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts index e7be0a94ee2..bf3ddf7797a 100644 --- a/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts +++ b/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts @@ -10,7 +10,7 @@ import { createTextModel } from 'vs/editor/test/common/testTextModel'; import { mock } from 'vs/base/test/common/mock'; import { IModelService } from 'vs/editor/common/services/model'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker'; -import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { TextEdit } from 'vs/editor/common/languages'; suite('MainThreadDocumentContentProviders', function () { diff --git a/src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts rename to src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts diff --git a/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts rename to src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts index cd228df490d..dc1a0ccf00a 100644 --- a/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts +++ b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/browser/mainThreadDocumentsAndEditors'; -import { SingleProxyRPCProtocol } from './testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { ModelService } from 'vs/editor/common/services/modelService'; import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices'; diff --git a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts similarity index 99% rename from src/vs/workbench/test/browser/api/mainThreadEditors.test.ts rename to src/vs/workbench/api/test/browser/mainThreadEditors.test.ts index 5757c84c5d5..f19ee326a02 100644 --- a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/browser/mainThreadDocumentsAndEditors'; -import { SingleProxyRPCProtocol, TestRPCProtocol } from './testRPCProtocol'; +import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { ModelService } from 'vs/editor/common/services/modelService'; import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices'; diff --git a/src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts similarity index 100% rename from src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts rename to src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts diff --git a/src/vs/workbench/test/browser/api/mainThreadWorkspace.test.ts b/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts similarity index 98% rename from src/vs/workbench/test/browser/api/mainThreadWorkspace.test.ts rename to src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts index 39d82eb14b0..565c0dc80ae 100644 --- a/src/vs/workbench/test/browser/api/mainThreadWorkspace.test.ts +++ b/src/vs/workbench/api/test/browser/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/browser/api/testRPCProtocol'; +import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/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'; diff --git a/src/vs/workbench/test/browser/api/testRPCProtocol.ts b/src/vs/workbench/api/test/common/testRPCProtocol.ts similarity index 100% rename from src/vs/workbench/test/browser/api/testRPCProtocol.ts rename to src/vs/workbench/api/test/common/testRPCProtocol.ts diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/api/test/node/extHostSearch.test.ts similarity index 99% rename from src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts rename to src/vs/workbench/api/test/node/extHostSearch.test.ts index da3a8cdc6ed..6cd2a2fec64 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts +++ b/src/vs/workbench/api/test/node/extHostSearch.test.ts @@ -22,7 +22,7 @@ import { NativeExtHostSearch } from 'vs/workbench/api/node/extHostSearch'; import { IFileMatch, IFileQuery, IPatternInfo, IRawFileMatch2, ISearchCompleteStats, ISearchQuery, ITextQuery, QueryType, resultIsMatch } from 'vs/workbench/services/search/common/search'; import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager'; import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager'; -import { TestRPCProtocol } from 'vs/workbench/test/browser/api/testRPCProtocol'; +import { TestRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol'; import type * as vscode from 'vscode'; let rpcProtocol: TestRPCProtocol; diff --git a/src/vs/workbench/test/node/api/extHostTunnelService.test.ts b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts similarity index 100% rename from src/vs/workbench/test/node/api/extHostTunnelService.test.ts rename to src/vs/workbench/api/test/node/extHostTunnelService.test.ts