Skip to content

Commit c690ebb

Browse files
author
Kartik Raj
authored
Move discovery test code into their correct modules (microsoft#16739)
1 parent d07ae6d commit c690ebb

32 files changed

Lines changed: 1295 additions & 1265 deletions

src/test/pythonEnvironments/info/environmentInfoService.functional.test.ts renamed to src/test/pythonEnvironments/base/info/environmentInfoService.functional.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
import * as assert from 'assert';
77
import * as sinon from 'sinon';
88
import { ImportMock } from 'ts-mock-imports';
9-
import { ExecutionResult } from '../../../client/common/process/types';
10-
import { IDisposableRegistry } from '../../../client/common/types';
11-
import { Architecture } from '../../../client/common/utils/platform';
12-
import { InterpreterInformation } from '../../../client/pythonEnvironments/base/info/interpreter';
13-
import { parseVersion } from '../../../client/pythonEnvironments/base/info/pythonVersion';
14-
import * as ExternalDep from '../../../client/pythonEnvironments/common/externalDependencies';
9+
import { ExecutionResult } from '../../../../client/common/process/types';
10+
import { IDisposableRegistry } from '../../../../client/common/types';
11+
import { Architecture } from '../../../../client/common/utils/platform';
12+
import { InterpreterInformation } from '../../../../client/pythonEnvironments/base/info/interpreter';
13+
import { parseVersion } from '../../../../client/pythonEnvironments/base/info/pythonVersion';
14+
import * as ExternalDep from '../../../../client/pythonEnvironments/common/externalDependencies';
1515
import {
1616
EnvironmentInfoServiceQueuePriority,
1717
getEnvironmentInfoService,
18-
} from '../../../client/pythonEnvironments/base/info/environmentInfoService';
18+
} from '../../../../client/pythonEnvironments/base/info/environmentInfoService';
1919

