Skip to content

Commit 566d759

Browse files
DonJayamanneDonJayamanne
authored
Rename unittests folder to testing (microsoft#5263)
1 parent 075d574 commit 566d759

152 files changed

Lines changed: 366 additions & 366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/existingFiles.json‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -293,52 +293,52 @@
293293
"src/client/typeFormatters/contracts.ts",
294294
"src/client/typeFormatters/dispatcher.ts",
295295
"src/client/typeFormatters/onEnterFormatter.ts",
296-
"src/client/unittests/codeLenses/main.ts",
297-
"src/client/unittests/codeLenses/testFiles.ts",
298-
"src/client/unittests/common/argumentsHelper.ts",
299-
"src/client/unittests/common/constants.ts",
300-
"src/client/unittests/common/debugLauncher.ts",
301-
"src/client/unittests/common/managers/baseTestManager.ts",
302-
"src/client/unittests/common/managers/testConfigurationManager.ts",
303-
"src/client/unittests/common/runner.ts",
304-
"src/client/unittests/common/services/configSettingService.ts",
305-
"src/client/unittests/common/services/storageService.ts",
306-
"src/client/unittests/common/services/testManagerService.ts",
307-
"src/client/unittests/common/services/testResultsService.ts",
308-
"src/client/unittests/common/services/workspaceTestManagerService.ts",
309-
"src/client/unittests/common/testUtils.ts",
310-
"src/client/unittests/common/testVisitors/flatteningVisitor.ts",
311-
"src/client/unittests/common/testVisitors/folderGenerationVisitor.ts",
312-
"src/client/unittests/common/testVisitors/resultResetVisitor.ts",
313-
"src/client/unittests/common/types.ts",
314-
"src/client/unittests/common/xUnitParser.ts",
315-
"src/client/unittests/configuration.ts",
316-
"src/client/unittests/configurationFactory.ts",
317-
"src/client/unittests/display/main.ts",
318-
"src/client/unittests/display/picker.ts",
319-
"src/client/unittests/main.ts",
320-
"src/client/unittests/nosetest/main.ts",
321-
"src/client/unittests/nosetest/runner.ts",
322-
"src/client/unittests/nosetest/services/argsService.ts",
323-
"src/client/unittests/nosetest/services/discoveryService.ts",
324-
"src/client/unittests/nosetest/services/parserService.ts",
325-
"src/client/unittests/nosetest/testConfigurationManager.ts",
326-
"src/client/unittests/pytest/main.ts",
327-
"src/client/unittests/pytest/runner.ts",
328-
"src/client/unittests/pytest/services/argsService.ts",
329-
"src/client/unittests/pytest/services/discoveryService.ts",
330-
"src/client/unittests/pytest/services/parserService.ts",
331-
"src/client/unittests/pytest/testConfigurationManager.ts",
332-
"src/client/unittests/serviceRegistry.ts",
333-
"src/client/unittests/types.ts",
334-
"src/client/unittests/unittest/helper.ts",
335-
"src/client/unittests/unittest/main.ts",
336-
"src/client/unittests/unittest/runner.ts",
337-
"src/client/unittests/unittest/services/argsService.ts",
338-
"src/client/unittests/unittest/services/discoveryService.ts",
339-
"src/client/unittests/unittest/services/parserService.ts",
340-
"src/client/unittests/unittest/socketServer.ts",
341-
"src/client/unittests/unittest/testConfigurationManager.ts",
296+
"src/client/testing/codeLenses/main.ts",
297+
"src/client/testing/codeLenses/testFiles.ts",
298+
"src/client/testing/common/argumentsHelper.ts",
299+
"src/client/testing/common/constants.ts",
300+
"src/client/testing/common/debugLauncher.ts",
301+
"src/client/testing/common/managers/baseTestManager.ts",
302+
"src/client/testing/common/managers/testConfigurationManager.ts",
303+
"src/client/testing/common/runner.ts",
304+
"src/client/testing/common/services/configSettingService.ts",
305+
"src/client/testing/common/services/storageService.ts",
306+
"src/client/testing/common/services/testManagerService.ts",
307+
"src/client/testing/common/services/testResultsService.ts",
308+
"src/client/testing/common/services/workspaceTestManagerService.ts",
309+
"src/client/testing/common/testUtils.ts",
310+
"src/client/testing/common/testVisitors/flatteningVisitor.ts",
311+
"src/client/testing/common/testVisitors/folderGenerationVisitor.ts",
312+
"src/client/testing/common/testVisitors/resultResetVisitor.ts",
313+
"src/client/testing/common/types.ts",
314+
"src/client/testing/common/xUnitParser.ts",
315+
"src/client/testing/configuration.ts",
316+
"src/client/testing/configurationFactory.ts",
317+
"src/client/testing/display/main.ts",
318+
"src/client/testing/display/picker.ts",
319+
"src/client/testing/main.ts",
320+
"src/client/testing/nosetest/main.ts",
321+
"src/client/testing/nosetest/runner.ts",
322+
"src/client/testing/nosetest/services/argsService.ts",
323+
"src/client/testing/nosetest/services/discoveryService.ts",
324+
"src/client/testing/nosetest/services/parserService.ts",
325+
"src/client/testing/nosetest/testConfigurationManager.ts",
326+
"src/client/testing/pytest/main.ts",
327+
"src/client/testing/pytest/runner.ts",
328+
"src/client/testing/pytest/services/argsService.ts",
329+
"src/client/testing/pytest/services/discoveryService.ts",
330+
"src/client/testing/pytest/services/parserService.ts",
331+
"src/client/testing/pytest/testConfigurationManager.ts",
332+
"src/client/testing/serviceRegistry.ts",
333+
"src/client/testing/types.ts",
334+
"src/client/testing/unittest/helper.ts",
335+
"src/client/testing/unittest/main.ts",
336+
"src/client/testing/unittest/runner.ts",
337+
"src/client/testing/unittest/services/argsService.ts",
338+
"src/client/testing/unittest/services/discoveryService.ts",
339+
"src/client/testing/unittest/services/parserService.ts",
340+
"src/client/testing/unittest/socketServer.ts",
341+
"src/client/testing/unittest/testConfigurationManager.ts",
342342
"src/client/workspaceSymbols/contracts.ts",
343343
"src/client/workspaceSymbols/generator.ts",
344344
"src/client/workspaceSymbols/main.ts",
@@ -541,39 +541,39 @@
541541
"src/test/testRunner.ts",
542542
"src/test/textUtils.ts",
543543
"src/test/unittests.ts",
544-
"src/test/unittests/argsService.test.ts",
545-
"src/test/unittests/banners/languageServerSurvey.unit.test.ts",
546-
"src/test/unittests/banners/proposeNewLanguageServerBanner.unit.test.ts",
547-
"src/test/unittests/common/argsHelper.unit.test.ts",
548-
"src/test/unittests/common/debugLauncher.test.ts",
549-
"src/test/unittests/common/managers/testConfigurationManager.unit.test.ts",
550-
"src/test/unittests/common/services/configSettingService.unit.test.ts",
551-
"src/test/unittests/configuration.unit.test.ts",
552-
"src/test/unittests/configurationFactory.unit.test.ts",
553-
"src/test/unittests/debugger.test.ts",
554-
"src/test/unittests/display/main.test.ts",
555-
"src/test/unittests/helper.ts",
556-
"src/test/unittests/mocks.ts",
557-
"src/test/unittests/nosetest/nosetest.argsService.unit.test.ts",
558-
"src/test/unittests/nosetest/nosetest.discovery.unit.test.ts",
559-
"src/test/unittests/nosetest/nosetest.disovery.test.ts",
560-
"src/test/unittests/nosetest/nosetest.run.test.ts",
561-
"src/test/unittests/nosetest/nosetest.test.ts",
562-
"src/test/unittests/pytest/pytest_unittest_parser_data.ts",
563-
"src/test/unittests/pytest/pytest.argsService.unit.test.ts",
564-
"src/test/unittests/pytest/pytest.discovery.test.ts",
565-
"src/test/unittests/pytest/pytest.discovery.unit.test.ts",
566-
"src/test/unittests/pytest/pytest.run.test.ts",
567-
"src/test/unittests/pytest/pytest.test.ts",
568-
"src/test/unittests/pytest/pytest.testparser.unit.test.ts",
569-
"src/test/unittests/rediscover.test.ts",
570-
"src/test/unittests/serviceRegistry.ts",
571-
"src/test/unittests/stoppingDiscoverAndTest.test.ts",
572-
"src/test/unittests/unittest/unittest.argsService.unit.test.ts",
573-
"src/test/unittests/unittest/unittest.discovery.test.ts",
574-
"src/test/unittests/unittest/unittest.discovery.unit.test.ts",
575-
"src/test/unittests/unittest/unittest.run.test.ts",
576-
"src/test/unittests/unittest/unittest.test.ts",
544+
"src/test/testing/argsService.test.ts",
545+
"src/test/testing/banners/languageServerSurvey.unit.test.ts",
546+
"src/test/testing/banners/proposeNewLanguageServerBanner.unit.test.ts",
547+
"src/test/testing/common/argsHelper.unit.test.ts",
548+
"src/test/testing/common/debugLauncher.test.ts",
549+
"src/test/testing/common/managers/testConfigurationManager.unit.test.ts",
550+
"src/test/testing/common/services/configSettingService.unit.test.ts",
551+
"src/test/testing/configuration.unit.test.ts",
552+
"src/test/testing/configurationFactory.unit.test.ts",
553+
"src/test/testing/debugger.test.ts",
554+
"src/test/testing/display/main.test.ts",
555+
"src/test/testing/helper.ts",
556+
"src/test/testing/mocks.ts",
557+
"src/test/testing/nosetest/nosetest.argsService.unit.test.ts",
558+
"src/test/testing/nosetest/nosetest.discovery.unit.test.ts",
559+
"src/test/testing/nosetest/nosetest.disovery.test.ts",
560+
"src/test/testing/nosetest/nosetest.run.test.ts",
561+
"src/test/testing/nosetest/nosetest.test.ts",
562+
"src/test/testing/pytest/pytest_unittest_parser_data.ts",
563+
"src/test/testing/pytest/pytest.argsService.unit.test.ts",
564+
"src/test/testing/pytest/pytest.discovery.test.ts",
565+
"src/test/testing/pytest/pytest.discovery.unit.test.ts",
566+
"src/test/testing/pytest/pytest.run.test.ts",
567+
"src/test/testing/pytest/pytest.test.ts",
568+
"src/test/testing/pytest/pytest.testparser.unit.test.ts",
569+
"src/test/testing/rediscover.test.ts",
570+
"src/test/testing/serviceRegistry.ts",
571+
"src/test/testing/stoppingDiscoverAndTest.test.ts",
572+
"src/test/testing/unittest/unittest.argsService.unit.test.ts",
573+
"src/test/testing/unittest/unittest.discovery.test.ts",
574+
"src/test/testing/unittest/unittest.discovery.unit.test.ts",
575+
"src/test/testing/unittest/unittest.run.test.ts",
576+
"src/test/testing/unittest/unittest.test.ts",
577577
"src/test/vscode-mock.ts",
578578
"src/test/workspaceSymbols/common.ts",
579579
"src/test/workspaceSymbols/multiroot.test.ts",

‎build/unlocalizedFiles.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"src/client/providers/simpleRefactorProvider.ts",
1818
"src/client/providers/updateSparkLibraryProvider.ts",
1919
"src/client/terminals/codeExecution/helper.ts",
20-
"src/client/unittests/common/debugLauncher.ts",
21-
"src/client/unittests/common/managers/baseTestManager.ts",
22-
"src/client/unittests/configuration.ts",
23-
"src/client/unittests/display/main.ts",
24-
"src/client/unittests/main.ts",
20+
"src/client/testing/common/debugLauncher.ts",
21+
"src/client/testing/common/managers/baseTestManager.ts",
22+
"src/client/testing/configuration.ts",
23+
"src/client/testing/display/main.ts",
24+
"src/client/testing/main.ts",
2525
"src/client/workspaceSymbols/generator.ts"
2626
]

