diff --git a/src/sql/workbench/contrib/notebook/test/calloutDialog/imageCalloutDialog.test.ts b/src/sql/workbench/contrib/notebook/test/browser/calloutDialog/imageCalloutDialog.test.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/test/calloutDialog/imageCalloutDialog.test.ts rename to src/sql/workbench/contrib/notebook/test/browser/calloutDialog/imageCalloutDialog.test.ts diff --git a/src/sql/workbench/contrib/notebook/test/calloutDialog/linkCalloutDialog.test.ts b/src/sql/workbench/contrib/notebook/test/browser/calloutDialog/linkCalloutDialog.test.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/test/calloutDialog/linkCalloutDialog.test.ts rename to src/sql/workbench/contrib/notebook/test/browser/calloutDialog/linkCalloutDialog.test.ts diff --git a/src/sql/workbench/contrib/notebook/test/browser/cellToolbarActions.test.ts b/src/sql/workbench/contrib/notebook/test/browser/cellToolbarActions.test.ts index 636691b51c..7fe4482287 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/cellToolbarActions.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/cellToolbarActions.test.ts @@ -29,7 +29,7 @@ import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/mod import { CellTypes, NotebookChangeType } from 'sql/workbench/services/notebook/common/contracts'; import { nb } from 'azdata'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; -import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService'; import { NBFORMAT, NBFORMAT_MINOR } from 'sql/workbench/common/constants'; diff --git a/src/sql/workbench/contrib/notebook/test/emptySessionClasses.ts b/src/sql/workbench/contrib/notebook/test/browser/emptySessionClasses.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/test/emptySessionClasses.ts rename to src/sql/workbench/contrib/notebook/test/browser/emptySessionClasses.ts diff --git a/src/sql/workbench/contrib/notebook/test/browser/markdownTextTransformer.test.ts b/src/sql/workbench/contrib/notebook/test/browser/markdownTextTransformer.test.ts index 1d1f88254c..917c9db404 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/markdownTextTransformer.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/markdownTextTransformer.test.ts @@ -29,7 +29,7 @@ import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServic import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IEditor } from 'vs/editor/common/editorCommon'; -import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/testCommon'; +import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/browser/testCommon'; import { Range } from 'vs/editor/common/core/range'; import { IProductService } from 'vs/platform/product/common/productService'; import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookActions.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookActions.test.ts index 9e7e0e3bcd..4ce759c3ad 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookActions.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookActions.test.ts @@ -8,8 +8,8 @@ import * as azdata from 'azdata'; import * as sinon from 'sinon'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; import { AddCodeCellAction, AddTextCellAction, ClearAllOutputsAction, CollapseCellsAction, CreateNotebookViewAction, DashboardViewAction, kernelNotSupported, KernelsDropdown, msgChanging, noKernelName, noParameterCell, noParametersInCell, NotebookViewAction, NotebookViewsActionProvider, RunAllCellsAction, RunParametersAction, TrustedAction, untitledNotSupported } from 'sql/workbench/contrib/notebook/browser/notebookActions'; -import { ClientSessionStub, ContextViewProviderStub, NotebookComponentStub, NotebookModelStub, NotebookServiceStub, NotebookViewsStub, NotebookViewStub } from 'sql/workbench/contrib/notebook/test/stubs'; -import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/testCommon'; +import { ClientSessionStub, ContextViewProviderStub, NotebookComponentStub, NotebookModelStub, NotebookServiceStub, NotebookViewsStub, NotebookViewStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; +import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/browser/testCommon'; import { ICellModel, INotebookModel, ViewMode } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils'; import { INotebookEditor, INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookEditor.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookEditor.test.ts index 5ca4746a12..13407ae4f4 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookEditor.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookEditor.test.ts @@ -12,9 +12,9 @@ import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/not import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/untitledNotebookInput'; import { NotebookFindNextAction, NotebookFindPreviousAction } from 'sql/workbench/contrib/notebook/browser/notebookActions'; import { NotebookEditor } from 'sql/workbench/contrib/notebook/browser/notebookEditor'; -import { NBTestQueryManagementService } from 'sql/workbench/contrib/notebook/test/nbTestQueryManagementService'; -import * as stubs from 'sql/workbench/contrib/notebook/test/stubs'; -import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/testCommon'; +import { NBTestQueryManagementService } from 'sql/workbench/contrib/notebook/test/common/nbTestQueryManagementService'; +import * as stubs from 'sql/workbench/contrib/notebook/test/browser/stubs'; +import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/browser/testCommon'; import { CellEditModes, ICellModel, NotebookContentChange } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { INotebookEditor, INotebookParams, INotebookService, NotebookRange } from 'sql/workbench/services/notebook/browser/notebookService'; import { NotebookService } from 'sql/workbench/services/notebook/browser/notebookServiceImpl'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts index 3d07286a90..599709857f 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts @@ -13,7 +13,7 @@ import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/browser/mo import { FileNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/fileNotebookInput'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel'; -import { NodeStub, NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { NodeStub, NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { basenameOrAuthority } from 'vs/base/common/resources'; import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput'; import { IExtensionService, NullExtensionService } from 'vs/workbench/services/extensions/common/extensions'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookService.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookService.test.ts index 063a6e6718..97a0814268 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookService.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookService.test.ts @@ -7,9 +7,9 @@ import * as assert from 'assert'; import * as azdata from 'azdata'; import * as sinon from 'sinon'; import { Deferred } from 'sql/base/common/promise'; -import { NBTestQueryManagementService } from 'sql/workbench/contrib/notebook/test/nbTestQueryManagementService'; -import { NotebookModelStub } from 'sql/workbench/contrib/notebook/test/stubs'; -import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/testCommon'; +import { NBTestQueryManagementService } from 'sql/workbench/contrib/notebook/test/common/nbTestQueryManagementService'; +import { NotebookModelStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; +import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/browser/testCommon'; import { notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces'; import { ICellModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { INavigationProvider, INotebookEditor, IExecuteManager, INotebookParams, IExecuteProvider, NavigationProviders, SQL_NOTEBOOK_PROVIDER, unsavedBooksContextKey, ISerializationProvider, ISerializationManager } from 'sql/workbench/services/notebook/browser/notebookService'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts index 8839bfde94..36abf27ecd 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookViewModel.test.ts @@ -11,7 +11,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { URI } from 'vs/base/common/uri'; -import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel'; import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/modelFactory'; import { ICellModel, INotebookModelOptions } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; @@ -23,7 +23,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle import { ILogService, NullLogService } from 'vs/platform/log/common/log'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { NotebookEditorContentLoader } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; -import { SessionManager } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; +import { SessionManager } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; import { NullAdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; import { CellTypes, NotebookChangeType } from 'sql/workbench/services/notebook/common/contracts'; import { NotebookViewsExtension } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViewsExtension'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookViewsActions.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookViewsActions.test.ts index 4d8304602c..030f78710f 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookViewsActions.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookViewsActions.test.ts @@ -10,8 +10,8 @@ import { TestConnectionManagementService } from 'sql/platform/connection/test/co import { NullAdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; import { NotebookEditorContentLoader } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { DeleteViewAction, InsertCellAction } from 'sql/workbench/contrib/notebook/browser/notebookViews/notebookViewsActions'; -import { SessionManager } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; -import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { SessionManager } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; +import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/modelFactory'; import { ICellModel, INotebookModelOptions, ViewMode } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookViewsExtension.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookViewsExtension.test.ts index 4517fa7ada..4bbde6aa45 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookViewsExtension.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookViewsExtension.test.ts @@ -11,7 +11,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { URI } from 'vs/base/common/uri'; -import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel'; import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/modelFactory'; import { ICellModel, INotebookModelOptions } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; @@ -23,7 +23,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle import { ILogService, NullLogService } from 'vs/platform/log/common/log'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { NotebookEditorContentLoader } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; -import { SessionManager } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; +import { SessionManager } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; import { NullAdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; import { CellTypes, NotebookChangeType } from 'sql/workbench/services/notebook/common/contracts'; import { NotebookViewsExtension } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViewsExtension'; diff --git a/src/sql/workbench/contrib/notebook/test/stubs.ts b/src/sql/workbench/contrib/notebook/test/browser/stubs.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/test/stubs.ts rename to src/sql/workbench/contrib/notebook/test/browser/stubs.ts diff --git a/src/sql/workbench/contrib/notebook/test/testCommon.ts b/src/sql/workbench/contrib/notebook/test/browser/testCommon.ts similarity index 97% rename from src/sql/workbench/contrib/notebook/test/testCommon.ts rename to src/sql/workbench/contrib/notebook/test/browser/testCommon.ts index 837f9080e4..7435460b03 100644 --- a/src/sql/workbench/contrib/notebook/test/testCommon.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/testCommon.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor'; -import * as stubs from 'sql/workbench/contrib/notebook/test/stubs'; +import * as stubs from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { INotebookModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { INotebookParams } from 'sql/workbench/services/notebook/browser/notebookService'; import * as dom from 'vs/base/browser/dom'; diff --git a/src/sql/workbench/contrib/notebook/test/nbTestQueryManagementService.ts b/src/sql/workbench/contrib/notebook/test/common/nbTestQueryManagementService.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/test/nbTestQueryManagementService.ts rename to src/sql/workbench/contrib/notebook/test/common/nbTestQueryManagementService.ts diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts index 58f31e3175..636dfe3271 100644 --- a/src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts @@ -11,8 +11,8 @@ import * as objects from 'vs/base/common/objects'; import { CellTypes, NotebookChangeType } from 'sql/workbench/services/notebook/common/contracts'; import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/modelFactory'; -import { NotebookModelStub, ClientSessionStub, KernelStub, FutureStub } from 'sql/workbench/contrib/notebook/test/stubs'; -import { EmptyFuture } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; +import { NotebookModelStub, ClientSessionStub, KernelStub, FutureStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; +import { EmptyFuture } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; import { CellEditModes, ICellModel, ICellModelOptions, IClientSession, INotebookModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { Deferred } from 'sql/base/common/promise'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts index 7bed27c6fa..16fc9a0a32 100644 --- a/src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts @@ -12,8 +12,8 @@ import { TestNotificationService } from 'vs/platform/notification/test/common/te import { URI } from 'vs/base/common/uri'; import { ClientSession } from 'sql/workbench/services/notebook/browser/models/clientSession'; -import { SessionManager, EmptySession } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; -import { ExecuteManagerStub, ServerManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { SessionManager, EmptySession } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; +import { ExecuteManagerStub, ServerManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { isUndefinedOrNull } from 'vs/base/common/types'; suite('Client Session', function (): void { diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookEditorModel.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookEditorModel.test.ts index 5f6abf49fc..f6e57e54f2 100644 --- a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookEditorModel.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookEditorModel.test.ts @@ -42,7 +42,7 @@ import { IProductService } from 'vs/platform/product/common/productService'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService'; import { ILanguageService } from 'vs/editor/common/languages/language'; -import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils'; diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookFindModel.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookFindModel.test.ts index f8ca9137d0..648871e838 100644 --- a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookFindModel.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookFindModel.test.ts @@ -7,7 +7,7 @@ import { nb } from 'azdata'; import * as assert from 'assert'; import { URI } from 'vs/base/common/uri'; -import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { CellTypes, NotebookChangeType } from 'sql/workbench/services/notebook/common/contracts'; import { ICellModel, IClientSession, INotebookModelOptions } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel'; @@ -30,7 +30,7 @@ import { NotebookMarkdownRenderer } from 'sql/workbench/contrib/notebook/browser import { NullAdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; -import { SessionManager } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; +import { SessionManager } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; import { NBFORMAT, NBFORMAT_MINOR } from 'sql/workbench/common/constants'; import { Emitter } from 'vs/base/common/event'; import { IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils'; diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts index 15ebcebf6b..1cffa6b0dd 100644 --- a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts @@ -14,7 +14,7 @@ import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogSer import { URI } from 'vs/base/common/uri'; -import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { ExecuteManagerStub, NotebookServiceStub, SerializationManagerStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { NotebookModel, SplitCell } from 'sql/workbench/services/notebook/browser/models/notebookModel'; import { ModelFactory } from 'sql/workbench/services/notebook/browser/models/modelFactory'; import { IClientSession, INotebookModelOptions, NotebookContentChange, IClientSessionOptions, ICellModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; @@ -30,7 +30,7 @@ import { ILogService, NullLogService } from 'vs/platform/log/common/log'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { isUndefinedOrNull } from 'vs/base/common/types'; import { NotebookEditorContentLoader } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; -import { SessionManager } from 'sql/workbench/contrib/notebook/test/emptySessionClasses'; +import { SessionManager } from 'sql/workbench/contrib/notebook/test/browser/emptySessionClasses'; import { AuthenticationType, mssqlProviderName } from 'sql/platform/connection/common/constants'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { uriPrefixes } from 'sql/platform/connection/common/utils'; diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts index 3c325a523c..e1a54144ba 100644 --- a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts @@ -9,7 +9,7 @@ import * as TypeMoq from 'typemoq'; import { nb } from 'azdata'; import { isStream, getProvidersForFileName, asyncForEach, getStandardKernelsForProvider, IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils'; import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService'; -import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { tryMatchCellMagic, extractCellMagicCommandPlusArgs } from 'sql/workbench/services/notebook/browser/utils'; import { RichTextEditStack } from 'sql/workbench/contrib/notebook/browser/cellViews/textCell.component'; import { notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces'; diff --git a/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts b/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts index 2dc021aee3..8f493784cc 100644 --- a/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts +++ b/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts @@ -17,7 +17,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { ILanguageAssociationRegistry, Extensions as LanguageAssociationExtensions } from 'sql/workbench/services/languageAssociation/common/languageAssociation'; import { TestQueryEditorService } from 'sql/workbench/services/queryEditor/test/browser/testQueryEditorService'; import { ITestInstantiationService, TestEditorService } from 'vs/workbench/test/browser/workbenchTestServices'; -import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/stubs'; +import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/browser/stubs'; import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput'; import { URI } from 'vs/base/common/uri'; import { FileQueryEditorInput } from 'sql/workbench/contrib/query/browser/fileQueryEditorInput';