提交 8db3ee00 编写于 作者: S Sandeep Somavarapu

fix tests

上级 f4308261
...@@ -18,6 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti ...@@ -18,6 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { mock } from 'vs/workbench/test/electron-browser/api/mock'; import { mock } from 'vs/workbench/test/electron-browser/api/mock';
import { TreeItemCollapsibleState, ITreeItem } from 'vs/workbench/common/views'; import { TreeItemCollapsibleState, ITreeItem } from 'vs/workbench/common/views';
import { NullLogService } from 'vs/platform/log/common/log'; import { NullLogService } from 'vs/platform/log/common/log';
import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
suite('ExtHostTreeView', function () { suite('ExtHostTreeView', function () {
...@@ -72,9 +73,9 @@ suite('ExtHostTreeView', function () { ...@@ -72,9 +73,9 @@ suite('ExtHostTreeView', function () {
testObject = new ExtHostTreeViews(target, new ExtHostCommands(rpcProtocol, new ExtHostHeapService(), new NullLogService()), new NullLogService()); testObject = new ExtHostTreeViews(target, new ExtHostCommands(rpcProtocol, new ExtHostHeapService(), new NullLogService()), new NullLogService());
onDidChangeTreeNode = new Emitter<{ key: string }>(); onDidChangeTreeNode = new Emitter<{ key: string }>();
onDidChangeTreeNodeWithId = new Emitter<{ key: string }>(); onDidChangeTreeNodeWithId = new Emitter<{ key: string }>();
testObject.createTreeView('testNodeTreeProvider', { treeDataProvider: aNodeTreeDataProvider() }, null); testObject.createTreeView('testNodeTreeProvider', { treeDataProvider: aNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
testObject.createTreeView('testNodeWithIdTreeProvider', { treeDataProvider: aNodeWithIdTreeDataProvider() }, null); testObject.createTreeView('testNodeWithIdTreeProvider', { treeDataProvider: aNodeWithIdTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
testObject.createTreeView('testNodeWithHighlightsTreeProvider', { treeDataProvider: aNodeWithHighlightedLabelTreeDataProvider() }, null); testObject.createTreeView('testNodeWithHighlightsTreeProvider', { treeDataProvider: aNodeWithHighlightedLabelTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return loadCompleteTree('testNodeTreeProvider'); return loadCompleteTree('testNodeTreeProvider');
}); });
...@@ -445,14 +446,14 @@ suite('ExtHostTreeView', function () { ...@@ -445,14 +446,14 @@ suite('ExtHostTreeView', function () {
}); });
test('reveal will throw an error if getParent is not implemented', () => { test('reveal will throw an error if getParent is not implemented', () => {
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return treeView.reveal({ key: 'a' }) return treeView.reveal({ key: 'a' })
.then(() => assert.fail('Reveal should throw an error as getParent is not implemented'), () => null); .then(() => assert.fail('Reveal should throw an error as getParent is not implemented'), () => null);
}); });
test('reveal will return empty array for root element', () => { test('reveal will return empty array for root element', () => {
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return treeView.reveal({ key: 'a' }) return treeView.reveal({ key: 'a' })
.then(() => { .then(() => {
assert.ok(revealTarget.calledOnce); assert.ok(revealTarget.calledOnce);
...@@ -465,7 +466,7 @@ suite('ExtHostTreeView', function () { ...@@ -465,7 +466,7 @@ suite('ExtHostTreeView', function () {
test('reveal will return parents array for an element when hierarchy is not loaded', () => { test('reveal will return parents array for an element when hierarchy is not loaded', () => {
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return treeView.reveal({ key: 'aa' }) return treeView.reveal({ key: 'aa' })
.then(() => { .then(() => {
assert.ok(revealTarget.calledOnce); assert.ok(revealTarget.calledOnce);
...@@ -478,7 +479,7 @@ suite('ExtHostTreeView', function () { ...@@ -478,7 +479,7 @@ suite('ExtHostTreeView', function () {
test('reveal will return parents array for an element when hierarchy is loaded', () => { test('reveal will return parents array for an element when hierarchy is loaded', () => {
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return testObject.$getChildren('treeDataProvider') return testObject.$getChildren('treeDataProvider')
.then(() => testObject.$getChildren('treeDataProvider', '0/0:a')) .then(() => testObject.$getChildren('treeDataProvider', '0/0:a'))
.then(() => treeView.reveal({ key: 'aa' }) .then(() => treeView.reveal({ key: 'aa' })
...@@ -500,7 +501,7 @@ suite('ExtHostTreeView', function () { ...@@ -500,7 +501,7 @@ suite('ExtHostTreeView', function () {
} }
}; };
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return treeView.reveal({ key: 'bac' }, { select: false, focus: false, expand: false }) return treeView.reveal({ key: 'bac' }, { select: false, focus: false, expand: false })
.then(() => { .then(() => {
assert.ok(revealTarget.calledOnce); assert.ok(revealTarget.calledOnce);
...@@ -516,7 +517,7 @@ suite('ExtHostTreeView', function () { ...@@ -516,7 +517,7 @@ suite('ExtHostTreeView', function () {
test('reveal after first udpate', () => { test('reveal after first udpate', () => {
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return loadCompleteTree('treeDataProvider') return loadCompleteTree('treeDataProvider')
.then(() => { .then(() => {
tree = { tree = {
...@@ -544,7 +545,7 @@ suite('ExtHostTreeView', function () { ...@@ -544,7 +545,7 @@ suite('ExtHostTreeView', function () {
test('reveal after second udpate', () => { test('reveal after second udpate', () => {
const revealTarget = sinon.spy(target, '$reveal'); const revealTarget = sinon.spy(target, '$reveal');
const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, null); const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() }, { enableProposedApi: true } as IExtensionDescription);
return loadCompleteTree('treeDataProvider') return loadCompleteTree('treeDataProvider')
.then(() => { .then(() => {
tree = { tree = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册