From 9c2307cdd976820d17523a7fc37d5293b8ee146a Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Mon, 3 Jul 2023 15:17:29 -0700 Subject: [PATCH] More layering fixes (#23625) --- .../contrib/objectExplorer/test/browser/serverTreeView.test.ts | 2 +- .../contrib/query/test/browser/queryInputFactory.test.ts | 2 +- .../contrib/scripting/test/browser/scriptingActions.test.ts | 2 +- .../objectExplorer/browser/filterDialog/filterDialog.ts | 2 +- .../browser/{ => filterDialog}/media/eraseDark.svg | 0 .../browser/{ => filterDialog}/media/eraseLight.svg | 0 .../browser/{ => filterDialog}/media/filterDialog.css | 0 .../objectExplorer/test/browser/dragAndDropController.test.ts | 2 +- .../workbench/services/query/test/common/queryRunner.test.ts | 2 +- .../test/electron-browser/queryEditorService.test.ts | 2 +- .../test/browser/parts/editor/editorStatusModeSelect.test.ts | 2 +- src/sql/workbench/test/{ => browser/parts/tree}/treeMock.ts | 0 src/sql/workbench/test/{ => browser}/workbenchTestServices.ts | 0 13 files changed, 8 insertions(+), 8 deletions(-) rename src/sql/workbench/services/objectExplorer/browser/{ => filterDialog}/media/eraseDark.svg (100%) rename src/sql/workbench/services/objectExplorer/browser/{ => filterDialog}/media/eraseLight.svg (100%) rename src/sql/workbench/services/objectExplorer/browser/{ => filterDialog}/media/filterDialog.css (100%) rename src/sql/workbench/test/{ => browser/parts/tree}/treeMock.ts (100%) rename src/sql/workbench/test/{ => browser}/workbenchTestServices.ts (100%) diff --git a/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts b/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts index 677309f462..2a47fb0fbd 100644 --- a/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts +++ b/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts @@ -10,7 +10,7 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/ import * as TypeMoq from 'typemoq'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { ITree } from 'sql/base/parts/tree/browser/tree'; -import { TestTree } from 'sql/workbench/test/treeMock'; +import { TestTree } from 'sql/workbench/test/browser/parts/tree/treeMock'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; import { TreeItemCollapsibleState } from 'sql/workbench/services/objectExplorer/common/treeNode'; diff --git a/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts b/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts index 7e0b403030..b777d641b5 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts +++ b/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts @@ -9,7 +9,7 @@ import { ITestInstantiationService, TestEditorService } from 'vs/workbench/test/ import { URI } from 'vs/base/common/uri'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput'; -import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices'; +import { workbenchInstantiationService } from 'sql/workbench/test/browser/workbenchTestServices'; import { QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/browser/queryEditorFactory'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/contrib/scripting/test/browser/scriptingActions.test.ts b/src/sql/workbench/contrib/scripting/test/browser/scriptingActions.test.ts index 0e5ae61c3b..7f69a6f8bb 100644 --- a/src/sql/workbench/contrib/scripting/test/browser/scriptingActions.test.ts +++ b/src/sql/workbench/contrib/scripting/test/browser/scriptingActions.test.ts @@ -20,7 +20,7 @@ import { NodeType } from 'sql/workbench/services/objectExplorer/common/nodeType' import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; import { createObjectExplorerServiceMock } from 'sql/workbench/services/objectExplorer/test/browser/testObjectExplorerService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { TestTree } from 'sql/workbench/test/treeMock'; +import { TestTree } from 'sql/workbench/test/browser/parts/tree/treeMock'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; diff --git a/src/sql/workbench/services/objectExplorer/browser/filterDialog/filterDialog.ts b/src/sql/workbench/services/objectExplorer/browser/filterDialog/filterDialog.ts index 5d35a26bc3..8ecabbfd13 100644 --- a/src/sql/workbench/services/objectExplorer/browser/filterDialog/filterDialog.ts +++ b/src/sql/workbench/services/objectExplorer/browser/filterDialog/filterDialog.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./../media/filterDialog'; +import 'vs/css!./media/filterDialog'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { Modal } from 'sql/workbench/browser/modal/modal' diff --git a/src/sql/workbench/services/objectExplorer/browser/media/eraseDark.svg b/src/sql/workbench/services/objectExplorer/browser/filterDialog/media/eraseDark.svg similarity index 100% rename from src/sql/workbench/services/objectExplorer/browser/media/eraseDark.svg rename to src/sql/workbench/services/objectExplorer/browser/filterDialog/media/eraseDark.svg diff --git a/src/sql/workbench/services/objectExplorer/browser/media/eraseLight.svg b/src/sql/workbench/services/objectExplorer/browser/filterDialog/media/eraseLight.svg similarity index 100% rename from src/sql/workbench/services/objectExplorer/browser/media/eraseLight.svg rename to src/sql/workbench/services/objectExplorer/browser/filterDialog/media/eraseLight.svg diff --git a/src/sql/workbench/services/objectExplorer/browser/media/filterDialog.css b/src/sql/workbench/services/objectExplorer/browser/filterDialog/media/filterDialog.css similarity index 100% rename from src/sql/workbench/services/objectExplorer/browser/media/filterDialog.css rename to src/sql/workbench/services/objectExplorer/browser/filterDialog/media/filterDialog.css diff --git a/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts b/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts index abea4a4e6d..6ba346a9e0 100644 --- a/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts +++ b/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts @@ -11,7 +11,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { ServerTreeDragAndDrop } from 'sql/workbench/services/objectExplorer/browser/dragAndDropController'; -import { TestTree } from 'sql/workbench/test/treeMock'; +import { TestTree } from 'sql/workbench/test/browser/parts/tree/treeMock'; import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { mssqlProviderName, pgsqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/services/query/test/common/queryRunner.test.ts b/src/sql/workbench/services/query/test/common/queryRunner.test.ts index a9a98aab69..2173dce9b3 100644 --- a/src/sql/workbench/services/query/test/common/queryRunner.test.ts +++ b/src/sql/workbench/services/query/test/common/queryRunner.test.ts @@ -8,7 +8,7 @@ import * as sinon from 'sinon'; import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { BatchSummary, ResultSetSummary, IResultMessage, ResultSetSubset, CompleteBatchSummary } from 'sql/workbench/services/query/common/query'; import { URI } from 'vs/base/common/uri'; -import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices'; +import { workbenchInstantiationService } from 'sql/workbench/test/browser/workbenchTestServices'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { Event } from 'vs/base/common/event'; diff --git a/src/sql/workbench/services/queryEditor/test/electron-browser/queryEditorService.test.ts b/src/sql/workbench/services/queryEditor/test/electron-browser/queryEditorService.test.ts index c58d9bdca4..198dfb1f2a 100644 --- a/src/sql/workbench/services/queryEditor/test/electron-browser/queryEditorService.test.ts +++ b/src/sql/workbench/services/queryEditor/test/electron-browser/queryEditorService.test.ts @@ -9,7 +9,7 @@ import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/q import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService'; import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput'; -import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices'; +import { workbenchInstantiationService } from 'sql/workbench/test/browser/workbenchTestServices'; suite('Query Editor Service', () => { test('does open input when requested', async () => { 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 cefc3a9114..2dc021aee3 100644 --- a/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts +++ b/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts @@ -9,7 +9,7 @@ import { setLanguageId } from 'sql/workbench/browser/parts/editor/editorStatusMo import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/browser/queryEditorFactory'; import { NotebookEditorLanguageAssociation } from 'sql/workbench/contrib/notebook/browser/models/notebookEditorFactory'; -import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices'; +import { workbenchInstantiationService } from 'sql/workbench/test/browser/workbenchTestServices'; import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; diff --git a/src/sql/workbench/test/treeMock.ts b/src/sql/workbench/test/browser/parts/tree/treeMock.ts similarity index 100% rename from src/sql/workbench/test/treeMock.ts rename to src/sql/workbench/test/browser/parts/tree/treeMock.ts diff --git a/src/sql/workbench/test/workbenchTestServices.ts b/src/sql/workbench/test/browser/workbenchTestServices.ts similarity index 100% rename from src/sql/workbench/test/workbenchTestServices.ts rename to src/sql/workbench/test/browser/workbenchTestServices.ts