‎pythonFiles/testing_tools/adapter/pytest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def _adjust_pytest_args(pytestargs):
5454
# Duplicate entries should be okay.
5555
pytestargs.insert(0, '--collect-only')
5656
# TODO: pull in code from:
57-
# src/client/unittests/pytest/services/discoveryService.ts
58-
# src/client/unittests/pytest/services/argsService.ts
57+
# src/client/testing/pytest/services/discoveryService.ts
58+
# src/client/testing/pytest/services/argsService.ts
5959
return pytestargs
6060

6161

‎src/client/activation/jedi.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import { PythonReferenceProvider } from '../providers/referenceProvider';
1616
import { PythonRenameProvider } from '../providers/renameProvider';
1717
import { PythonSignatureProvider } from '../providers/signatureProvider';
1818
import { JediSymbolProvider } from '../providers/symbolProvider';
19+
import { ITestManagementService } from '../testing/types';
1920
import { BlockFormatProviders } from '../typeFormatters/blockFormatProvider';
2021
import { OnTypeFormattingDispatcher } from '../typeFormatters/dispatcher';
2122
import { OnEnterFormatter } from '../typeFormatters/onEnterFormatter';
22-
import { ITestManagementService } from '../unittests/types';
2323
import { WorkspaceSymbols } from '../workspaceSymbols/main';
2424
import { ILanguageServerActivator } from './types';
2525

