Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix errors in unit test output #161712

Merged
merged 1 commit into from Sep 26, 2022
Merged

fix errors in unit test output #161712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 56 additions & 25 deletions src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ async function setupTest() {

instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
instantiationService.stubPromise(IExtensionGalleryService, 'getExtensions', []);
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{ extensions: [], onDidChangeExtensions: Event.None, canAddExtension: (extension: IExtensionDescription) => false, canRemoveExtension: (extension: IExtensionDescription) => false });
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{ extensions: [], onDidChangeExtensions: Event.None, canAddExtension: (extension: IExtensionDescription) => false, canRemoveExtension: (extension: IExtensionDescription) => false, whenInstalledExtensionsRegistered: () => Promise.resolve(true) });
(<TestExtensionEnablementService>instantiationService.get(IWorkbenchExtensionEnablementService)).reset();

instantiationService.stub(IUserDataSyncEnablementService, instantiationService.createInstance(UserDataSyncEnablementService));
Expand Down Expand Up @@ -783,6 +783,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(local)],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
Expand Down Expand Up @@ -837,6 +838,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(local)],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
Expand All @@ -853,6 +855,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(local)],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
Expand All @@ -868,6 +871,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(local)],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

return instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally)
Expand All @@ -889,6 +893,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(aLocalExtension('a'))],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

return instantiationService.get(IExtensionsWorkbenchService).queryGallery(CancellationToken.None)
Expand All @@ -905,6 +910,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(aLocalExtension('a'))],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

return instantiationService.get(IExtensionsWorkbenchService).queryGallery(CancellationToken.None)
Expand All @@ -923,6 +929,7 @@ suite('ExtensionsActions', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(local)],
onDidChangeExtensions: Event.None,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});

return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
Expand Down Expand Up @@ -979,7 +986,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand All @@ -1003,7 +1011,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => true
canAddExtension: (extension) => true,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand All @@ -1024,7 +1033,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand All @@ -1047,7 +1057,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.0' }))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
Expand All @@ -1069,7 +1080,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(local)],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => true,
canAddExtension: (extension) => true
canAddExtension: (extension) => true,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand All @@ -1087,7 +1099,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.0' }))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand All @@ -1112,7 +1125,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.1' }))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => true,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
Expand Down Expand Up @@ -1140,7 +1154,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const local = aLocalExtension('a', { version: '1.0.1' });
await instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
Expand All @@ -1163,7 +1178,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
Expand All @@ -1185,7 +1201,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.0' }))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
Expand All @@ -1205,7 +1222,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const local = aLocalExtension('a');
await instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
Expand All @@ -1226,7 +1244,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const local = aLocalExtension('a');
await instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
Expand All @@ -1246,7 +1265,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const local = aLocalExtension('a', { version: '1.0.1' });
await instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
Expand All @@ -1271,7 +1291,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('b'))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand All @@ -1292,7 +1313,8 @@ suite('ReloadAction', () => {
extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.1' }))],
onDidChangeExtensions: Event.None,
canRemoveExtension: (extension) => false,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down Expand Up @@ -1320,7 +1342,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(remoteExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
instantiationService.set(IExtensionsWorkbenchService, workbenchService);
Expand Down Expand Up @@ -1353,7 +1376,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(remoteExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
instantiationService.set(IExtensionsWorkbenchService, workbenchService);
Expand Down Expand Up @@ -1391,7 +1415,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down Expand Up @@ -1429,7 +1454,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down Expand Up @@ -1465,7 +1491,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(localExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
instantiationService.set(IExtensionsWorkbenchService, workbenchService);
Expand Down Expand Up @@ -1499,7 +1526,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(localExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down Expand Up @@ -1530,7 +1558,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(remoteExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down Expand Up @@ -1561,7 +1590,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(localExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down Expand Up @@ -1592,7 +1622,8 @@ suite('ReloadAction', () => {
instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
extensions: [toExtensionDescription(remoteExtension)],
onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
canAddExtension: (extension) => false
canAddExtension: (extension) => false,
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
instantiationService.createInstance(ExtensionContainers, [testObject]);
Expand Down
9 changes: 5 additions & 4 deletions src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ import { platform } from 'vs/base/common/platform';
import { arch } from 'vs/base/common/process';
import { IProductService } from 'vs/platform/product/common/productService';

suite('ExtensionsListView Tests', () => {
suite('ExtensionsViews Tests', () => {

let instantiationService: TestInstantiationService;
let testableView: ExtensionsListView;
Expand Down Expand Up @@ -184,7 +184,8 @@ suite('ExtensionsListView Tests', () => {
toExtensionDescription(localRandom),
toExtensionDescription(builtInTheme),
toExtensionDescription(builtInBasic)
]
],
whenInstalledExtensionsRegistered: () => Promise.resolve(true)
});
await (<TestExtensionEnablementService>instantiationService.get(IWorkbenchExtensionEnablementService)).setEnablement([localDisabledTheme], EnablementState.DisabledGlobally);
await (<TestExtensionEnablementService>instantiationService.get(IWorkbenchExtensionEnablementService)).setEnablement([localDisabledLanguage], EnablementState.DisabledGlobally);
Expand Down Expand Up @@ -398,7 +399,7 @@ suite('ExtensionsListView Tests', () => {
const target = <SinonStub>instantiationService.stubPromise(IExtensionGalleryService, 'getExtensions', allRecommendedExtensions);

return testableView.show('@recommended').then(result => {
const extensionInfos: IExtensionInfo[] = target.args[0][0];
const extensionInfos: IExtensionInfo[] = target.args[1][0];

assert.strictEqual(extensionInfos.length, allRecommendedExtensions.length);
assert.strictEqual(result.length, allRecommendedExtensions.length);
Expand All @@ -423,7 +424,7 @@ suite('ExtensionsListView Tests', () => {
const target = <SinonStub>instantiationService.stubPromise(IExtensionGalleryService, 'getExtensions', allRecommendedExtensions);

return testableView.show('@recommended:all').then(result => {
const extensionInfos: IExtensionInfo[] = target.args[0][0];
const extensionInfos: IExtensionInfo[] = target.args[1][0];

assert.strictEqual(extensionInfos.length, allRecommendedExtensions.length);
assert.strictEqual(result.length, allRecommendedExtensions.length);
Expand Down