2020
suite('Environment Info Service', () => {
2121
let stubShellExec: sinon.SinonStub;

‎src/test/pythonEnvironments/base/locators/composite/environmentsReducer.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { EventEmitter } from 'vscode';
77
import { PythonEnvKind, PythonEnvSource } from '../../../../../client/pythonEnvironments/base/info';
88
import { PythonEnvsReducer } from '../../../../../client/pythonEnvironments/base/locators/composite/environmentsReducer';
99
import { PythonEnvsChangedEvent } from '../../../../../client/pythonEnvironments/base/watcher';
10-
import { assertBasicEnvsEqual } from '../../../discovery/locators/envTestUtils';
10+
import { assertBasicEnvsEqual } from '../envTestUtils';
1111
import { createBasicEnv, getEnvs, getEnvsWithUpdates, SimpleLocator } from '../../common';
1212
import { PythonEnvUpdatedEvent, BasicEnvInfo } from '../../../../../client/pythonEnvironments/base/locator';
1313

‎src/test/pythonEnvironments/base/locators/composite/environmentsResolver.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
IEnvironmentInfoService,
2828
} from '../../../../../client/pythonEnvironments/base/info/environmentInfoService';
2929
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
30-
import { assertEnvEqual, assertEnvsEqual } from '../../../discovery/locators/envTestUtils';
30+
import { assertEnvEqual, assertEnvsEqual } from '../envTestUtils';
3131
import { createBasicEnv, getEnvs, getEnvsWithUpdates, SimpleLocator } from '../../common';
3232

3333
suite('Python envs locator - Environments Resolver', () => {

‎src/test/pythonEnvironments/base/locators/composite/resolverUtils.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { buildEnvInfo } from '../../../../../client/pythonEnvironments/base/info
1818
import { InterpreterInformation } from '../../../../../client/pythonEnvironments/base/info/interpreter';
1919
import { parseVersion } from '../../../../../client/pythonEnvironments/base/info/pythonVersion';
2020
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
21-
import { assertEnvEqual } from '../../../discovery/locators/envTestUtils';
21+
import { assertEnvEqual } from '../envTestUtils';
2222
import { Architecture } from '../../../../../client/common/utils/platform';
2323
import {
2424
AnacondaCompanyName,

src/test/pythonEnvironments/discovery/locators/envTestUtils.ts renamed to src/test/pythonEnvironments/base/locators/envTestUtils.ts

File renamed without changes.

src/test/pythonEnvironments/discovery/locators/condaLocator.unit.test.ts renamed to src/test/pythonEnvironments/base/locators/lowLevel/condaLocator.unit.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import * as fsapi from 'fs-extra';
55
import * as path from 'path';
66
import * as sinon from 'sinon';
7-
import { PythonReleaseLevel, PythonVersion } from '../../../../client/pythonEnvironments/base/info';
8-
import * as externalDeps from '../../../../client/pythonEnvironments/common/externalDependencies';
9-
import { getPythonVersionFromConda } from '../../../../client/pythonEnvironments/common/environmentManagers/conda';
10-
import { TEST_DATA_ROOT } from '../../common/commonTestConstants';
11-
import { assertVersionsEqual } from './envTestUtils';
7+
import { PythonReleaseLevel, PythonVersion } from '../../../../../client/pythonEnvironments/base/info';
8+
import * as externalDeps from '../../../../../client/pythonEnvironments/common/externalDependencies';
9+
import { getPythonVersionFromConda } from '../../../../../client/pythonEnvironments/common/environmentManagers/conda';
10+
import { TEST_DATA_ROOT } from '../../../common/commonTestConstants';
11+
import { assertVersionsEqual } from '../envTestUtils';
1212

1313
suite('Conda Python Version Parser Tests', () => {
1414
let readFileStub: sinon.SinonStub;

src/test/pythonEnvironments/discovery/locators/customVirtualEnvLocator.unit.test.ts renamed to src/test/pythonEnvironments/base/locators/lowLevel/customVirtualEnvLocator.unit.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
import * as assert from 'assert';
55
import * as path from 'path';
66
import * as sinon from 'sinon';
7-
import * as fsWatcher from '../../../../client/common/platform/fileSystemWatcher';
8-
import * as platformUtils from '../../../../client/common/utils/platform';
9-
import { PythonEnvKind } from '../../../../client/pythonEnvironments/base/info';
10-
import { getEnvs } from '../../../../client/pythonEnvironments/base/locatorUtils';
11-
import { PythonEnvsChangedEvent } from '../../../../client/pythonEnvironments/base/watcher';
12-
import * as externalDependencies from '../../../../client/pythonEnvironments/common/externalDependencies';
7+
import * as fsWatcher from '../../../../../client/common/platform/fileSystemWatcher';
8+
import * as platformUtils from '../../../../../client/common/utils/platform';
9+
import { PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
10+
import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
11+
import { PythonEnvsChangedEvent } from '../../../../../client/pythonEnvironments/base/watcher';
12+
import * as externalDependencies from '../../../../../client/pythonEnvironments/common/externalDependencies';
1313
import {
1414
CustomVirtualEnvironmentLocator,
1515
VENVFOLDERS_SETTING_KEY,
1616
VENVPATH_SETTING_KEY,
17-
} from '../../../../client/pythonEnvironments/base/locators/lowLevel/customVirtualEnvLocator';
18-
import { createBasicEnv } from '../../base/common';
19-
import { TEST_LAYOUT_ROOT } from '../../common/commonTestConstants';
20-
import { assertBasicEnvsEqual } from './envTestUtils';
17+
} from '../../../../../client/pythonEnvironments/base/locators/lowLevel/customVirtualEnvLocator';
18+
import { createBasicEnv } from '../../common';
19+
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
20+
import { assertBasicEnvsEqual } from '../envTestUtils';
2121

2222
suite('CustomVirtualEnvironment Locator', () => {
2323
const testVirtualHomeDir = path.join(TEST_LAYOUT_ROOT, 'virtualhome');

src/test/pythonEnvironments/discovery/locators/lowLevel/fsWatchingLocator.unit.test.ts renamed to src/test/pythonEnvironments/base/locators/lowLevel/fsWatchingLocator.unit.test.ts

File renamed without changes.

src/test/pythonEnvironments/discovery/locators/globalVirtualEnvironmentLocator.testvirtualenvs.ts renamed to src/test/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvironmentLocator.testvirtualenvs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the MIT License.
33

44
import * as path from 'path';
5-
import { GlobalVirtualEnvironmentLocator } from '../../../../client/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvronmentLocator';
6-
import { TEST_LAYOUT_ROOT } from '../../common/commonTestConstants';
5+
import { GlobalVirtualEnvironmentLocator } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvronmentLocator';
6+
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
77
import { testLocatorWatcher } from './watcherTestUtils';
88

99
suite('GlobalVirtualEnvironment Locator', async () => {

src/test/pythonEnvironments/discovery/locators/globalVirtualEnvironmentLocator.functional.test.ts renamed to src/test/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvironmentLocator.unit.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
import * as path from 'path';
55
import * as sinon from 'sinon';
6-
import * as fsWatcher from '../../../../client/common/platform/fileSystemWatcher';
7-
import * as platformUtils from '../../../../client/common/utils/platform';
8-
import { PythonEnvKind } from '../../../../client/pythonEnvironments/base/info';
9-
import { getEnvs } from '../../../../client/pythonEnvironments/base/locatorUtils';
10-
import * as externalDependencies from '../../../../client/pythonEnvironments/common/externalDependencies';
11-
import { GlobalVirtualEnvironmentLocator } from '../../../../client/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvronmentLocator';
12-
import { createBasicEnv } from '../../base/common';
13-
import { TEST_LAYOUT_ROOT } from '../../common/commonTestConstants';
14-
import { assertBasicEnvsEqual } from './envTestUtils';
6+
import * as fsWatcher from '../../../../../client/common/platform/fileSystemWatcher';
7+
import * as platformUtils from '../../../../../client/common/utils/platform';
8+
import { PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
9+
import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
10+
import * as externalDependencies from '../../../../../client/pythonEnvironments/common/externalDependencies';
11+
import { GlobalVirtualEnvironmentLocator } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvronmentLocator';
12+
import { createBasicEnv } from '../../common';
13+
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
14+
import { assertBasicEnvsEqual } from '../envTestUtils';
1515

1616
suite('GlobalVirtualEnvironment Locator', () => {
1717
const testVirtualHomeDir = path.join(TEST_LAYOUT_ROOT, 'virtualhome');

0 commit comments

Comments
 (0)