‎src/client/activation/languageServer/languageServer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { noop } from '../../common/utils/misc';
1414
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
1515
import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
1616
import { EventName } from '../../telemetry/constants';
17-
import { ITestManagementService } from '../../unittests/types';
17+
import { ITestManagementService } from '../../testing/types';
1818
import { ILanguageClientFactory, ILanguageServer, LanguageClientFactory } from '../types';
1919
import { ProgressReporting } from './progress';
2020

‎src/client/common/application/commands.ts‎

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

66
import { CancellationToken, Position, TextDocument, Uri } from 'vscode';
77
import { Commands as DSCommands } from '../../datascience/constants';
8-
import { CommandSource } from '../../unittests/common/constants';
9-
import { TestFunction, TestsToRun } from '../../unittests/common/types';
10-
import { TestDataItem, TestWorkspaceFolder } from '../../unittests/types';
8+
import { CommandSource } from '../../testing/common/constants';
9+
import { TestFunction, TestsToRun } from '../../testing/common/types';
10+
import { TestDataItem, TestWorkspaceFolder } from '../../testing/types';
1111
import { Commands } from '../constants';
1212

1313
export type CommandsWithoutArgs = keyof ICommandNameWithoutArgumentTypeMapping;

‎src/client/common/installer/productPath.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Uri } from 'vscode';
1111
import { IFormatterHelper } from '../../formatters/types';
1212
import { IServiceContainer } from '../../ioc/types';
1313
import { ILinterManager } from '../../linters/types';
14-
import { ITestsHelper } from '../../unittests/common/types';
14+
import { ITestsHelper } from '../../testing/common/types';
1515
import { IConfigurationService, IInstaller, ModuleNamePurpose, Product } from '../types';
1616
import { IProductPathService } from './types';
1717

