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

Add more notebook extension tests (#11143)

Browse Source 
* more tests

* More tests

* More tests

* Add prompt tests
This commit is contained in:
Chris LaFreniere
2020-06-30 11:01:51 -07:00
committed by GitHub
parent a32f42d475
commit a8a7559229
18 changed files with 295 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/notebook/src/jupyter/jupyterController.ts
View File

@@ -15,7 +15,7 @@ import * as localizedConstants from '../common/localizedConstants';
import { JupyterServerInstallation } from './jupyterServerInstallation';
import { IServerInstance } from './common';
import * as utils from '../common/utils';
import { IPrompter, QuestionTypes, IQuestion } from '../prompts/question';
import { IPrompter, IQuestion, confirm } from '../prompts/question';
import { AppContext } from '../common/appContext';
import { ApiWrapper } from '../common/apiWrapper';
@@ -42,6 +42,7 @@ export class JupyterController implements vscode.Disposable {
private outputChannel: vscode.OutputChannel;
private prompter: IPrompter;
private _notebookProvider: JupyterNotebookProvider;
constructor(private appContext: AppContext) {
this.prompter = new CodeAdapter();
@@ -56,6 +57,10 @@ export class JupyterController implements vscode.Disposable {
return this.appContext && this.appContext.extensionContext;
}
public get notebookProvider(): JupyterNotebookProvider {
return this._notebookProvider;
}
public dispose(): void {
this.deactivate();
}
@@ -89,23 +94,22 @@ export class JupyterController implements vscode.Disposable {
let supportedFileFilter: vscode.DocumentFilter[] = [
{ scheme: 'untitled', language: '*' }
];
let notebookProvider = this.registerNotebookProvider();
this.extensionContext.subscriptions.push(this.apiWrapper.registerCompletionItemProvider(supportedFileFilter, new NotebookCompletionItemProvider(notebookProvider)));
this.registerNotebookProvider();
this.extensionContext.subscriptions.push(this.apiWrapper.registerCompletionItemProvider(supportedFileFilter, new NotebookCompletionItemProvider(this._notebookProvider)));
this.registerDefaultPackageManageProviders();
return true;
}
private registerNotebookProvider(): JupyterNotebookProvider {
let notebookProvider = new JupyterNotebookProvider((documentUri: vscode.Uri) => new LocalJupyterServerManager({
private registerNotebookProvider(): void {
this._notebookProvider = new JupyterNotebookProvider((documentUri: vscode.Uri) => new LocalJupyterServerManager({
documentPath: documentUri.fsPath,
jupyterInstallation: this._jupyterInstallation,
extensionContext: this.extensionContext,
apiWrapper: this.apiWrapper,
factory: this._serverInstanceFactory
}));
azdata.nb.registerNotebookProvider(notebookProvider);
return notebookProvider;
azdata.nb.registerNotebookProvider(this._notebookProvider);
}
private saveProfileAndCreateNotebook(profile: azdata.IConnectionProfile): Promise<void> {
@@ -198,10 +202,10 @@ export class JupyterController implements vscode.Disposable {
//Confirmation message dialog
private async confirmReinstall(): Promise<boolean> {
return await this.prompter.promptSingle<boolean>(<IQuestion>{
type: QuestionTypes.confirm,
type: confirm,
message: localize('confirmReinstall', "Are you sure you want to reinstall?"),
default: true
});
}, this.apiWrapper);
}
public async doManagePackages(options?: ManagePackageDialogOptions): Promise<void> {

6
extensions/notebook/src/jupyter/jupyterNotebookProvider.ts
View File

@@ -31,8 +31,12 @@ export class JupyterNotebookProvider implements nb.NotebookProvider {
return Promise.resolve(this.doGetNotebookManager(notebookUri));
}
public get notebookManagerCount(): number {
return this.managerTracker.size;
}
private doGetNotebookManager(notebookUri: vscode.Uri): nb.NotebookManager {
let baseFolder = this.transformToBaseFolder(notebookUri.fsPath.toString());
let baseFolder = this.transformToBaseFolder(notebookUri?.fsPath?.toString());
let manager = this.managerTracker.get(baseFolder);
if (!manager) {
let baseFolderUri = vscode.Uri.file(baseFolder);

6
extensions/notebook/src/jupyter/jupyterServerInstallation.ts
View File

@@ -18,7 +18,7 @@ import * as utils from '../common/utils';
import { OutputChannel, ConfigurationTarget, window } from 'vscode';
import { Deferred } from '../common/promise';
import { ConfigurePythonWizard } from '../dialog/configurePython/configurePythonWizard';
import { IPrompter, IQuestion, QuestionTypes } from '../prompts/question';
import { IPrompter, IQuestion, confirm } from '../prompts/question';
import CodeAdapter from '../prompts/adapter';
import { ConfigurePythonDialog } from '../dialog/configurePython/configurePythonDialog';
@@ -587,10 +587,10 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
let doUpgrade: boolean;
if (promptForUpgrade) {
doUpgrade = await this._prompter.promptSingle<boolean>(<IQuestion>{
type: QuestionTypes.confirm,
type: confirm,
message: localize('confirmPackageUpgrade', "Some required python packages need to be installed. Would you like to install them now?"),
default: true
});
}, this.apiWrapper);
if (!doUpgrade) {
throw new Error(localize('configurePython.packageInstallDeclined', "Package installation was declined."));
}