+
{this.renderReleaseNotesLink()}
- {this.renderReleaseNotes()}
{this.renderTutorialAndDoc()}
@@ -151,8 +149,7 @@ export class StartPage extends React.Component
implements IMess
// tslint:disable-next-line: no-any
public handleMessage = (msg: string, payload?: any) => {
- if (msg === StartPageMessages.SendReleaseNotes) {
- this.releaseNotes.notes = payload.notes;
+ if (msg === StartPageMessages.SendSetting) {
this.releaseNotes.showAgainSetting = payload.showAgainSetting;
this.setState({});
}
@@ -240,21 +237,13 @@ export class StartPage extends React.Component implements IMess
dangerouslySetInnerHTML={{
__html: getLocString(
'StartPage.releaseNotes',
- 'Take a look at our Release Notes to learn more about the latest features'
+ 'Take a look at our Release Notes to learn more about the latest features.'
).format('https://aka.ms/AA8dxtb')
}}
/>
);
}
- private renderReleaseNotes(): JSX.Element {
- const notes: JSX.Element[] = [];
- this.releaseNotes.notes.forEach((rel, index) => {
- notes.push({rel});
- });
- return ;
- }
-
private renderTutorialAndDoc(): JSX.Element {
// tslint:disable: react-no-dangerous-html
return (
diff --git a/src/test/activation/activationService.unit.test.ts b/src/test/activation/activationService.unit.test.ts
index ae0c34aa5a6d..fea8949e050e 100644
--- a/src/test/activation/activationService.unit.test.ts
+++ b/src/test/activation/activationService.unit.test.ts
@@ -16,13 +16,11 @@ import {
import { LSNotSupportedDiagnosticServiceId } from '../../client/application/diagnostics/checks/lsNotSupported';
import { IDiagnostic, IDiagnosticsService } from '../../client/application/diagnostics/types';
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types';
-import { LSControl, LSEnabled } from '../../client/common/experiments/groups';
import { IPlatformService } from '../../client/common/platform/types';
import {
IConfigurationService,
IDisposable,
IDisposableRegistry,
- IExperimentsManager,
IOutputChannel,
IPersistentState,
IPersistentStateFactory,
@@ -53,7 +51,6 @@ suite('Language Server Activation - ActivationService', () => {
let lsNotSupportedDiagnosticService: TypeMoq.IMock;
let stateFactory: TypeMoq.IMock;
let state: TypeMoq.IMock>;
- let experiments: TypeMoq.IMock;
let workspaceConfig: TypeMoq.IMock;
let interpreterService: TypeMoq.IMock;
let interpreterChangedHandler!: Function;
@@ -67,7 +64,6 @@ suite('Language Server Activation - ActivationService', () => {
state = TypeMoq.Mock.ofType>();
const configService = TypeMoq.Mock.ofType();
pythonSettings = TypeMoq.Mock.ofType();
- experiments = TypeMoq.Mock.ofType();
const langFolderServiceMock = TypeMoq.Mock.ofType();
const folderVer: FolderVersionPair = {
path: '',
@@ -179,16 +175,10 @@ suite('Language Server Activation - ActivationService', () => {
.returns(() => activator.object)
.verifiable(TypeMoq.Times.once());
- experiments
- .setup((ex) => ex.inExperiment(TypeMoq.It.isAny()))
- .returns(() => false)
- .verifiable(TypeMoq.Times.never());
-
await activationService.activate(undefined);
activator.verifyAll();
serviceContainer.verifyAll();
- experiments.verifyAll();
}
async function testReloadMessage(settingName: string): Promise {
@@ -205,8 +195,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
workspaceService.verifyAll();
@@ -244,8 +233,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await testActivation(activationService, activator, true);
@@ -255,8 +243,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await testActivation(activationService, activator, false);
@@ -267,8 +254,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await testActivation(activationService, activator);
@@ -278,8 +264,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await testActivation(activationService, activator);
@@ -294,8 +279,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await testActivation(activationService, activator, false, LanguageServerType.None);
});
@@ -316,8 +300,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
workspaceService.verifyAll();
@@ -392,8 +375,7 @@ suite('Language Server Activation - ActivationService', () => {
pythonSettings.setup((p) => p.languageServer).returns(() => LanguageServerType.Microsoft);
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
const ls1 = await activationService.get(folder1.uri, interpreter1);
const ls2 = await activationService.get(folder1.uri, interpreter2);
@@ -463,8 +445,7 @@ suite('Language Server Activation - ActivationService', () => {
pythonSettings.setup((p) => p.languageServer).returns(() => LanguageServerType.Microsoft);
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await activationService.activate(folder1.uri);
await interpreterChangedHandler();
@@ -486,8 +467,7 @@ suite('Language Server Activation - ActivationService', () => {
const activatorJedi = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
const diagnostics: IDiagnostic[] = [];
lsNotSupportedDiagnosticService
@@ -562,17 +542,12 @@ suite('Language Server Activation - ActivationService', () => {
.setup((w) => w.getWorkspaceFolderIdentifier(resource, ''))
.returns(() => resource!.fsPath)
.verifiable(TypeMoq.Times.atLeastOnce());
- experiments
- .setup((ex) => ex.inExperiment(TypeMoq.It.isAny()))
- .returns(() => false)
- .verifiable(TypeMoq.Times.never());
await activationService.activate(resource);
activator.verifyAll();
serviceContainer.verifyAll();
workspaceService.verifyAll();
- experiments.verifyAll();
}
test('Activator is disposed if activated workspace is removed and LS is "Microsoft"', async () => {
pythonSettings.setup((p) => p.languageServer).returns(() => LanguageServerType.Microsoft);
@@ -584,8 +559,7 @@ suite('Language Server Activation - ActivationService', () => {
.verifiable(TypeMoq.Times.once());
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
workspaceService.verifyAll();
expect(workspaceFoldersChangedHandler).not.to.be.equal(undefined, 'Handler not set');
@@ -624,8 +598,7 @@ suite('Language Server Activation - ActivationService', () => {
const activator1 = TypeMoq.Mock.ofType();
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
const folder1 = { name: 'one', uri: Uri.parse('one'), index: 1 };
const folder2 = { name: 'two', uri: Uri.parse('two'), index: 2 };
@@ -642,15 +615,10 @@ suite('Language Server Activation - ActivationService', () => {
.setup((a) => a.start(folder1.uri, undefined))
.returns(() => Promise.resolve())
.verifiable(TypeMoq.Times.once());
- experiments
- .setup((ex) => ex.inExperiment(TypeMoq.It.isAny()))
- .returns(() => false)
- .verifiable(TypeMoq.Times.never());
await activationService.activate(folder1.uri);
activator1.verifyAll();
activator1.verify((a) => a.activate(), TypeMoq.Times.once());
serviceContainer.verifyAll();
- experiments.verifyAll();
const activator2 = TypeMoq.Mock.ofType();
serviceContainer
@@ -667,16 +635,11 @@ suite('Language Server Activation - ActivationService', () => {
.returns(() => Promise.resolve())
.verifiable(TypeMoq.Times.never());
activator2.setup((a) => a.activate()).verifiable(TypeMoq.Times.never());
- experiments
- .setup((ex) => ex.inExperiment(TypeMoq.It.isAny()))
- .returns(() => false)
- .verifiable(TypeMoq.Times.never());
await activationService.activate(folder2.uri);
serviceContainer.verifyAll();
activator1.verifyAll();
activator1.verify((a) => a.activate(), TypeMoq.Times.exactly(2));
activator2.verifyAll();
- experiments.verifyAll();
});
}
}
@@ -693,7 +656,6 @@ suite('Language Server Activation - ActivationService', () => {
let lsNotSupportedDiagnosticService: TypeMoq.IMock;
let stateFactory: TypeMoq.IMock;
let state: TypeMoq.IMock>;
- let experiments: TypeMoq.IMock;
let workspaceConfig: TypeMoq.IMock;
let interpreterService: TypeMoq.IMock;
setup(() => {
@@ -706,7 +668,6 @@ suite('Language Server Activation - ActivationService', () => {
state = TypeMoq.Mock.ofType>();
const configService = TypeMoq.Mock.ofType();
pythonSettings = TypeMoq.Mock.ofType();
- experiments = TypeMoq.Mock.ofType();
interpreterService = TypeMoq.Mock.ofType();
const e = new EventEmitter();
interpreterService.setup((i) => i.onDidChangeInterpreter).returns(() => e.event);
@@ -785,8 +746,7 @@ suite('Language Server Activation - ActivationService', () => {
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await activationService.sendTelemetryForChosenLanguageServer(LanguageServerType.Jedi);
@@ -805,8 +765,7 @@ suite('Language Server Activation - ActivationService', () => {
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await activationService.sendTelemetryForChosenLanguageServer(LanguageServerType.Microsoft);
@@ -825,8 +784,7 @@ suite('Language Server Activation - ActivationService', () => {
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await activationService.sendTelemetryForChosenLanguageServer(LanguageServerType.Jedi);
@@ -845,8 +803,7 @@ suite('Language Server Activation - ActivationService', () => {
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
await activationService.sendTelemetryForChosenLanguageServer(LanguageServerType.Jedi);
@@ -854,204 +811,6 @@ suite('Language Server Activation - ActivationService', () => {
});
});
- suite('Test useJedi()', () => {
- let serviceContainer: TypeMoq.IMock;
- let pythonSettings: TypeMoq.IMock;
- let appShell: TypeMoq.IMock;
- let cmdManager: TypeMoq.IMock;
- let workspaceService: TypeMoq.IMock;
- let platformService: TypeMoq.IMock;
- let lsNotSupportedDiagnosticService: TypeMoq.IMock;
- let stateFactory: TypeMoq.IMock;
- let state: TypeMoq.IMock>;
- let experiments: TypeMoq.IMock;
- let workspaceConfig: TypeMoq.IMock;
- let interpreterService: TypeMoq.IMock;
- setup(() => {
- serviceContainer = TypeMoq.Mock.ofType();
- appShell = TypeMoq.Mock.ofType();
- workspaceService = TypeMoq.Mock.ofType();
- cmdManager = TypeMoq.Mock.ofType();
- platformService = TypeMoq.Mock.ofType();
- stateFactory = TypeMoq.Mock.ofType();
- state = TypeMoq.Mock.ofType>();
- const configService = TypeMoq.Mock.ofType();
- pythonSettings = TypeMoq.Mock.ofType();
- experiments = TypeMoq.Mock.ofType();
- interpreterService = TypeMoq.Mock.ofType();
- const e = new EventEmitter();
- interpreterService.setup((i) => i.onDidChangeInterpreter).returns(() => e.event);
- const langFolderServiceMock = TypeMoq.Mock.ofType();
- const folderVer: FolderVersionPair = {
- path: '',
- version: new SemVer('1.2.3')
- };
- lsNotSupportedDiagnosticService = TypeMoq.Mock.ofType();
- workspaceService.setup((w) => w.hasWorkspaceFolders).returns(() => false);
- workspaceService.setup((w) => w.workspaceFolders).returns(() => []);
- configService.setup((c) => c.getSettings(TypeMoq.It.isAny())).returns(() => pythonSettings.object);
- langFolderServiceMock
- .setup((l) => l.getCurrentLanguageServerDirectory())
- .returns(() => Promise.resolve(folderVer));
- stateFactory
- .setup((f) =>
- f.createGlobalPersistentState(
- TypeMoq.It.isValue('SWITCH_LS'),
- TypeMoq.It.isAny(),
- TypeMoq.It.isAny()
- )
- )
- .returns(() => state.object);
- state.setup((s) => s.value).returns(() => undefined);
- state.setup((s) => s.updateValue(TypeMoq.It.isAny())).returns(() => Promise.resolve());
- workspaceConfig = TypeMoq.Mock.ofType();
- workspaceService
- .setup((ws) => ws.getConfiguration('python', TypeMoq.It.isAny()))
- .returns(() => workspaceConfig.object);
- const output = TypeMoq.Mock.ofType();
- serviceContainer
- .setup((c) => c.get(TypeMoq.It.isValue(IOutputChannel), TypeMoq.It.isAny()))
- .returns(() => output.object);
- serviceContainer
- .setup((c) => c.get(TypeMoq.It.isValue(IWorkspaceService)))
- .returns(() => workspaceService.object);
- serviceContainer.setup((c) => c.get(TypeMoq.It.isValue(IApplicationShell))).returns(() => appShell.object);
- serviceContainer.setup((c) => c.get(TypeMoq.It.isValue(IDisposableRegistry))).returns(() => []);
- serviceContainer
- .setup((c) => c.get(TypeMoq.It.isValue(IConfigurationService)))
- .returns(() => configService.object);
- serviceContainer.setup((c) => c.get(TypeMoq.It.isValue(ICommandManager))).returns(() => cmdManager.object);
- serviceContainer
- .setup((c) => c.get(TypeMoq.It.isValue(IPlatformService)))
- .returns(() => platformService.object);
- serviceContainer
- .setup((c) => c.get(TypeMoq.It.isValue(IInterpreterService)))
- .returns(() => interpreterService.object);
- serviceContainer
- .setup((c) => c.get(TypeMoq.It.isValue(ILanguageServerFolderService)))
- .returns(() => langFolderServiceMock.object);
- serviceContainer
- .setup((s) =>
- s.get(
- TypeMoq.It.isValue(IDiagnosticsService),
- TypeMoq.It.isValue(LSNotSupportedDiagnosticServiceId)
- )
- )
- .returns(() => lsNotSupportedDiagnosticService.object);
- });
-
- test('If default value (Jedi) of language server is being used, and LSEnabled experiment is enabled, then return false', async () => {
- const settings = {};
- experiments
- .setup((ex) => ex.inExperiment(LSEnabled))
- .returns(() => true)
- .verifiable(TypeMoq.Times.once());
- experiments
- .setup((ex) => ex.sendTelemetryIfInExperiment(TypeMoq.It.isAny()))
- .returns(() => undefined)
- .verifiable(TypeMoq.Times.never());
- workspaceConfig
- .setup((c) => c.inspect('languageServer'))
- .returns(() => settings as any)
- .verifiable(TypeMoq.Times.once());
-
- const activationService = new LanguageServerExtensionActivationService(
- serviceContainer.object,
- stateFactory.object,
- experiments.object
- );
- const result = activationService.useJedi();
- expect(result).to.equal(false, 'LS should be enabled');
-
- workspaceService.verifyAll();
- workspaceConfig.verifyAll();
- experiments.verifyAll();
- });
-
- test('If default value of languageServer (Jedi) is being used, and LSEnabled experiment is disabled, then send telemetry if user is in Experiment LSControl and useJedi() should be true)', async () => {
- const settings = {};
- experiments
- .setup((ex) => ex.inExperiment(LSEnabled))
- .returns(() => false)
- .verifiable(TypeMoq.Times.once());
- experiments
- .setup((ex) => ex.sendTelemetryIfInExperiment(LSControl))
- .returns(() => undefined)
- .verifiable(TypeMoq.Times.once());
- workspaceConfig
- .setup((c) => c.inspect('languageServer'))
- .returns(() => settings as any)
- .verifiable(TypeMoq.Times.once());
-
- const activationService = new LanguageServerExtensionActivationService(
- serviceContainer.object,
- stateFactory.object,
- experiments.object
- );
- const result = activationService.useJedi();
- expect(result).to.equal(true, 'Return value should be true');
-
- pythonSettings.verifyAll();
- experiments.verifyAll();
- workspaceService.verifyAll();
- workspaceConfig.verifyAll();
- });
-
- suite(
- 'If default value of languageServer (Jedi) is not being used, then no experiments are used, and python settings value is returned',
- async () => {
- [
- {
- testName: 'Returns false when python settings value is Microsoft',
- pythonSettingsValue: LanguageServerType.Microsoft,
- expectedResult: false
- },
- {
- testName: 'Returns true when python settings value is Jedi',
- pythonSettingsValue: LanguageServerType.Jedi,
- expectedResult: true
- }
- ].forEach((testParams) => {
- test(testParams.testName, async () => {
- const settings = { workspaceFolderValue: true };
- experiments
- .setup((ex) => ex.inExperiment(LSEnabled))
- .returns(() => false)
- .verifiable(TypeMoq.Times.never());
- experiments
- .setup((ex) => ex.sendTelemetryIfInExperiment(LSControl))
- .returns(() => undefined)
- .verifiable(TypeMoq.Times.never());
- workspaceConfig
- .setup((c) => c.inspect('languageServer'))
- .returns(() => settings as any)
- .verifiable(TypeMoq.Times.once());
- pythonSettings
- .setup((p) => p.languageServer)
- .returns(() => testParams.pythonSettingsValue)
- .verifiable(TypeMoq.Times.once());
-
- const activationService = new LanguageServerExtensionActivationService(
- serviceContainer.object,
- stateFactory.object,
- experiments.object
- );
- const result = activationService.useJedi();
- expect(result).to.equal(
- testParams.expectedResult,
- `Return value should be ${testParams.expectedResult}`
- );
-
- pythonSettings.verifyAll();
- experiments.verifyAll();
- workspaceService.verifyAll();
- workspaceConfig.verifyAll();
- });
- });
- }
- );
- });
-
suite('Function isJediUsingDefaultConfiguration()', () => {
let serviceContainer: TypeMoq.IMock;
let pythonSettings: TypeMoq.IMock;
@@ -1062,7 +821,6 @@ suite('Language Server Activation - ActivationService', () => {
let lsNotSupportedDiagnosticService: TypeMoq.IMock;
let stateFactory: TypeMoq.IMock;
let state: TypeMoq.IMock>;
- let experiments: TypeMoq.IMock;
let workspaceConfig: TypeMoq.IMock;
let interpreterService: TypeMoq.IMock;
setup(() => {
@@ -1075,7 +833,6 @@ suite('Language Server Activation - ActivationService', () => {
state = TypeMoq.Mock.ofType>();
const configService = TypeMoq.Mock.ofType();
pythonSettings = TypeMoq.Mock.ofType();
- experiments = TypeMoq.Mock.ofType();
interpreterService = TypeMoq.Mock.ofType();
const e = new EventEmitter();
interpreterService.setup((i) => i.onDidChangeInterpreter).returns(() => e.event);
@@ -1166,8 +923,7 @@ suite('Language Server Activation - ActivationService', () => {
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
const result = activationService.isJediUsingDefaultConfiguration(Uri.parse('a'));
expect(result).to.equal(expectedResult);
@@ -1187,8 +943,7 @@ suite('Language Server Activation - ActivationService', () => {
const activationService = new LanguageServerExtensionActivationService(
serviceContainer.object,
- stateFactory.object,
- experiments.object
+ stateFactory.object
);
const result = activationService.isJediUsingDefaultConfiguration(Uri.parse('a'));
expect(result).to.equal(false, 'Return value should be false');
diff --git a/src/test/activation/languageServer/activator.unit.test.ts b/src/test/activation/languageServer/activator.unit.test.ts
index 87fa327568a7..1b393fa95488 100644
--- a/src/test/activation/languageServer/activator.unit.test.ts
+++ b/src/test/activation/languageServer/activator.unit.test.ts
@@ -21,9 +21,10 @@ import { PythonSettings } from '../../../client/common/configSettings';
import { ConfigurationService } from '../../../client/common/configuration/service';
import { FileSystem } from '../../../client/common/platform/fileSystem';
import { IFileSystem } from '../../../client/common/platform/types';
-import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
+import { IConfigurationService, IPythonExtensionBanner, IPythonSettings } from '../../../client/common/types';
import { createDeferred } from '../../../client/common/utils/async';
import { EXTENSION_ROOT_DIR } from '../../../client/constants';
+import { ProposePylanceBanner } from '../../../client/languageServices/proposeLanguageServerBanner';
import { sleep } from '../../core';
// tslint:disable:max-func-body-length
@@ -37,6 +38,7 @@ suite('Language Server - Activator', () => {
let lsFolderService: ILanguageServerFolderService;
let configuration: IConfigurationService;
let settings: IPythonSettings;
+ let banner: IPythonExtensionBanner;
setup(() => {
manager = mock(DotNetLanguageServerManager);
workspaceService = mock(WorkspaceService);
@@ -45,6 +47,7 @@ suite('Language Server - Activator', () => {
lsFolderService = mock(DotNetLanguageServerFolderService);
configuration = mock(ConfigurationService);
settings = mock(PythonSettings);
+ banner = mock(ProposePylanceBanner);
when(configuration.getSettings(anything())).thenReturn(instance(settings));
activator = new DotNetLanguageServerActivator(
instance(manager),
@@ -52,7 +55,8 @@ suite('Language Server - Activator', () => {
instance(fs),
instance(lsDownloader),
instance(lsFolderService),
- instance(configuration)
+ instance(configuration),
+ instance(banner)
);
});
test('Manager must be started without any workspace', async () => {
diff --git a/src/test/activation/node/languageServerFolderService.unit.test.ts b/src/test/activation/node/languageServerFolderService.unit.test.ts
index 115bdecc7eda..b944dde8ffb6 100644
--- a/src/test/activation/node/languageServerFolderService.unit.test.ts
+++ b/src/test/activation/node/languageServerFolderService.unit.test.ts
@@ -9,10 +9,10 @@ import { Extension, Uri, WorkspaceConfiguration } from 'vscode';
import {
ILanguageServerFolder,
ILSExtensionApi,
- NodeLanguageServerFolderService,
- PylanceExtensionName
+ NodeLanguageServerFolderService
} from '../../../client/activation/node/languageServerFolderService';
import { IWorkspaceService } from '../../../client/common/application/types';
+import { PYLANCE_EXTENSION_ID } from '../../../client/common/constants';
import { IConfigurationService, IExtensions, IPythonSettings } from '../../../client/common/types';
import { IServiceContainer } from '../../../client/ioc/types';
@@ -115,7 +115,7 @@ suite('Node Language Server Folder Service', () => {
test('lsExtension not installed', async () => {
pythonSettings.setup((p) => p.downloadLanguageServer).returns(() => true);
workspaceConfiguration.setup((wc) => wc.get('packageName')).returns(() => undefined);
- extensions.setup((e) => e.getExtension(PylanceExtensionName)).returns(() => undefined);
+ extensions.setup((e) => e.getExtension(PYLANCE_EXTENSION_ID)).returns(() => undefined);
const folderService = new TestService(
serviceContainer.object,
@@ -148,7 +148,7 @@ suite('Node Language Server Folder Service', () => {
extension.setup((e) => e.exports).returns(() => extensionApi);
pythonSettings.setup((p) => p.downloadLanguageServer).returns(() => true);
workspaceConfiguration.setup((wc) => wc.get('packageName')).returns(() => undefined);
- extensions.setup((e) => e.getExtension(PylanceExtensionName)).returns(() => extension.object);
+ extensions.setup((e) => e.getExtension(PYLANCE_EXTENSION_ID)).returns(() => extension.object);
folderService = new TestService(
serviceContainer.object,
configService.object,
diff --git a/src/test/activation/serviceRegistry.unit.test.ts b/src/test/activation/serviceRegistry.unit.test.ts
index 18e2bc853ba3..51219665453e 100644
--- a/src/test/activation/serviceRegistry.unit.test.ts
+++ b/src/test/activation/serviceRegistry.unit.test.ts
@@ -57,7 +57,7 @@ import { DataScienceSurveyBanner } from '../../client/datascience/dataScienceSur
import { InteractiveShiftEnterBanner } from '../../client/datascience/shiftEnterBanner';
import { ServiceManager } from '../../client/ioc/serviceManager';
import { IServiceManager } from '../../client/ioc/types';
-import { ProposeLanguageServerBanner } from '../../client/languageServices/proposeLanguageServerBanner';
+import { ProposePylanceBanner } from '../../client/languageServices/proposeLanguageServerBanner';
// tslint:disable:max-func-body-length
@@ -101,7 +101,7 @@ suite('Unit Tests - Language Server Activation Service Registry', () => {
verify(
serviceManager.addSingleton(
IPythonExtensionBanner,
- ProposeLanguageServerBanner,
+ ProposePylanceBanner,
BANNER_NAME_PROPOSE_LS
)
).once();
diff --git a/src/test/common/configSettings/configSettings.unit.test.ts b/src/test/common/configSettings/configSettings.unit.test.ts
index a07d1082fb8b..919459206484 100644
--- a/src/test/common/configSettings/configSettings.unit.test.ts
+++ b/src/test/common/configSettings/configSettings.unit.test.ts
@@ -193,6 +193,31 @@ suite('Python Settings', async () => {
config.verifyAll();
});
+ function testLanguageServer(languageServer: LanguageServerType, expectedValue: LanguageServerType) {
+ test(languageServer, () => {
+ expected.pythonPath = 'python3';
+ expected.languageServer = languageServer;
+ initializeConfig(expected);
+ config
+ .setup((c) => c.get('languageServer'))
+ .returns(() => expected.languageServer)
+ .verifiable(TypeMoq.Times.once());
+
+ settings.update(config.object);
+
+ expect(settings.languageServer).to.be.equal(expectedValue);
+ config.verifyAll();
+ });
+ }
+
+ suite('languageServer settings', async () => {
+ Object.values(LanguageServerType).forEach(async (languageServer) => {
+ testLanguageServer(languageServer, languageServer);
+ });
+
+ testLanguageServer('invalid' as LanguageServerType, LanguageServerType.Jedi);
+ });
+
function testExperiments(enabled: boolean) {
expected.pythonPath = 'python3';
// tslint:disable-next-line:no-any
diff --git a/src/test/datascience/.vscode/settings.json b/src/test/datascience/.vscode/settings.json
index 84a3ffb84a43..90f4ac4dc843 100644
--- a/src/test/datascience/.vscode/settings.json
+++ b/src/test/datascience/.vscode/settings.json
@@ -24,5 +24,6 @@
"files.autoSave": "off",
// We don't want jupyter to start when testing (DS functionality or anything else).
"python.dataScience.disableJupyterAutoStart": true,
- "python.logging.level": "debug"
+ "python.logging.level": "debug",
+ "python.dataScience.alwaysTrustNotebooks": true // In UI tests we don't want prompts for `Do you want to trust thie nb...`
}
diff --git a/src/test/datascience/dataScienceIocContainer.ts b/src/test/datascience/dataScienceIocContainer.ts
index b0ac5a5220e6..974befd219b0 100644
--- a/src/test/datascience/dataScienceIocContainer.ts
+++ b/src/test/datascience/dataScienceIocContainer.ts
@@ -151,6 +151,7 @@ import {
TerminalActivationProviders
} from '../../client/common/terminal/types';
import {
+ BANNER_NAME_PROPOSE_LS,
GLOBAL_MEMENTO,
IAsyncDisposableRegistry,
IBrowserService,
@@ -170,6 +171,7 @@ import {
IOutputChannel,
IPathUtils,
IPersistentStateFactory,
+ IPythonExtensionBanner,
IPythonSettings,
IsWindows,
ProductType,
@@ -365,6 +367,7 @@ import { InterpreterVersionService } from '../../client/interpreter/interpreterV
import { registerInterpreterTypes } from '../../client/interpreter/serviceRegistry';
import { VirtualEnvironmentManager } from '../../client/interpreter/virtualEnvs';
import { IVirtualEnvironmentManager } from '../../client/interpreter/virtualEnvs/types';
+import { ProposePylanceBanner } from '../../client/languageServices/proposeLanguageServerBanner';
import { CacheableLocatorPromiseCache } from '../../client/pythonEnvironments/discovery/locators/services/cacheableLocatorService';
import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info';
import { registerForIOC } from '../../client/pythonEnvironments/legacyIOC';
@@ -761,6 +764,11 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
LanguageServerType.Microsoft
);
this.serviceManager.add(ILanguageServerManager, DotNetLanguageServerManager);
+ this.serviceManager.add(
+ IPythonExtensionBanner,
+ ProposePylanceBanner,
+ BANNER_NAME_PROPOSE_LS
+ );
} else if (languageServerType === LanguageServerType.Node) {
this.serviceManager.add(
ILanguageServerActivator,
diff --git a/src/test/datascience/export/exportManager.test.ts b/src/test/datascience/export/exportManager.test.ts
index 862f3e06192c..e98ef9d932aa 100644
--- a/src/test/datascience/export/exportManager.test.ts
+++ b/src/test/datascience/export/exportManager.test.ts
@@ -33,17 +33,17 @@ suite('Data Science - Export Manager', () => {
exportPdf = mock();
// tslint:disable-next-line: no-any
- when(filePicker.getExportFileLocation(anything(), anything())).thenReturn(
+ when(filePicker.getExportFileLocation(anything(), anything(), anything())).thenReturn(
Promise.resolve(Uri.file('test.pdf'))
);
// tslint:disable-next-line: no-empty
when(exportUtil.generateTempDir()).thenResolve({ path: 'test', dispose: () => {} });
when(exportUtil.makeFileInDirectory(anything(), anything(), anything())).thenResolve('foo');
when(fileSystem.createTemporaryFile(anything())).thenResolve(instance(tempFile));
- when(exportPdf.export(anything(), anything())).thenResolve();
+ when(exportPdf.export(anything(), anything(), anything())).thenResolve();
when(filePicker.getExportFileLocation(anything(), anything())).thenResolve(Uri.file('foo'));
// tslint:disable-next-line: no-any
- when(reporter.createProgressIndicator(anything())).thenReturn(instance(mock()) as any);
+ when(reporter.createProgressIndicator(anything(), anything())).thenReturn(instance(mock()) as any);
exporter = new ExportManager(
instance(exportPdf),
instance(exportHtml),
diff --git a/src/test/datascience/export/exportManagerFileOpener.unit.test.ts b/src/test/datascience/export/exportManagerFileOpener.unit.test.ts
index 87dadc8a5592..174a9921141a 100644
--- a/src/test/datascience/export/exportManagerFileOpener.unit.test.ts
+++ b/src/test/datascience/export/exportManagerFileOpener.unit.test.ts
@@ -48,20 +48,20 @@ suite('Data Science - Export File Opener', () => {
test('No file is opened if nothing is exported', async () => {
when(exporter.export(anything(), anything())).thenResolve();
- await fileOpener.export(ExportFormat.python, model);
+ await fileOpener.export(ExportFormat.python, model, undefined);
verify(documentManager.showTextDocument(anything())).never();
});
test('Python File is opened if exported', async () => {
const uri = Uri.file('test.python');
- when(exporter.export(anything(), anything())).thenResolve(uri);
- await fileOpener.export(ExportFormat.python, model);
+ when(exporter.export(anything(), anything(), anything())).thenResolve(uri);
+ await fileOpener.export(ExportFormat.python, model, undefined);
verify(documentManager.showTextDocument(anything())).once();
});
test('HTML File opened if yes button pressed', async () => {
const uri = Uri.file('test.html');
- when(exporter.export(anything(), anything())).thenResolve(uri);
+ when(exporter.export(anything(), anything(), anything())).thenResolve(uri);
when(applicationShell.showInformationMessage(anything(), anything(), anything())).thenReturn(
Promise.resolve(getLocString('DataScience.openExportFileYes', 'Yes'))
);
@@ -82,14 +82,14 @@ suite('Data Science - Export File Opener', () => {
verify(browserService.launch(anything())).never();
});
test('Exporting to PDF displays message if operation fails', async () => {
- when(exporter.export(anything(), anything())).thenThrow(new Error('Export failed...'));
+ when(exporter.export(anything(), anything(), anything())).thenThrow(new Error('Export failed...'));
when(applicationShell.showErrorMessage(anything())).thenResolve();
await fileOpener.export(ExportFormat.pdf, model);
verify(applicationShell.showErrorMessage(anything())).once();
});
test('PDF File opened if yes button pressed', async () => {
const uri = Uri.file('test.pdf');
- when(exporter.export(anything(), anything())).thenResolve(uri);
+ when(exporter.export(anything(), anything(), anything())).thenResolve(uri);
when(applicationShell.showInformationMessage(anything(), anything(), anything())).thenReturn(
Promise.resolve(getLocString('DataScience.openExportFileYes', 'Yes'))
);
diff --git a/src/test/datascience/export/exportToHTML.test.ts b/src/test/datascience/export/exportToHTML.test.ts
index ec1b0b225543..4412881dea0e 100644
--- a/src/test/datascience/export/exportToHTML.test.ts
+++ b/src/test/datascience/export/exportToHTML.test.ts
@@ -4,7 +4,7 @@
// tslint:disable: no-var-requires no-require-imports no-invalid-this no-any
import { assert } from 'chai';
import * as path from 'path';
-import { Uri } from 'vscode';
+import { CancellationTokenSource, Uri } from 'vscode';
import { IFileSystem } from '../../../client/common/platform/types';
import { ExportFormat, IExport } from '../../../client/datascience/export/types';
import { IExtensionTestApi } from '../../common';
@@ -34,9 +34,11 @@ suite('DataScience - Export HTML', () => {
const file = await fileSystem.createTemporaryFile('.html');
const target = Uri.file(file.filePath);
await file.dispose();
+ const token = new CancellationTokenSource();
await exportToHTML.export(
Uri.file(path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'test', 'datascience', 'export', 'test.ipynb')),
- target
+ target,
+ token.token
);
assert.equal(await fileSystem.fileExists(target.fsPath), true);
diff --git a/src/test/datascience/export/exportToPython.test.ts b/src/test/datascience/export/exportToPython.test.ts
index 0bcf74ab912e..d7d130f141e5 100644
--- a/src/test/datascience/export/exportToPython.test.ts
+++ b/src/test/datascience/export/exportToPython.test.ts
@@ -4,7 +4,7 @@
// tslint:disable: no-var-requires no-require-imports no-invalid-this no-any
import { assert } from 'chai';
import * as path from 'path';
-import { Uri } from 'vscode';
+import { CancellationTokenSource, Uri } from 'vscode';
import { IDocumentManager } from '../../../client/common/application/types';
import { IFileSystem } from '../../../client/common/platform/types';
import { ExportFormat, IExport } from '../../../client/datascience/export/types';
@@ -33,9 +33,11 @@ suite('DataScience - Export Python', () => {
const fileSystem = api.serviceContainer.get(IFileSystem);
const exportToPython = api.serviceContainer.get(IExport, ExportFormat.python);
const target = Uri.file((await fileSystem.createTemporaryFile('.py')).filePath);
+ const token = new CancellationTokenSource();
await exportToPython.export(
Uri.file(path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'test', 'datascience', 'export', 'test.ipynb')),
- target
+ target,
+ token.token
);
const documentManager = api.serviceContainer.get(IDocumentManager);
diff --git a/src/test/datascience/export/exportUtil.test.ts b/src/test/datascience/export/exportUtil.test.ts
index 340828976e7e..a287b67ac84e 100644
--- a/src/test/datascience/export/exportUtil.test.ts
+++ b/src/test/datascience/export/exportUtil.test.ts
@@ -37,7 +37,7 @@ suite('DataScience - Export Util', () => {
);
await exportUtil.removeSvgs(file);
- const model = await notebookStorage.load(file);
+ const model = await notebookStorage.get(file);
// make sure no svg exists in model
const SVG = 'image/svg+xml';
diff --git a/src/test/datascience/interactive-common/trustCommandHandler.unit.test.ts b/src/test/datascience/interactive-common/trustCommandHandler.unit.test.ts
new file mode 100644
index 000000000000..3bb98ca5c813
--- /dev/null
+++ b/src/test/datascience/interactive-common/trustCommandHandler.unit.test.ts
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+'use strict';
+
+import * as fakeTimers from '@sinonjs/fake-timers';
+import { assert } from 'chai';
+import * as sinon from 'sinon';
+import { anything, instance, mock, verify, when } from 'ts-mockito';
+import { Uri } from 'vscode';
+import { IExtensionSingleActivationService } from '../../../client/activation/types';
+import { IApplicationShell, ICommandManager } from '../../../client/common/application/types';
+import { ContextKey } from '../../../client/common/contextKey';
+import { EnableTrustedNotebooks } from '../../../client/common/experiments/groups';
+import { IDisposable, IExperimentService } from '../../../client/common/types';
+import { DataScience } from '../../../client/common/utils/localize';
+import { Commands } from '../../../client/datascience/constants';
+import { INotebookStorageProvider } from '../../../client/datascience/interactive-ipynb/notebookStorageProvider';
+import { TrustCommandHandler } from '../../../client/datascience/interactive-ipynb/trustCommandHandler';
+import { TrustService } from '../../../client/datascience/interactive-ipynb/trustService';
+import { INotebookEditorProvider, INotebookModel, ITrustService } from '../../../client/datascience/types';
+import { noop } from '../../core';
+import { createNotebookModel, disposeAllDisposables } from '../notebook/helper';
+
+// tslint:disable: no-any
+
+suite('DataScience - Trust Command Handler', () => {
+ let trustCommandHandler: IExtensionSingleActivationService;
+ let trustService: ITrustService;
+ let editorProvider: INotebookEditorProvider;
+ let storageProvider: INotebookStorageProvider;
+ let commandManager: ICommandManager;
+ let applicationShell: IApplicationShell;
+ let disposables: IDisposable[] = [];
+ let clock: fakeTimers.InstalledClock;
+ let contextKeySet: sinon.SinonStub<[boolean], Promise>;
+ let experiments: IExperimentService;
+ let model: INotebookModel;
+ let trustNotebookCommandCallback: (uri: Uri) => Promise;
+ setup(() => {
+ trustService = mock();
+ editorProvider = mock();
+ storageProvider = mock();
+ commandManager = mock();
+ applicationShell = mock();
+ model = createNotebookModel(false, Uri.file('a'));
+ when(storageProvider.get(anything())).thenResolve(model);
+ disposables = [];
+
+ experiments = mock();
+
+ when(trustService.trustNotebook(anything(), anything())).thenResolve();
+ when(experiments.inExperiment(anything())).thenCall((exp) =>
+ Promise.resolve(exp === EnableTrustedNotebooks.experiment)
+ );
+ when(commandManager.registerCommand(anything(), anything(), anything())).thenCall(() => ({ dispose: noop }));
+ when(commandManager.registerCommand(Commands.TrustNotebook, anything(), anything())).thenCall((_, cb) => {
+ trustNotebookCommandCallback = cb.bind(trustCommandHandler);
+ return { dispose: noop };
+ });
+
+ trustCommandHandler = new TrustCommandHandler(
+ instance(trustService),
+ instance(editorProvider),
+ instance(storageProvider),
+ instance(commandManager),
+ instance(applicationShell),
+ disposables,
+ instance(experiments)
+ );
+
+ clock = fakeTimers.install();
+
+ contextKeySet = sinon.stub(ContextKey.prototype, 'set');
+ contextKeySet.resolves();
+ });
+ teardown(() => {
+ sinon.restore();
+ disposeAllDisposables(disposables);
+ clock.uninstall();
+ });
+
+ test('Context not set if not in experiment', async () => {
+ when(experiments.inExperiment(anything())).thenResolve(false);
+
+ await trustCommandHandler.activate();
+ await clock.runAllAsync();
+
+ assert.equal(contextKeySet.callCount, 0);
+ });
+ test('Context set if in experiment', async () => {
+ when(experiments.inExperiment(anything())).thenCall((exp) =>
+ Promise.resolve(exp === EnableTrustedNotebooks.experiment)
+ );
+
+ await trustCommandHandler.activate();
+ await clock.runAllAsync();
+
+ assert.equal(contextKeySet.callCount, 1);
+ });
+ test('Executing command will not update trust after dismissing the prompt', async () => {
+ when(applicationShell.showErrorMessage(anything(), anything(), anything(), anything())).thenResolve(
+ undefined as any
+ );
+
+ await trustCommandHandler.activate();
+ await clock.runAllAsync();
+ await trustNotebookCommandCallback(Uri.file('a'));
+
+ verify(applicationShell.showErrorMessage(anything(), anything(), anything(), anything())).once();
+ verify(trustService.trustNotebook(anything(), anything())).never();
+ assert.isFalse(model.isTrusted);
+ });
+ test('Executing command will update trust', async () => {
+ when(applicationShell.showErrorMessage(anything(), anything(), anything(), anything())).thenResolve(
+ DataScience.trustNotebook() as any
+ );
+
+ assert.isFalse(model.isTrusted);
+ await trustCommandHandler.activate();
+ await clock.runAllAsync();
+ await trustNotebookCommandCallback(Uri.file('a'));
+
+ verify(applicationShell.showErrorMessage(anything(), anything(), anything(), anything())).once();
+ verify(trustService.trustNotebook(anything(), anything())).once();
+ assert.isTrue(model.isTrusted);
+ });
+});
diff --git a/src/test/datascience/trustService.unit.test.ts b/src/test/datascience/interactive-common/trustService.unit.test.ts
similarity index 84%
rename from src/test/datascience/trustService.unit.test.ts
rename to src/test/datascience/interactive-common/trustService.unit.test.ts
index 2ff31348abf6..beb3c7c88fad 100644
--- a/src/test/datascience/trustService.unit.test.ts
+++ b/src/test/datascience/interactive-common/trustService.unit.test.ts
@@ -8,12 +8,12 @@ import * as os from 'os';
import { anything, instance, mock, when } from 'ts-mockito';
import * as typemoq from 'typemoq';
import { Uri } from 'vscode';
-import { ConfigurationService } from '../../client/common/configuration/service';
-import { ExperimentService } from '../../client/common/experiments/service';
-import { FileSystem } from '../../client/common/platform/fileSystem';
-import { IExtensionContext } from '../../client/common/types';
-import { DigestStorage } from '../../client/datascience/interactive-ipynb/digestStorage';
-import { TrustService } from '../../client/datascience/interactive-ipynb/trustService';
+import { ConfigurationService } from '../../../client/common/configuration/service';
+import { ExperimentService } from '../../../client/common/experiments/service';
+import { FileSystem } from '../../../client/common/platform/fileSystem';
+import { IExtensionContext } from '../../../client/common/types';
+import { DigestStorage } from '../../../client/datascience/interactive-ipynb/digestStorage';
+import { TrustService } from '../../../client/datascience/interactive-ipynb/trustService';
suite('DataScience - TrustService', () => {
let trustService: TrustService;
diff --git a/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts b/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts
index 98b7a9fae312..3db2eecd0ee4 100644
--- a/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts
+++ b/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts
@@ -409,7 +409,7 @@ suite('DataScience - Native Editor Storage', () => {
}
test('Create new editor and add some cells', async () => {
- model = await storage.load(baseUri);
+ model = await storage.get(baseUri);
insertCell(0, '1');
const cells = model.cells;
expect(cells).to.be.lengthOf(4);
@@ -418,7 +418,7 @@ suite('DataScience - Native Editor Storage', () => {
});
test('Move cells around', async () => {
- model = await storage.load(baseUri);
+ model = await storage.get(baseUri);
swapCells('NotebookImport#0', 'NotebookImport#1');
const cells = model.cells;
expect(cells).to.be.lengthOf(3);
@@ -427,7 +427,7 @@ suite('DataScience - Native Editor Storage', () => {
});
test('Edit/delete cells', async () => {
- model = await storage.load(baseUri);
+ model = await storage.get(baseUri);
expect(model.isDirty).to.be.equal(false, 'Editor should not be dirty');
editCell(
[
@@ -467,7 +467,7 @@ suite('DataScience - Native Editor Storage', () => {
test('Editing a file and closing will keep contents', async () => {
await filesConfig?.update('autoSave', 'off');
- model = await storage.load(baseUri);
+ model = await storage.get(baseUri);
expect(model.isDirty).to.be.equal(false, 'Editor should not be dirty');
editCell(
[
@@ -496,7 +496,7 @@ suite('DataScience - Native Editor Storage', () => {
// Recreate
storage = createStorage();
- model = await storage.load(baseUri);
+ model = await storage.get(baseUri);
const cells = model.cells;
expect(cells).to.be.lengthOf(3);
@@ -506,7 +506,7 @@ suite('DataScience - Native Editor Storage', () => {
});
test('Editing a new file and closing will keep contents', async () => {
- model = await storage.load(untiledUri, undefined, true);
+ model = await storage.get(untiledUri, undefined, true);
expect(model.isDirty).to.be.equal(false, 'Editor should not be dirty');
insertCell(0, 'a=1');
@@ -515,7 +515,7 @@ suite('DataScience - Native Editor Storage', () => {
// Recreate
storage = createStorage();
- model = await storage.load(untiledUri);
+ model = await storage.get(untiledUri);
const cells = model.cells;
expect(cells).to.be.lengthOf(2);
@@ -534,7 +534,7 @@ suite('DataScience - Native Editor Storage', () => {
// Put the regular file into the local storage
await localMemento.update(`notebook-storage-${file.toString()}`, differentFile);
- model = await storage.load(file);
+ model = await storage.get(file);
// It should load with that value
const cells = model.cells;
@@ -555,7 +555,7 @@ suite('DataScience - Native Editor Storage', () => {
contents: differentFile,
lastModifiedTimeMs: Date.now()
});
- model = await storage.load(file);
+ model = await storage.get(file);
// It should load with that value
const cells = model.cells;
@@ -585,7 +585,7 @@ suite('DataScience - Native Editor Storage', () => {
lastModifiedTimeMs: Date.now()
});
- model = await storage.load(file);
+ model = await storage.get(file);
// It should load with that value
const cells = model.cells;
diff --git a/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts b/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts
index c03aa732d229..eaef32c25385 100644
--- a/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts
+++ b/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts
@@ -3,7 +3,7 @@
import { assert } from 'chai';
import { anything, deepEqual, instance, mock, when } from 'ts-mockito';
-import { ObservableExecutionResult } from '../../../client/common/process/types';
+import { IPythonExecutionService, ObservableExecutionResult } from '../../../client/common/process/types';
import { ReadWrite } from '../../../client/common/types';
import { KernelDaemonPool } from '../../../client/datascience/kernel-launcher/kernelDaemonPool';
import { PythonKernelLauncherDaemon } from '../../../client/datascience/kernel-launcher/kernelLauncherDaemon';
@@ -61,10 +61,23 @@ suite('Data Science - Kernel Launcher Daemon', () => {
assert.equal(daemonCreationOutput.daemon, instance(kernelDaemon));
}
});
- test('If our daemon pool return does not support start, return undefined', async () => {
- when(daemonPool.get(anything(), anything(), anything())).thenResolve({} as any);
+ test('If our daemon pool returns an execution service, then use it and return the daemon as undefined', async () => {
+ const executionService = mock();
+ when(
+ executionService.execModuleObservable(
+ 'ipkernel_launcher',
+ deepEqual(['-f', 'file.json']),
+ deepEqual({ env: kernelSpec.env })
+ )
+ ).thenReturn(instance(observableOutputForDaemon));
+ // Make sure that it doesn't have a start function. Normally the proxy will pretend to have a start function, which we are checking for non-existance
+ when((executionService as any).start).thenReturn(false);
+ // Else ts-mockit doesn't allow us to return an instance of a mock as a return value from an async function.
+ (instance(executionService) as any).then = undefined;
+ when(daemonPool.get(anything(), anything(), anything())).thenResolve(instance(executionService) as any);
const daemonCreationOutput = await launcher.launch(undefined, kernelSpec, interpreter);
- assert.isUndefined(daemonCreationOutput);
+ assert.equal(daemonCreationOutput.observableOutput, instance(observableOutputForDaemon));
+ assert.isUndefined(daemonCreationOutput.daemon);
});
});
diff --git a/src/test/datascience/nativeEditor.functional.test.tsx b/src/test/datascience/nativeEditor.functional.test.tsx
index 87b3e8a1116e..659602c257b4 100644
--- a/src/test/datascience/nativeEditor.functional.test.tsx
+++ b/src/test/datascience/nativeEditor.functional.test.tsx
@@ -630,7 +630,7 @@ df.head()`;
const model = editor!.model!;
ioc.serviceManager.rebindInstance(ICommandManager, commandManager.object);
commandManager
- .setup((cmd) => cmd.executeCommand(Commands.Export, model))
+ .setup((cmd) => cmd.executeCommand(Commands.Export, model, undefined))
.returns(() => {
commandFired.resolve();
return Promise.resolve();
diff --git a/src/test/datascience/notebook/contentProvider.unit.test.ts b/src/test/datascience/notebook/contentProvider.unit.test.ts
index b7c27604c456..b85a4715ebcf 100644
--- a/src/test/datascience/notebook/contentProvider.unit.test.ts
+++ b/src/test/datascience/notebook/contentProvider.unit.test.ts
@@ -33,157 +33,173 @@ suite('Data Science - NativeNotebook ContentProvider', () => {
instance(compatSupport)
);
});
+ [true, false].forEach((isNotebookTrusted) => {
+ suite(isNotebookTrusted ? 'Trusted Notebook' : 'Un-trusted notebook', () => {
+ test('Return notebook with 2 cells', async () => {
+ const model: Partial = {
+ cells: [
+ {
+ data: {
+ cell_type: 'code',
+ execution_count: 10,
+ hasExecutionOrder: true,
+ outputs: [],
+ source: 'print(1)',
+ metadata: {}
+ },
+ file: 'a.ipynb',
+ id: 'MyCellId1',
+ line: 0,
+ state: CellState.init
+ },
+ {
+ data: {
+ cell_type: 'markdown',
+ hasExecutionOrder: false,
+ source: '# HEAD',
+ metadata: {}
+ },
+ file: 'a.ipynb',
+ id: 'MyCellId2',
+ line: 0,
+ state: CellState.init
+ }
+ ],
+ isTrusted: isNotebookTrusted
+ };
+ when(storageProvider.get(anything(), anything(), anything(), anything())).thenResolve(
+ (model as unknown) as INotebookModel
+ );
- test('Return notebook with 2 cells', async () => {
- const model: Partial = {
- cells: [
- {
- data: {
- cell_type: 'code',
- execution_count: 10,
- hasExecutionOrder: true,
+ const notebook = await contentProvider.openNotebook(fileUri, {});
+
+ assert.isOk(notebook);
+ assert.deepEqual(notebook.languages, [PYTHON_LANGUAGE]);
+ // ignore metadata we add.
+ notebook.cells.forEach((cell) => delete cell.metadata.custom);
+
+ assert.equal(notebook.metadata.cellEditable, isNotebookTrusted);
+ assert.equal(notebook.metadata.cellRunnable, isNotebookTrusted);
+ assert.equal(notebook.metadata.editable, isNotebookTrusted);
+ assert.equal(notebook.metadata.runnable, isNotebookTrusted);
+
+ assert.deepEqual(notebook.cells, [
+ {
+ cellKind: (vscodeNotebookEnums as any).CellKind.Code,
+ language: PYTHON_LANGUAGE,
outputs: [],
source: 'print(1)',
- metadata: {}
+ metadata: {
+ editable: isNotebookTrusted,
+ executionOrder: 10,
+ hasExecutionOrder: true,
+ runState: (vscodeNotebookEnums as any).NotebookCellRunState.Success,
+ runnable: isNotebookTrusted
+ }
},
- file: 'a.ipynb',
- id: 'MyCellId1',
- line: 0,
- state: CellState.init
- },
- {
- data: {
- cell_type: 'markdown',
- hasExecutionOrder: false,
+ {
+ cellKind: (vscodeNotebookEnums as any).CellKind.Markdown,
+ language: MARKDOWN_LANGUAGE,
+ outputs: [],
source: '# HEAD',
- metadata: {}
+ metadata: {
+ editable: isNotebookTrusted,
+ executionOrder: undefined,
+ hasExecutionOrder: false,
+ runState: (vscodeNotebookEnums as any).NotebookCellRunState.Idle,
+ runnable: false
+ }
+ }
+ ]);
+ });
+
+ test('Return notebook with csharp language', async () => {
+ const model: Partial = {
+ metadata: {
+ language_info: {
+ name: 'csharp'
+ },
+ orig_nbformat: 5
},
- file: 'a.ipynb',
- id: 'MyCellId2',
- line: 0,
- state: CellState.init
- }
- ]
- };
- when(storageProvider.load(anything(), anything(), anything(), anything())).thenResolve(
- (model as unknown) as INotebookModel
- );
+ cells: [
+ {
+ data: {
+ cell_type: 'code',
+ execution_count: 10,
+ hasExecutionOrder: true,
+ outputs: [],
+ source: 'Console.WriteLine("1")',
+ metadata: {}
+ },
+ file: 'a.ipynb',
+ id: 'MyCellId1',
+ line: 0,
+ state: CellState.init
+ },
+ {
+ data: {
+ cell_type: 'markdown',
+ hasExecutionOrder: false,
+ source: '# HEAD',
+ metadata: {}
+ },
+ file: 'a.ipynb',
+ id: 'MyCellId2',
+ line: 0,
+ state: CellState.init
+ }
+ ],
+ isTrusted: isNotebookTrusted
+ };
+ when(storageProvider.get(anything(), anything(), anything(), anything())).thenResolve(
+ (model as unknown) as INotebookModel
+ );
- const notebook = await contentProvider.openNotebook(fileUri, {});
+ const notebook = await contentProvider.openNotebook(fileUri, {});
- assert.isOk(notebook);
- assert.deepEqual(notebook.languages, [PYTHON_LANGUAGE]);
- // ignore metadata we add.
- notebook.cells.forEach((cell) => delete cell.metadata.custom);
+ assert.isOk(notebook);
+ assert.deepEqual(notebook.languages, ['csharp']);
- assert.deepEqual(notebook.cells, [
- {
- cellKind: (vscodeNotebookEnums as any).CellKind.Code,
- language: PYTHON_LANGUAGE,
- outputs: [],
- source: 'print(1)',
- metadata: {
- editable: true,
- executionOrder: 10,
- hasExecutionOrder: true,
- runState: (vscodeNotebookEnums as any).NotebookCellRunState.Success,
- runnable: true
- }
- },
- {
- cellKind: (vscodeNotebookEnums as any).CellKind.Markdown,
- language: MARKDOWN_LANGUAGE,
- outputs: [],
- source: '# HEAD',
- metadata: {
- editable: true,
- executionOrder: undefined,
- hasExecutionOrder: false,
- runState: (vscodeNotebookEnums as any).NotebookCellRunState.Idle,
- runnable: false
- }
- }
- ]);
- });
+ assert.equal(notebook.metadata.cellEditable, isNotebookTrusted);
+ assert.equal(notebook.metadata.cellRunnable, isNotebookTrusted);
+ assert.equal(notebook.metadata.editable, isNotebookTrusted);
+ assert.equal(notebook.metadata.runnable, isNotebookTrusted);
+
+ // ignore metadata we add.
+ notebook.cells.forEach((cell: NotebookCellData) => delete cell.metadata.custom);
- test('Return notebook with csharp language', async () => {
- const model: Partial = {
- metadata: {
- language_info: {
- name: 'csharp'
- },
- orig_nbformat: 5
- },
- cells: [
- {
- data: {
- cell_type: 'code',
- execution_count: 10,
- hasExecutionOrder: true,
+ assert.deepEqual(notebook.cells, [
+ {
+ cellKind: (vscodeNotebookEnums as any).CellKind.Code,
+ language: 'csharp',
outputs: [],
source: 'Console.WriteLine("1")',
- metadata: {}
+ metadata: {
+ editable: isNotebookTrusted,
+ executionOrder: 10,
+ hasExecutionOrder: true,
+ runState: (vscodeNotebookEnums as any).NotebookCellRunState.Success,
+ runnable: isNotebookTrusted
+ }
},
- file: 'a.ipynb',
- id: 'MyCellId1',
- line: 0,
- state: CellState.init
- },
- {
- data: {
- cell_type: 'markdown',
- hasExecutionOrder: false,
+ {
+ cellKind: (vscodeNotebookEnums as any).CellKind.Markdown,
+ language: MARKDOWN_LANGUAGE,
+ outputs: [],
source: '# HEAD',
- metadata: {}
- },
- file: 'a.ipynb',
- id: 'MyCellId2',
- line: 0,
- state: CellState.init
- }
- ]
- };
- when(storageProvider.load(anything(), anything(), anything(), anything())).thenResolve(
- (model as unknown) as INotebookModel
- );
-
- const notebook = await contentProvider.openNotebook(fileUri, {});
-
- assert.isOk(notebook);
- assert.deepEqual(notebook.languages, ['csharp']);
- // ignore metadata we add.
- notebook.cells.forEach((cell: NotebookCellData) => delete cell.metadata.custom);
-
- assert.deepEqual(notebook.cells, [
- {
- cellKind: (vscodeNotebookEnums as any).CellKind.Code,
- language: 'csharp',
- outputs: [],
- source: 'Console.WriteLine("1")',
- metadata: {
- editable: true,
- executionOrder: 10,
- hasExecutionOrder: true,
- runState: (vscodeNotebookEnums as any).NotebookCellRunState.Success,
- runnable: true
- }
- },
- {
- cellKind: (vscodeNotebookEnums as any).CellKind.Markdown,
- language: MARKDOWN_LANGUAGE,
- outputs: [],
- source: '# HEAD',
- metadata: {
- editable: true,
- executionOrder: undefined,
- hasExecutionOrder: false,
- runState: (vscodeNotebookEnums as any).NotebookCellRunState.Idle,
- runnable: false
- }
- }
- ]);
- });
- test('Verify mime types and order', () => {
- // https://github.com/microsoft/vscode-python/issues/11880
+ metadata: {
+ editable: isNotebookTrusted,
+ executionOrder: undefined,
+ hasExecutionOrder: false,
+ runState: (vscodeNotebookEnums as any).NotebookCellRunState.Idle,
+ runnable: false
+ }
+ }
+ ]);
+ });
+ test('Verify mime types and order', () => {
+ // https://github.com/microsoft/vscode-python/issues/11880
+ });
+ });
});
});
diff --git a/src/test/datascience/notebook/helper.ts b/src/test/datascience/notebook/helper.ts
index 8f1d66148b59..cb77fdb87749 100644
--- a/src/test/datascience/notebook/helper.ts
+++ b/src/test/datascience/notebook/helper.ts
@@ -9,16 +9,30 @@ import * as fs from 'fs-extra';
import * as path from 'path';
import * as sinon from 'sinon';
import * as tmp from 'tmp';
-import { commands, Uri } from 'vscode';
-import { NotebookCell } from '../../../../types/vscode-proposed';
+import { instance, mock } from 'ts-mockito';
+import { commands, TextDocument, Uri } from 'vscode';
+import { NotebookCell, NotebookDocument } from '../../../../types/vscode-proposed';
import { CellDisplayOutput } from '../../../../typings/vscode-proposed';
import { IApplicationEnvironment, IVSCodeNotebook } from '../../../client/common/application/types';
import { MARKDOWN_LANGUAGE, PYTHON_LANGUAGE } from '../../../client/common/constants';
import { IDisposable } from '../../../client/common/types';
import { noop, swallowExceptions } from '../../../client/common/utils/misc';
-import { findMappedNotebookCellModel } from '../../../client/datascience/notebook/helpers/cellMappers';
+import { Identifiers } from '../../../client/datascience/constants';
+import { JupyterNotebookView } from '../../../client/datascience/notebook/constants';
+import {
+ findMappedNotebookCellModel,
+ mapVSCNotebookCellsToNotebookCellModels
+} from '../../../client/datascience/notebook/helpers/cellMappers';
+import { createVSCNotebookCellDataFromCell } from '../../../client/datascience/notebook/helpers/helpers';
import { INotebookContentProvider } from '../../../client/datascience/notebook/types';
-import { ICell, INotebookEditorProvider, INotebookModel, INotebookProvider } from '../../../client/datascience/types';
+import { VSCodeNotebookModel } from '../../../client/datascience/notebookStorage/vscNotebookModel';
+import {
+ CellState,
+ ICell,
+ INotebookEditorProvider,
+ INotebookModel,
+ INotebookProvider
+} from '../../../client/datascience/types';
import { createEventHandler, waitForCondition } from '../../common';
import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../constants';
import { closeActiveWindows, initialize } from '../../initialize';
@@ -365,3 +379,61 @@ export async function saveActiveNotebook(disposables: IDisposable[]) {
await waitForCondition(async () => savedEvent.all.some((e) => e.kind === 'save'), 5_000, 'Not saved');
}
+
+export function createNotebookModel(trusted: boolean, uri: Uri, nb?: Partial) {
+ const nbJson: nbformat.INotebookContent = {
+ cells: [],
+ metadata: {
+ orig_nbformat: 4
+ },
+ nbformat: 4,
+ nbformat_minor: 4,
+ ...(nb || {})
+ };
+
+ const cells = nbJson.cells.map((c, index) => {
+ return {
+ id: `NotebookImport#${index}`,
+ file: Identifiers.EmptyFileName,
+ line: 0,
+ state: CellState.finished,
+ data: c
+ };
+ });
+ return new VSCodeNotebookModel(trusted, uri, JSON.parse(JSON.stringify(cells)));
+}
+
+export function createNotebookDocument(
+ model: INotebookModel,
+ viewType: string = JupyterNotebookView
+): NotebookDocument {
+ const doc: NotebookDocument = {
+ cells: [],
+ fileName: model.file.fsPath,
+ isDirty: false,
+ languages: [],
+ uri: model.file,
+ viewType,
+ metadata: {
+ cellEditable: model.isTrusted,
+ cellHasExecutionOrder: true,
+ cellRunnable: model.isTrusted,
+ editable: model.isTrusted,
+ runnable: model.isTrusted
+ }
+ };
+ model.cells.forEach((cell, index) => {
+ const vscCell = createVSCNotebookCellDataFromCell(model, cell)!;
+ const vscDocumentCell: NotebookCell = {
+ ...vscCell,
+ uri: model.file.with({ fragment: `cell${index}` }),
+ notebook: doc,
+ document: instance(mock())
+ };
+ doc.cells.push(vscDocumentCell);
+ });
+ if (viewType === JupyterNotebookView) {
+ mapVSCNotebookCellsToNotebookCellModels(doc, model);
+ }
+ return doc;
+}
diff --git a/src/test/datascience/notebook/helpers.unit.test.ts b/src/test/datascience/notebook/helpers.unit.test.ts
index 63174224c3b3..bb48bc6c30c2 100644
--- a/src/test/datascience/notebook/helpers.unit.test.ts
+++ b/src/test/datascience/notebook/helpers.unit.test.ts
@@ -40,7 +40,8 @@ suite('Data Science - NativeNotebook helpers', () => {
line: 0,
state: CellState.init
}
- ]
+ ],
+ isTrusted: true
};
const notebook = notebookModelToVSCNotebookData((model as unknown) as INotebookModel);
@@ -95,7 +96,8 @@ suite('Data Science - NativeNotebook helpers', () => {
line: 0,
state: CellState.init
}
- ]
+ ],
+ isTrusted: true
};
const notebook = notebookModelToVSCNotebookData((model as unknown) as INotebookModel);
diff --git a/src/test/datascience/notebook/notebookTrustHandler.unit.test.ts b/src/test/datascience/notebook/notebookTrustHandler.unit.test.ts
new file mode 100644
index 000000000000..7d3f6e821b4e
--- /dev/null
+++ b/src/test/datascience/notebook/notebookTrustHandler.unit.test.ts
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+'use strict';
+
+import { nbformat } from '@jupyterlab/coreutils';
+import { assert } from 'chai';
+import { teardown } from 'mocha';
+import { anything, instance, mock, when } from 'ts-mockito';
+import { EventEmitter, Uri } from 'vscode';
+import { NotebookDocument } from '../../../../types/vscode-proposed';
+import { IExtensionSingleActivationService } from '../../../client/activation/types';
+import { IVSCodeNotebook } from '../../../client/common/application/types';
+import { IFileSystem } from '../../../client/common/platform/types';
+import { IDisposable } from '../../../client/common/types';
+import { NotebookTrustHandler } from '../../../client/datascience/notebook/notebookTrustHandler';
+import { INotebookEditor, INotebookEditorProvider, ITrustService } from '../../../client/datascience/types';
+import { createNotebookDocument, createNotebookModel, disposeAllDisposables } from './helper';
+// tslint:disable-next-line: no-var-requires no-require-imports
+const vscodeNotebookEnums = require('vscode') as typeof import('vscode-proposed');
+
+// tslint:disable: no-any
+suite('Data Science - NativeNotebook TrustHandler', () => {
+ let trustHandler: IExtensionSingleActivationService;
+ let trustService: ITrustService;
+ let vscNotebook: IVSCodeNotebook;
+ let editorProvider: INotebookEditorProvider;
+ let fs: IFileSystem;
+ let disposables: IDisposable[];
+ let onDidTrustNotebook: EventEmitter;
+ setup(async () => {
+ disposables = [];
+ trustService = mock();
+ vscNotebook = mock();
+ editorProvider = mock();
+ fs = mock();
+ onDidTrustNotebook = new EventEmitter();
+ when(trustService.onDidSetNotebookTrust).thenReturn(onDidTrustNotebook.event);
+ when(fs.arePathsSame(anything(), anything())).thenCall((a, b) => a === b); // Dirty simple file compare.
+ trustHandler = new NotebookTrustHandler(
+ instance(trustService),
+ instance(vscNotebook),
+ instance(editorProvider),
+ instance(fs),
+ disposables
+ );
+
+ await trustHandler.activate();
+ });
+ teardown(() => disposeAllDisposables(disposables));
+ function assertDocumentTrust(document: NotebookDocument, trusted: boolean) {
+ assert.equal(document.metadata.cellEditable, trusted);
+ assert.equal(document.metadata.cellRunnable, trusted);
+ assert.equal(document.metadata.editable, trusted);
+ assert.equal(document.metadata.runnable, trusted);
+
+ document.cells.forEach((cell) => {
+ assert.equal(cell.metadata.editable, trusted);
+ if (cell.cellKind === vscodeNotebookEnums.CellKind.Code) {
+ assert.equal(cell.metadata.runnable, trusted);
+ // In our test all code cells have outputs.
+ if (trusted) {
+ assert.ok(cell.outputs.length, 'No output in trusted cell');
+ } else {
+ assert.lengthOf(cell.outputs, 0, 'Cannot have output in non-trusted notebook');
+ }
+ }
+ });
+ }
+ function createModels() {
+ const nbJson: Partial = {
+ cells: [
+ {
+ cell_type: 'markdown',
+ source: [],
+ metadata: {}
+ },
+ {
+ cell_type: 'code',
+ source: [],
+ metadata: {},
+ execution_count: 1,
+ outputs: [
+ {
+ output_type: 'stream',
+ name: 'stdout',
+ text: 'Hello World'
+ }
+ ]
+ }
+ ]
+ };
+
+ return [createNotebookModel(false, Uri.file('a'), nbJson), createNotebookModel(false, Uri.file('b'), nbJson)];
+ }
+ test('When a notebook is trusted, the Notebook document is updated accordingly', async () => {
+ const [model1, model2] = createModels();
+ const [nb1, nb2, nbAnotherExtension] = [
+ createNotebookDocument(model1),
+ createNotebookDocument(model2),
+ createNotebookDocument(model2, 'AnotherExtensionNotebookEditorForIpynbFile')
+ ];
+
+ // Initially un-trusted.
+ assertDocumentTrust(nb1, false);
+ assertDocumentTrust(nb2, false);
+ assertDocumentTrust(nbAnotherExtension, false);
+
+ when(vscNotebook.notebookDocuments).thenReturn([nb1, nb2]);
+ const editor1 = mock();
+ const editor2 = mock();
+ when(editor1.file).thenReturn(model1.file);
+ when(editor2.file).thenReturn(model2.file);
+ when(editor1.model).thenReturn(model1);
+ when(editor2.model).thenReturn(model2);
+ when(editorProvider.editors).thenReturn([instance(editor1), instance(editor2)]);
+
+ // Trigger a change, even though none of the models are still trusted.
+ onDidTrustNotebook.fire();
+
+ // Still un-trusted.
+ assertDocumentTrust(nb1, false);
+ assertDocumentTrust(nb2, false);
+ assertDocumentTrust(nbAnotherExtension, false);
+
+ // Trigger a change, after trusting second nb/model.
+ model2.update({
+ source: 'user',
+ kind: 'updateTrust',
+ oldDirty: model2.isDirty,
+ newDirty: model2.isDirty,
+ isNotebookTrusted: true
+ });
+
+ onDidTrustNotebook.fire();
+
+ // Nb1 is still un-trusted and nb1 is trusted.
+ assertDocumentTrust(nb1, false);
+ assertDocumentTrust(nb2, true);
+ assertDocumentTrust(nbAnotherExtension, false); // This is a document from a different content provider, we should modify this.
+ });
+});
diff --git a/src/test/datascience/notebook/survey.unit.test.ts b/src/test/datascience/notebook/survey.unit.test.ts
index 5a7889548286..634882127978 100644
--- a/src/test/datascience/notebook/survey.unit.test.ts
+++ b/src/test/datascience/notebook/survey.unit.test.ts
@@ -57,6 +57,7 @@ suite('Data Science - NativeNotebook Survey', () => {
shell = mock();
browser = mock();
clock = fakeTimers.install();
+ clock.setSystemTime(new Date(2020, 7, 1)); // Survey will work only after 1st August.
});
async function loadAndActivateExtension() {
const surveyBanner = new NotebookSurveyBanner(instance(shell), instance(stateFactory), instance(browser));
diff --git a/src/test/providers/terminal.unit.test.ts b/src/test/providers/terminal.unit.test.ts
index 3e852b63dc2d..aa1fc837cfd1 100644
--- a/src/test/providers/terminal.unit.test.ts
+++ b/src/test/providers/terminal.unit.test.ts
@@ -122,6 +122,11 @@ suite('Terminal Provider', () => {
.returns(() => activeResourceService.object);
terminal = TypeMoq.Mock.ofType();
+ terminal
+ .setup((c) => c.creationOptions)
+ .returns(() => {
+ return { hideFromUser: false };
+ });
});
test('If terminal.activateCurrentTerminal setting is set, provided terminal should be activated', async () => {
@@ -168,6 +173,34 @@ suite('Terminal Provider', () => {
configService.verifyAll();
});
+ test('If terminal.activateCurrentTerminal setting is set, but hideFromUser is true, provided terminal should not be activated', async () => {
+ terminalSettings.setup((t) => t.activateEnvInCurrentTerminal).returns(() => true);
+ configService
+ .setup((c) => c.getSettings(resource))
+ .returns(() => pythonSettings.object)
+ .verifiable(TypeMoq.Times.once());
+ activeResourceService
+ .setup((a) => a.getActiveResource())
+ .returns(() => resource)
+ .verifiable(TypeMoq.Times.once());
+
+ terminal
+ .setup((c) => c.creationOptions)
+ .returns(() => {
+ return { hideFromUser: true };
+ });
+
+ terminalProvider = new TerminalProvider(serviceContainer.object);
+ await terminalProvider.initialize(terminal.object);
+
+ terminalActivator.verify(
+ (a) => a.activateEnvironmentInTerminal(TypeMoq.It.isAny(), TypeMoq.It.isAny()),
+ TypeMoq.Times.never()
+ );
+ activeResourceService.verifyAll();
+ configService.verifyAll();
+ });
+
test('terminal.activateCurrentTerminal setting is set but provided terminal is undefined', async () => {
terminalSettings.setup((t) => t.activateEnvInCurrentTerminal).returns(() => true);
configService
diff --git a/src/test/testing/banners/proposeNewLanguageServerBanner.unit.test.ts b/src/test/testing/banners/proposeNewLanguageServerBanner.unit.test.ts
index 42e34a2106a0..db4911814901 100644
--- a/src/test/testing/banners/proposeNewLanguageServerBanner.unit.test.ts
+++ b/src/test/testing/banners/proposeNewLanguageServerBanner.unit.test.ts
@@ -3,103 +3,202 @@
'use strict';
-// tslint:disable:no-any max-func-body-length
+import { expect } from 'chai';
+import * as typemoq from 'typemoq';
+import { Extension } from 'vscode';
+import { LanguageServerType } from '../../../client/activation/types';
+import { IApplicationEnvironment, IApplicationShell } from '../../../client/common/application/types';
+import { PYLANCE_EXTENSION_ID } from '../../../client/common/constants';
+import { TryPylance } from '../../../client/common/experiments/groups';
+import {
+ IConfigurationService,
+ IExperimentService,
+ IExtensions,
+ IPersistentState,
+ IPersistentStateFactory,
+ IPythonSettings
+} from '../../../client/common/types';
+import { LanguageService } from '../../../client/common/utils/localize';
+import {
+ getPylanceExtensionUri,
+ ProposeLSStateKeys,
+ ProposePylanceBanner
+} from '../../../client/languageServices/proposeLanguageServerBanner';
-// import { expect } from 'chai';
-// import * as typemoq from 'typemoq';
-// import { IApplicationShell } from '../../../client/common/application/types';
-// import { IConfigurationService, IPersistentState, IPersistentStateFactory } from '../../../client/common/types';
-// import {
-// ProposeLanguageServerBanner,
-// ProposeLSStateKeys
-// } from '../../../client/languageServices/proposeLanguageServerBanner';
+interface IExperimentLsCombination {
+ inExperiment: boolean;
+ lsType: LanguageServerType;
+ shouldShowBanner: boolean;
+}
+const testData: IExperimentLsCombination[] = [
+ { inExperiment: true, lsType: LanguageServerType.None, shouldShowBanner: true },
+ { inExperiment: true, lsType: LanguageServerType.Microsoft, shouldShowBanner: true },
+ { inExperiment: true, lsType: LanguageServerType.Node, shouldShowBanner: false },
+ { inExperiment: true, lsType: LanguageServerType.Jedi, shouldShowBanner: false },
+ { inExperiment: false, lsType: LanguageServerType.None, shouldShowBanner: false },
+ { inExperiment: false, lsType: LanguageServerType.Microsoft, shouldShowBanner: false },
+ { inExperiment: false, lsType: LanguageServerType.Node, shouldShowBanner: false },
+ { inExperiment: false, lsType: LanguageServerType.Jedi, shouldShowBanner: false }
+];
-// suite('Propose New Language Server Banner', () => {
-// let config: typemoq.IMock;
-// let appShell: typemoq.IMock;
-// const message =
-// 'Try out Preview of our new Python Language Server to get richer and faster IntelliSense completions, and syntax errors as you type.';
-// const yes = 'Try it now';
-// const no = 'No thanks';
-// const later = 'Remind me Later';
+suite('Propose Pylance Banner', () => {
+ let config: typemoq.IMock;
+ let appShell: typemoq.IMock;
+ let appEnv: typemoq.IMock;
+ let settings: typemoq.IMock;
-// setup(() => {
-// config = typemoq.Mock.ofType();
-// appShell = typemoq.Mock.ofType();
-// });
-// test('Is debugger enabled upon creation?', () => {
-// const enabledValue: boolean = true;
-// const testBanner: ProposeLanguageServerBanner = preparePopup(enabledValue, 100, appShell.object, config.object);
-// expect(testBanner.enabled).to.be.equal(true, 'Sampling 100/100 should always enable the banner.');
-// });
-// test('Do not show banner when it is disabled', () => {
-// appShell
-// .setup((a) =>
-// a.showInformationMessage(
-// typemoq.It.isValue(message),
-// typemoq.It.isValue(yes),
-// typemoq.It.isValue(no),
-// typemoq.It.isValue(later)
-// )
-// )
-// .verifiable(typemoq.Times.never());
-// const enabled: boolean = true;
-// const testBanner: ProposeLanguageServerBanner = preparePopup(enabled, 0, appShell.object, config.object);
-// testBanner.showBanner().ignoreErrors();
-// });
-// test('shouldShowBanner must return false when Banner is implicitly disabled by sampling', () => {
-// const enabled: boolean = true;
-// const testBanner: ProposeLanguageServerBanner = preparePopup(enabled, 0, appShell.object, config.object);
-// expect(testBanner.enabled).to.be.equal(false, 'We implicitly disabled the banner, it should never show.');
-// });
-// test('shouldShowBanner must return false when Banner is explicitly disabled', async () => {
-// const enabled: boolean = true;
-// const testBanner: ProposeLanguageServerBanner = preparePopup(enabled, 100, appShell.object, config.object);
+ const message = LanguageService.proposePylanceMessage();
+ const yes = LanguageService.tryItNow();
+ const no = LanguageService.bannerLabelNo();
+ const later = LanguageService.remindMeLater();
-// expect(await testBanner.shouldShowBanner()).to.be.equal(
-// true,
-// '100% sample size should always make the banner enabled.'
-// );
-// await testBanner.disable();
-// expect(await testBanner.shouldShowBanner()).to.be.equal(
-// false,
-// 'Explicitly disabled banner shouldShowBanner != false.'
-// );
-// });
-// });
+ setup(() => {
+ config = typemoq.Mock.ofType();
+ settings = typemoq.Mock.ofType();
+ config.setup((x) => x.getSettings(typemoq.It.isAny())).returns(() => settings.object);
+ appShell = typemoq.Mock.ofType();
+ appEnv = typemoq.Mock.ofType();
+ appEnv.setup((x) => x.uriScheme).returns(() => 'scheme');
+ });
+ testData.forEach((t) => {
+ test(`${t.inExperiment ? 'In' : 'Not in'} experiment and "python.languageServer": "${t.lsType}" should ${
+ t.shouldShowBanner ? 'show' : 'not show'
+ } banner`, async () => {
+ settings.setup((x) => x.languageServer).returns(() => t.lsType);
+ const testBanner = preparePopup(true, appShell.object, appEnv.object, config.object, t.inExperiment, false);
+ const actual = await testBanner.shouldShowBanner();
+ expect(actual).to.be.equal(t.shouldShowBanner, `shouldShowBanner() returned ${actual}`);
+ });
+ });
+ testData.forEach((t) => {
+ test(`When Pylance is installed, banner should not be shown when "python.languageServer": "${t.lsType}"`, async () => {
+ settings.setup((x) => x.languageServer).returns(() => t.lsType);
+ const testBanner = preparePopup(true, appShell.object, appEnv.object, config.object, t.inExperiment, true);
+ const actual = await testBanner.shouldShowBanner();
+ expect(actual).to.be.equal(false, `shouldShowBanner() returned ${actual}`);
+ });
+ });
+ test('Do not show banner when it is disabled', async () => {
+ appShell
+ .setup((a) =>
+ a.showInformationMessage(
+ typemoq.It.isValue(message),
+ typemoq.It.isValue(yes),
+ typemoq.It.isValue(no),
+ typemoq.It.isValue(later)
+ )
+ )
+ .verifiable(typemoq.Times.never());
+ const testBanner = preparePopup(false, appShell.object, appEnv.object, config.object, true, false);
+ await testBanner.showBanner();
+ appShell.verifyAll();
+ });
+ test('Clicking No should disable the banner', async () => {
+ appShell
+ .setup((a) =>
+ a.showInformationMessage(
+ typemoq.It.isValue(message),
+ typemoq.It.isValue(yes),
+ typemoq.It.isValue(no),
+ typemoq.It.isValue(later)
+ )
+ )
+ .returns(async () => no)
+ .verifiable(typemoq.Times.once());
+ appShell.setup((a) => a.openUrl(getPylanceExtensionUri(appEnv.object))).verifiable(typemoq.Times.never());
-// function preparePopup(
-// enabledValue: boolean,
-// sampleValue: number,
-// appShell: IApplicationShell,
-// config: IConfigurationService
-// ): ProposeLanguageServerBanner {
-// const myfactory: typemoq.IMock = typemoq.Mock.ofType();
-// const val: typemoq.IMock