-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restore deleted file to resolve compilation issues (#25)
- Loading branch information
1 parent
5279dd9
commit ace462b
Showing
1 changed file
with
192 additions
and
0 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,192 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
| 'use strict'; | ||
| import { Uri } from 'vscode'; | ||
|
|
||
| import { IProcessServiceFactory } from '../../client/common/process/types'; | ||
| import { CodeCssGenerator } from '../../client/datascience/codeCssGenerator'; | ||
| import { InteractiveWindow } from '../../client/datascience/interactive-window/interactiveWindow'; | ||
| import { InteractiveWindowProvider } from '../../client/datascience/interactive-window/interactiveWindowProvider'; | ||
| import { JupyterExecutionFactory } from '../../client/datascience/jupyter/jupyterExecutionFactory'; | ||
| import { JupyterImporter } from '../../client/datascience/jupyter/jupyterImporter'; | ||
| import { JupyterServerWrapper } from '../../client/datascience/jupyter/jupyterServerWrapper'; | ||
| import { | ||
| ICodeCssGenerator, | ||
| IInteractiveWindow, | ||
| IInteractiveWindowProvider, | ||
| IJupyterExecution, | ||
| INotebookImporter, | ||
| INotebookServer | ||
| } from '../../client/datascience/types'; | ||
| import { InterpreterEvaluation } from '../../client/interpreter/autoSelection/interpreterSecurity/interpreterEvaluation'; | ||
| import { InterpreterSecurityService } from '../../client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityService'; | ||
| import { InterpreterSecurityStorage } from '../../client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityStorage'; | ||
| import { | ||
| IInterpreterEvaluation, | ||
| IInterpreterSecurityService, | ||
| IInterpreterSecurityStorage | ||
| } from '../../client/interpreter/autoSelection/types'; | ||
| import { IInterpreterHelper } from '../../client/interpreter/contracts'; | ||
| import { InterpreterHelper } from '../../client/interpreter/helpers'; | ||
| import { IServiceContainer } from '../../client/ioc/types'; | ||
| import { NOSETEST_PROVIDER, PYTEST_PROVIDER, UNITTEST_PROVIDER } from '../../client/testing/common/constants'; | ||
| import { TestContextService } from '../../client/testing/common/services/contextService'; | ||
| import { TestDiscoveredTestParser } from '../../client/testing/common/services/discoveredTestParser'; | ||
| import { TestsDiscoveryService } from '../../client/testing/common/services/discovery'; | ||
| import { TestCollectionStorageService } from '../../client/testing/common/services/storageService'; | ||
| import { TestManagerService } from '../../client/testing/common/services/testManagerService'; | ||
| import { TestResultsService } from '../../client/testing/common/services/testResultsService'; | ||
| import { TestsStatusUpdaterService } from '../../client/testing/common/services/testsStatusService'; | ||
| import { ITestDiscoveredTestParser } from '../../client/testing/common/services/types'; | ||
| import { UnitTestDiagnosticService } from '../../client/testing/common/services/unitTestDiagnosticService'; | ||
| import { TestsHelper } from '../../client/testing/common/testUtils'; | ||
| import { TestFlatteningVisitor } from '../../client/testing/common/testVisitors/flatteningVisitor'; | ||
| import { TestResultResetVisitor } from '../../client/testing/common/testVisitors/resultResetVisitor'; | ||
| import { | ||
| ITestCollectionStorageService, | ||
| ITestContextService, | ||
| ITestDiscoveryService, | ||
| ITestManager, | ||
| ITestManagerFactory, | ||
| ITestManagerService, | ||
| ITestManagerServiceFactory, | ||
| ITestResultsService, | ||
| ITestsHelper, | ||
| ITestsParser, | ||
| ITestsStatusUpdaterService, | ||
| ITestVisitor, | ||
| TestProvider | ||
| } from '../../client/testing/common/types'; | ||
| import { TestManager as NoseTestManager } from '../../client/testing/nosetest/main'; | ||
| import { TestDiscoveryService as NoseTestDiscoveryService } from '../../client/testing/nosetest/services/discoveryService'; | ||
| import { TestsParser as NoseTestTestsParser } from '../../client/testing/nosetest/services/parserService'; | ||
| import { TestManager as PyTestTestManager } from '../../client/testing/pytest/main'; | ||
| import { TestDiscoveryService as PytestTestDiscoveryService } from '../../client/testing/pytest/services/discoveryService'; | ||
| import { ITestDiagnosticService } from '../../client/testing/types'; | ||
| import { TestManager as UnitTestTestManager } from '../../client/testing/unittest/main'; | ||
| import { TestDiscoveryService as UnitTestTestDiscoveryService } from '../../client/testing/unittest/services/discoveryService'; | ||
| import { TestsParser as UnitTestTestsParser } from '../../client/testing/unittest/services/parserService'; | ||
| import { getPythonSemVer } from '../common'; | ||
| import { IocContainer } from '../serviceRegistry'; | ||
|
|
||
| export class UnitTestIocContainer extends IocContainer { | ||
| constructor() { | ||
| super(); | ||
| } | ||
| public async getPythonMajorVersion(resource: Uri): Promise<number> { | ||
| const procServiceFactory = this.serviceContainer.get<IProcessServiceFactory>(IProcessServiceFactory); | ||
| const procService = await procServiceFactory.create(resource); | ||
| const pythonVersion = await getPythonSemVer(procService); | ||
| if (pythonVersion) { | ||
| return pythonVersion.major; | ||
| } else { | ||
| return -1; // log warning already issued by underlying functions... | ||
| } | ||
| } | ||
|
|
||
| public registerTestVisitors() { | ||
| this.serviceManager.add<ITestVisitor>(ITestVisitor, TestFlatteningVisitor, 'TestFlatteningVisitor'); | ||
| this.serviceManager.add<ITestVisitor>(ITestVisitor, TestResultResetVisitor, 'TestResultResetVisitor'); | ||
| this.serviceManager.addSingleton<ITestsStatusUpdaterService>( | ||
| ITestsStatusUpdaterService, | ||
| TestsStatusUpdaterService | ||
| ); | ||
| this.serviceManager.addSingleton<ITestContextService>(ITestContextService, TestContextService); | ||
| } | ||
|
|
||
| public registerTestStorage() { | ||
| this.serviceManager.addSingleton<ITestCollectionStorageService>( | ||
| ITestCollectionStorageService, | ||
| TestCollectionStorageService | ||
| ); | ||
| } | ||
|
|
||
| public registerTestsHelper() { | ||
| this.serviceManager.addSingleton<ITestsHelper>(ITestsHelper, TestsHelper); | ||
| } | ||
|
|
||
| public registerTestResultsHelper() { | ||
| this.serviceManager.add<ITestResultsService>(ITestResultsService, TestResultsService); | ||
| } | ||
|
|
||
| public registerTestParsers() { | ||
| this.serviceManager.add<ITestsParser>(ITestsParser, UnitTestTestsParser, UNITTEST_PROVIDER); | ||
| this.serviceManager.add<ITestsParser>(ITestsParser, NoseTestTestsParser, NOSETEST_PROVIDER); | ||
| } | ||
|
|
||
| public registerTestDiscoveryServices() { | ||
| this.serviceManager.add<ITestDiscoveryService>( | ||
| ITestDiscoveryService, | ||
| UnitTestTestDiscoveryService, | ||
| UNITTEST_PROVIDER | ||
| ); | ||
| this.serviceManager.add<ITestDiscoveryService>( | ||
| ITestDiscoveryService, | ||
| PytestTestDiscoveryService, | ||
| PYTEST_PROVIDER | ||
| ); | ||
| this.serviceManager.add<ITestDiscoveryService>( | ||
| ITestDiscoveryService, | ||
| NoseTestDiscoveryService, | ||
| NOSETEST_PROVIDER | ||
| ); | ||
| this.serviceManager.add<ITestDiscoveryService>(ITestDiscoveryService, TestsDiscoveryService, 'common'); | ||
| this.serviceManager.add<ITestDiscoveredTestParser>(ITestDiscoveredTestParser, TestDiscoveredTestParser); | ||
| } | ||
|
|
||
| public registerTestDiagnosticServices() { | ||
| this.serviceManager.addSingleton<ITestDiagnosticService>(ITestDiagnosticService, UnitTestDiagnosticService); | ||
| } | ||
|
|
||
| public registerTestManagers() { | ||
| this.serviceManager.addFactory<ITestManager>(ITestManagerFactory, (context) => { | ||
| return (testProvider: TestProvider, workspaceFolder: Uri, rootDirectory: string) => { | ||
| const serviceContainer = context.container.get<IServiceContainer>(IServiceContainer); | ||
|
|
||
| switch (testProvider) { | ||
| case NOSETEST_PROVIDER: { | ||
| return new NoseTestManager(workspaceFolder, rootDirectory, serviceContainer); | ||
| } | ||
| case PYTEST_PROVIDER: { | ||
| return new PyTestTestManager(workspaceFolder, rootDirectory, serviceContainer); | ||
| } | ||
| case UNITTEST_PROVIDER: { | ||
| return new UnitTestTestManager(workspaceFolder, rootDirectory, serviceContainer); | ||
| } | ||
| default: { | ||
| throw new Error(`Unrecognized test provider '${testProvider}'`); | ||
| } | ||
| } | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| public registerInterpreterStorageTypes() { | ||
| this.serviceManager.add<IInterpreterSecurityStorage>(IInterpreterSecurityStorage, InterpreterSecurityStorage); | ||
| this.serviceManager.add<IInterpreterSecurityService>(IInterpreterSecurityService, InterpreterSecurityService); | ||
| this.serviceManager.add<IInterpreterEvaluation>(IInterpreterEvaluation, InterpreterEvaluation); | ||
| this.serviceManager.add<IInterpreterHelper>(IInterpreterHelper, InterpreterHelper); | ||
| } | ||
|
|
||
| public registerTestManagerService() { | ||
| this.serviceManager.addFactory<ITestManagerService>(ITestManagerServiceFactory, (context) => { | ||
| return (workspaceFolder: Uri) => { | ||
| const serviceContainer = context.container.get<IServiceContainer>(IServiceContainer); | ||
| const testsHelper = context.container.get<ITestsHelper>(ITestsHelper); | ||
| return new TestManagerService(workspaceFolder, testsHelper, serviceContainer); | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| public registerDataScienceTypes() { | ||
| this.serviceManager.addSingleton<IJupyterExecution>(IJupyterExecution, JupyterExecutionFactory); | ||
| this.serviceManager.addSingleton<IInteractiveWindowProvider>( | ||
| IInteractiveWindowProvider, | ||
| InteractiveWindowProvider | ||
| ); | ||
| this.serviceManager.add<IInteractiveWindow>(IInteractiveWindow, InteractiveWindow); | ||
| this.serviceManager.add<INotebookImporter>(INotebookImporter, JupyterImporter); | ||
| this.serviceManager.add<INotebookServer>(INotebookServer, JupyterServerWrapper); | ||
| this.serviceManager.addSingleton<ICodeCssGenerator>(ICodeCssGenerator, CodeCssGenerator); | ||
| } | ||
| } |