-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5e8aa11
commit dc4f4d0
Showing
10 changed files
with
127 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,111 @@ | ||
| // // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // // Licensed under the MIT License. | ||
| // 'use strict'; | ||
| // import { anything, instance, mock, verify, when } from 'ts-mockito'; | ||
| // import * as typemoq from 'typemoq'; | ||
| // import { IApplicationShell } from '../../client/common/application/types'; | ||
| // import * as localize from '../../client/common/utils/localize'; | ||
| // import { DataScienceErrorHandler } from '../../client/datascience/errorHandler/errorHandler'; | ||
| // import { JupyterInstallError } from '../../client/datascience/jupyter/jupyterInstallError'; | ||
| // import { JupyterSelfCertsError } from '../../client/datascience/jupyter/jupyterSelfCertsError'; | ||
| // import { JupyterZMQBinariesNotFoundError } from '../../client/datascience/jupyter/jupyterZMQBinariesNotFoundError'; | ||
| // import { JupyterServerSelector } from '../../client/datascience/jupyter/serverSelector'; | ||
| // import { IJupyterInterpreterDependencyManager } from '../../client/datascience/types'; | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
| 'use strict'; | ||
| import { anything, instance, mock, verify, when } from 'ts-mockito'; | ||
| import * as typemoq from 'typemoq'; | ||
| import { IApplicationShell } from '../../client/common/application/types'; | ||
| import * as localize from '../../client/common/utils/localize'; | ||
| import { DataScienceErrorHandler } from '../../client/datascience/errorHandler/errorHandler'; | ||
| import { JupyterInstallError } from '../../client/datascience/jupyter/jupyterInstallError'; | ||
| import { JupyterSelfCertsError } from '../../client/datascience/jupyter/jupyterSelfCertsError'; | ||
| import { JupyterZMQBinariesNotFoundError } from '../../client/datascience/jupyter/jupyterZMQBinariesNotFoundError'; | ||
| import { JupyterServerSelector } from '../../client/datascience/jupyter/serverSelector'; | ||
| import { IJupyterInterpreterDependencyManager } from '../../client/datascience/types'; | ||
|
|
||
| // suite('DataScience Error Handler Unit Tests', () => { | ||
| // let applicationShell: typemoq.IMock<IApplicationShell>; | ||
| // let dataScienceErrorHandler: DataScienceErrorHandler; | ||
| // let dependencyManager: IJupyterInterpreterDependencyManager; | ||
| // const serverSelector = mock(JupyterServerSelector); | ||
| suite('DataScience Error Handler Unit Tests', () => { | ||
| let applicationShell: typemoq.IMock<IApplicationShell>; | ||
| let dataScienceErrorHandler: DataScienceErrorHandler; | ||
| let dependencyManager: IJupyterInterpreterDependencyManager; | ||
| const serverSelector = mock(JupyterServerSelector); | ||
|
|
||
| // setup(() => { | ||
| // applicationShell = typemoq.Mock.ofType<IApplicationShell>(); | ||
| // dependencyManager = mock<IJupyterInterpreterDependencyManager>(); | ||
| // when(dependencyManager.installMissingDependencies(anything())).thenResolve(); | ||
| // dataScienceErrorHandler = new DataScienceErrorHandler( | ||
| // applicationShell.object, | ||
| // instance(dependencyManager), | ||
| // instance(serverSelector) | ||
| // ); | ||
| // }); | ||
| // const message = 'Test error message.'; | ||
| setup(() => { | ||
| applicationShell = typemoq.Mock.ofType<IApplicationShell>(); | ||
| dependencyManager = mock<IJupyterInterpreterDependencyManager>(); | ||
| when(dependencyManager.installMissingDependencies(anything())).thenResolve(); | ||
| dataScienceErrorHandler = new DataScienceErrorHandler( | ||
| applicationShell.object, | ||
| instance(dependencyManager), | ||
| instance(serverSelector) | ||
| ); | ||
| }); | ||
| const message = 'Test error message.'; | ||
|
|
||
| // test('Default error', async () => { | ||
| // applicationShell | ||
| // .setup((app) => app.showErrorMessage(typemoq.It.isAny())) | ||
| // .returns(() => Promise.resolve(message)) | ||
| // .verifiable(typemoq.Times.once()); | ||
| test('Default error', async () => { | ||
| applicationShell | ||
| .setup((app) => app.showErrorMessage(typemoq.It.isAny())) | ||
| .returns(() => Promise.resolve(message)) | ||
| .verifiable(typemoq.Times.once()); | ||
|
|
||
| // const err = new Error(message); | ||
| // await dataScienceErrorHandler.handleError(err); | ||
| const err = new Error(message); | ||
| await dataScienceErrorHandler.handleError(err); | ||
|
|
||
| // applicationShell.verifyAll(); | ||
| // }); | ||
| applicationShell.verifyAll(); | ||
| }); | ||
|
|
||
| // test('Jupyter Self Certificates Error', async () => { | ||
| // applicationShell | ||
| // .setup((app) => app.showErrorMessage(typemoq.It.isAny())) | ||
| // .returns(() => Promise.resolve(message)) | ||
| // .verifiable(typemoq.Times.never()); | ||
| test('Jupyter Self Certificates Error', async () => { | ||
| applicationShell | ||
| .setup((app) => app.showErrorMessage(typemoq.It.isAny())) | ||
| .returns(() => Promise.resolve(message)) | ||
| .verifiable(typemoq.Times.never()); | ||
|
|
||
| // const err = new JupyterSelfCertsError(message); | ||
| // await dataScienceErrorHandler.handleError(err); | ||
| const err = new JupyterSelfCertsError(message); | ||
| await dataScienceErrorHandler.handleError(err); | ||
|
|
||
| // applicationShell.verifyAll(); | ||
| // }); | ||
| applicationShell.verifyAll(); | ||
| }); | ||
|
|
||
| // test('Jupyter Install Error', async () => { | ||
| // applicationShell | ||
| // .setup((app) => | ||
| // app.showInformationMessage( | ||
| // typemoq.It.isAny(), | ||
| // typemoq.It.isValue(localize.DataScience.jupyterInstall()), | ||
| // typemoq.It.isValue(localize.DataScience.notebookCheckForImportNo()), | ||
| // typemoq.It.isAny() | ||
| // ) | ||
| // ) | ||
| // .returns(() => Promise.resolve(localize.DataScience.jupyterInstall())) | ||
| // .verifiable(typemoq.Times.once()); | ||
| test('Jupyter Install Error', async () => { | ||
| applicationShell | ||
| .setup((app) => | ||
| app.showInformationMessage( | ||
| typemoq.It.isAny(), | ||
| typemoq.It.isValue(localize.DataScience.jupyterInstall()), | ||
| typemoq.It.isValue(localize.DataScience.notebookCheckForImportNo()), | ||
| typemoq.It.isAny() | ||
| ) | ||
| ) | ||
| .returns(() => Promise.resolve(localize.DataScience.jupyterInstall())) | ||
| .verifiable(typemoq.Times.once()); | ||
|
|
||
| // const installers: IModuleInstaller[] = [ | ||
| // { | ||
| // name: 'Pip', | ||
| // displayName: 'Pip', | ||
| // priority: 0, | ||
| // isSupported: () => Promise.resolve(true), | ||
| // installModule: () => Promise.resolve() | ||
| // }, | ||
| // { | ||
| // name: 'Conda', | ||
| // displayName: 'Conda', | ||
| // priority: 0, | ||
| // isSupported: () => Promise.resolve(true), | ||
| // installModule: () => Promise.resolve() | ||
| // } | ||
| // ]; | ||
| // const installers: IModuleInstaller[] = [ | ||
| // { | ||
| // name: 'Pip', | ||
| // displayName: 'Pip', | ||
| // priority: 0, | ||
| // isSupported: () => Promise.resolve(true), | ||
| // installModule: () => Promise.resolve() | ||
| // }, | ||
| // { | ||
| // name: 'Conda', | ||
| // displayName: 'Conda', | ||
| // priority: 0, | ||
| // isSupported: () => Promise.resolve(true), | ||
| // installModule: () => Promise.resolve() | ||
| // } | ||
| // ]; | ||
|
|
||
| // channels | ||
| // .setup((ch) => ch.getInstallationChannels()) | ||
| // .returns(() => Promise.resolve(installers)) | ||
| // .verifiable(typemoq.Times.once()); | ||
| // channels | ||
| // .setup((ch) => ch.getInstallationChannels()) | ||
| // .returns(() => Promise.resolve(installers)) | ||
| // .verifiable(typemoq.Times.once()); | ||
|
|
||
| // const err = new JupyterInstallError(message, 'test.com'); | ||
| // await dataScienceErrorHandler.handleError(err); | ||
| const err = new JupyterInstallError(message, 'test.com'); | ||
| await dataScienceErrorHandler.handleError(err); | ||
|
|
||
| // verify(dependencyManager.installMissingDependencies(err)).once(); | ||
| // }); | ||
| verify(dependencyManager.installMissingDependencies(err)).once(); | ||
| }); | ||
|
|
||
| // test('ZMQ Install Error', async () => { | ||
| // applicationShell | ||
| // .setup((app) => | ||
| // app.showErrorMessage(typemoq.It.isAny(), typemoq.It.isValue(localize.DataScience.selectNewServer())) | ||
| // ) | ||
| // .returns(() => Promise.resolve(localize.DataScience.selectNewServer())) | ||
| // .verifiable(typemoq.Times.once()); | ||
| // when(serverSelector.selectJupyterURI(anything())).thenCall(() => Promise.resolve()); | ||
| // const err = new JupyterZMQBinariesNotFoundError('Not found'); | ||
| // await dataScienceErrorHandler.handleError(err); | ||
| // verify(serverSelector.selectJupyterURI(anything())).once(); | ||
| // applicationShell.verifyAll(); | ||
| // }); | ||
| // }); | ||
| test('ZMQ Install Error', async () => { | ||
| applicationShell | ||
| .setup((app) => | ||
| app.showErrorMessage(typemoq.It.isAny(), typemoq.It.isValue(localize.DataScience.selectNewServer())) | ||
| ) | ||
| .returns(() => Promise.resolve(localize.DataScience.selectNewServer())) | ||
| .verifiable(typemoq.Times.once()); | ||
| when(serverSelector.selectJupyterURI(anything())).thenCall(() => Promise.resolve()); | ||
| const err = new JupyterZMQBinariesNotFoundError('Not found'); | ||
| await dataScienceErrorHandler.handleError(err); | ||
| verify(serverSelector.selectJupyterURI(anything())).once(); | ||
| applicationShell.verifyAll(); | ||
| }); | ||
| }); |