Change "Unit Test" to "Test" for commands. (microsoft#5107)

(for microsoft#5000)

Author: ericsnowcurrently

news/1 Enhancements/4384.md

@@ -0,0 +1 @@
+Change "Unit Test" phrasing to "Test" or "Testing".

package.json

@@ -276,9 +276,18 @@
  "dark": "resources/dark/discovering-tests.svg"
  }
  },
+ {
+ "command": "python.stopTests",
+ "title": "%python.command.python.stopTests.title%",
+ "category": "Python",
+ "icon": {
+ "light": "resources/light/stop.svg",
+ "dark": "resources/dark/stop.svg"
+ }
+ },
  {
  "command": "python.stopUnitTests",
- "title": "%python.command.python.stopUnitTests.title%",
+ "title": "%python.command.python.stopTests.title% (deprecated)",
  "category": "Python",
  "icon": {
  "light": "resources/light/stop.svg",
@@ -573,7 +582,7 @@
  "when": "config.noExists"
  },
  {
- "command": "python.stopUnitTests",
+ "command": "python.stopTests",
  "category": "Python",
  "when": "config.noExists"
  },
@@ -703,7 +712,7 @@
  "group": "navigation@1"
  },
  {
- "command": "python.stopUnitTests",
+ "command": "python.stopTests",
  "when": "view == python_tests && busyTests",
  "group": "navigation@1"
  },

package.nls.json

@@ -3,23 +3,23 @@
  "python.command.python.startREPL.title": "Start REPL",
  "python.command.python.createTerminal.title": "Create Terminal",
  "python.command.python.buildWorkspaceSymbols.title": "Build Workspace Symbols",
- "python.command.python.runtests.title": "Run All Unit Tests",
- "python.command.python.debugtests.title": "Debug All Unit Tests",
+ "python.command.python.runtests.title": "Run All Tests",
+ "python.command.python.debugtests.title": "Debug All Tests",
  "python.command.python.execInTerminal.title": "Run Python File in Terminal",
  "python.command.python.setInterpreter.title": "Select Interpreter",
  "python.command.python.updateSparkLibrary.title": "Update Workspace PySpark Libraries",
  "python.command.python.refactorExtractVariable.title": "Extract Variable",
  "python.command.python.refactorExtractMethod.title": "Extract Method",
  "python.command.python.viewOutput.title": "Show Output",
- "python.command.python.viewTestOutput.title": "Show Unit Test Output",
- "python.command.python.selectAndRunTestMethod.title": "Run Unit Test Method ...",
- "python.command.python.selectAndDebugTestMethod.title": "Debug Unit Test Method ...",
- "python.command.python.selectAndRunTestFile.title": "Run Unit Test File ...",
- "python.command.python.runCurrentTestFile.title": "Run Current Unit Test File",
- "python.command.python.runFailedTests.title": "Run Failed Unit Tests",
- "python.command.python.discoverTests.title": "Discover Unit Tests",
- "python.command.python.stopUnitTests.title": "Stop",
- "python.command.python.configureTests.title": "Configure Unit Tests",
+ "python.command.python.viewTestOutput.title": "Show Test Output",
+ "python.command.python.selectAndRunTestMethod.title": "Run Test Method ...",
+ "python.command.python.selectAndDebugTestMethod.title": "Debug Test Method ...",
+ "python.command.python.selectAndRunTestFile.title": "Run Test File ...",
+ "python.command.python.runCurrentTestFile.title": "Run Current Test File",
+ "python.command.python.runFailedTests.title": "Run Failed Tests",
+ "python.command.python.discoverTests.title": "Discover Tests",
+ "python.command.python.stopTests.title": "Stop",
+ "python.command.python.configureTests.title": "Configure Tests",
  "python.command.python.execSelectionInTerminal.title": "Run Selection/Line in Python Terminal",
  "python.command.python.execSelectionInDjangoShell.title": "Run Selection/Line in Django Shell",
  "python.command.python.goToPythonObject.title": "Go to Python Object",

src/client/common/application/commands.ts

@@ -50,6 +50,9 @@ interface ICommandNameWithoutArgumentTypeMapping {
  [DSCommands.ExpandAllCells]: [];
  [DSCommands.CollapseAllCells]: [];
  [DSCommands.ExportOutputAsNotebook]: [];
+ // deprecated:
+ ['python.askToStopUnitTestDiscovery']: [];
+ ['python.askToStopUnitTests']: [];
 }
 
 /**
@@ -103,4 +106,6 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
  [DSCommands.ImportNotebook]: [undefined | Uri, undefined | CommandSource];
  [DSCommands.ExportFileAsNotebook]: [undefined | Uri, undefined | CommandSource];
  [DSCommands.RunFileInInteractiveWindows]: [string];
+ // deprecated:
+ ['python.stopUnitTests']: [undefined, Uri];
 }

src/client/common/constants.ts

@@ -27,9 +27,9 @@ export namespace Commands {
  export const Sort_Imports = 'python.sortImports';
  export const Tests_Run = 'python.runtests';
  export const Tests_Debug = 'python.debugtests';
- export const Tests_Ask_To_Stop_Test = 'python.askToStopUnitTests';
- export const Tests_Ask_To_Stop_Discovery = 'python.askToStopUnitTestDiscovery';
- export const Tests_Stop = 'python.stopUnitTests';
+ export const Tests_Ask_To_Stop_Test = 'python.askToStopTests';
+ export const Tests_Ask_To_Stop_Discovery = 'python.askToStopTestDiscovery';
+ export const Tests_Stop = 'python.stopTests';
  export const Test_Reveal_Test_Item = 'python.revealTestItem';
  export const ViewOutput = 'python.viewOutput';
  export const Tests_ViewOutput = 'python.viewTestOutput';

src/client/unittests/main.ts

@@ -405,7 +405,13 @@ export class UnitTestManagementService implements IUnitTestManagementService, Di
  commandManager.registerCommand(constants.Commands.Tests_Select_And_Debug_Method, (_, cmdSource: CommandSource = CommandSource.commandPalette, resource: Uri) => this.selectAndRunTestMethod(cmdSource, resource, true)),
  commandManager.registerCommand(constants.Commands.Tests_Select_And_Run_File, (_, cmdSource: CommandSource = CommandSource.commandPalette) => this.selectAndRunTestFile(cmdSource)),
  commandManager.registerCommand(constants.Commands.Tests_Run_Current_File, (_, cmdSource: CommandSource = CommandSource.commandPalette) => this.runCurrentTestFile(cmdSource)),
- commandManager.registerCommand(constants.Commands.Tests_Discovering, noop)
+ commandManager.registerCommand(constants.Commands.Tests_Discovering, noop),
+
+ // We register the following commands for backward-compatibility
+ // (where users may have set up key bindings, etc.).
+ commandManager.registerCommand('python.stopUnitTests', (_, resource: Uri) => this.stopTests(resource)),
+ commandManager.registerCommand('python.askToStopUnitTestDiscovery', () => this.displayStopUI('Stop discovering tests')),
+ commandManager.registerCommand('python.askToStopUnitTests', () => this.displayStopUI('Stop running tests'))
  ];
 
  disposablesRegistry.push(...disposables);