ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

Browse Source 
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/vs/workbench/test/browser/parts/views/views.test.ts
View File

@@ -4,8 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { ContributableViewsModel, ViewsService, IViewState } from 'vs/workbench/browser/parts/views/views';
import { IViewsRegistry, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
import { ContributableViewsModel, ViewDescriptorService, IViewState } from 'vs/workbench/browser/parts/views/views';
import { IViewsRegistry, IViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { move } from 'vs/base/common/arrays';
import { Registry } from 'vs/platform/registry/common/platform';
@@ -14,8 +14,9 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
import sinon = require('sinon');
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
const container = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({ id: 'test', name: 'test', ctorDescriptor: { ctor: <any>{} } }, ViewContainerLocation.Sidebar);
const container = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({ id: 'test', name: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
const ViewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
class ViewDescriptorSequence {
@@ -37,14 +38,14 @@ class ViewDescriptorSequence {
suite('ContributableViewsModel', () => {
let viewsService: IViewsService;
let viewDescriptorService: IViewDescriptorService;
let contextKeyService: IContextKeyService;
setup(() => {
const instantiationService: TestInstantiationService = <TestInstantiationService>workbenchInstantiationService();
contextKeyService = instantiationService.createInstance(ContextKeyService);
instantiationService.stub(IContextKeyService, contextKeyService);
viewsService = instantiationService.createInstance(ViewsService);
viewDescriptorService = instantiationService.createInstance(ViewDescriptorService);
});
teardown(() => {
@@ -52,12 +53,12 @@ suite('ContributableViewsModel', () => {
});
test('empty model', function () {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
assert.equal(model.visibleViewDescriptors.length, 0);
});
test('register/unregister', () => {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
assert.equal(model.visibleViewDescriptors.length, 0);
@@ -83,7 +84,7 @@ suite('ContributableViewsModel', () => {
});
test('when contexts', async function () {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
assert.equal(model.visibleViewDescriptors.length, 0);
@@ -127,7 +128,7 @@ suite('ContributableViewsModel', () => {
});
test('when contexts - multiple', async function () {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1' };
@@ -150,7 +151,7 @@ suite('ContributableViewsModel', () => {
});
test('when contexts - multiple 2', async function () {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1', when: ContextKeyExpr.equals('showview1', true) };
@@ -173,7 +174,7 @@ suite('ContributableViewsModel', () => {
});
test('setVisible', () => {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1', canToggleVisibility: true };
@@ -218,7 +219,7 @@ suite('ContributableViewsModel', () => {
});
test('move', () => {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1' };
@@ -249,7 +250,7 @@ suite('ContributableViewsModel', () => {
test('view states', async function () {
const viewStates = new Map<string, IViewState>();
viewStates.set('view1', { visibleGlobal: false, collapsed: false, visibleWorkspace: undefined });
const model = new ContributableViewsModel(container, viewsService, viewStates);
const model = new ContributableViewsModel(container, viewDescriptorService, viewStates);
const seq = new ViewDescriptorSequence(model);
assert.equal(model.visibleViewDescriptors.length, 0);
@@ -269,7 +270,7 @@ suite('ContributableViewsModel', () => {
test('view states and when contexts', async function () {
const viewStates = new Map<string, IViewState>();
viewStates.set('view1', { visibleGlobal: false, collapsed: false, visibleWorkspace: undefined });
const model = new ContributableViewsModel(container, viewsService, viewStates);
const model = new ContributableViewsModel(container, viewDescriptorService, viewStates);
const seq = new ViewDescriptorSequence(model);
assert.equal(model.visibleViewDescriptors.length, 0);
@@ -299,7 +300,7 @@ suite('ContributableViewsModel', () => {
test('view states and when contexts multiple views', async function () {
const viewStates = new Map<string, IViewState>();
viewStates.set('view1', { visibleGlobal: false, collapsed: false, visibleWorkspace: undefined });
const model = new ContributableViewsModel(container, viewsService, viewStates);
const model = new ContributableViewsModel(container, viewDescriptorService, viewStates);
const seq = new ViewDescriptorSequence(model);
assert.equal(model.visibleViewDescriptors.length, 0);
@@ -343,7 +344,7 @@ suite('ContributableViewsModel', () => {
});
test('remove event is not triggered if view was hidden and removed', async function () {
const model = new ContributableViewsModel(container, viewsService);
const model = new ContributableViewsModel(container, viewDescriptorService);
const seq = new ViewDescriptorSequence(model);
const viewDescriptor: IViewDescriptor = {