‎src/client/datascience/history/historycommandlistener.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IFileSystem } from '../../common/platform/types';
1515
import { IConfigurationService, IDisposableRegistry, ILogger } from '../../common/types';
1616
import * as localize from '../../common/utils/localize';
1717
import { captureTelemetry } from '../../telemetry';
18-
import { CommandSource } from '../../unittests/common/constants';
18+
import { CommandSource } from '../../testing/common/constants';
1919
import { generateCellRanges, generateCellsFromDocument } from '../cellFactory';
2020
import { Commands, Telemetry } from '../constants';
2121
import {

‎src/client/extension.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ import { EventName } from './telemetry/constants';
100100
import { EditorLoadTelemetry, IImportTracker } from './telemetry/types';
101101
import { registerTypes as commonRegisterTerminalTypes } from './terminals/serviceRegistry';
102102
import { ICodeExecutionManager, ITerminalAutoActivation } from './terminals/types';
103-
import { TEST_OUTPUT_CHANNEL } from './unittests/common/constants';
104-
import { ITestContextService } from './unittests/common/types';
105-
import { ITestCodeNavigatorCommandHandler, ITestExplorerCommandHandler } from './unittests/navigation/types';
106-
import { registerTypes as unitTestsRegisterTypes } from './unittests/serviceRegistry';
103+
import { TEST_OUTPUT_CHANNEL } from './testing/common/constants';
104+
import { ITestContextService } from './testing/common/types';
105+
import { ITestCodeNavigatorCommandHandler, ITestExplorerCommandHandler } from './testing/navigation/types';
106+
import { registerTypes as unitTestsRegisterTypes } from './testing/serviceRegistry';
107107

108108
durations.codeLoadingTime = stopWatch.elapsedTime;
109109
const activationDeferred = createDeferred<void>();

src/client/unittests/codeLenses/main.ts renamed to src/client/testing/codeLenses/main.ts

File renamed without changes.

0 commit comments

Comments
 (0)