Fix testing-related user-facing messages. (#5108)

Author: ericsnowcurrently

package.nls.json

@@ -214,11 +214,11 @@
     "debug.attachRemoteHostTitle": "Remote Debugging",
     "debug.attachRemoteHostPrompt": "Enter a host name or IP address",
     "debug.attachRemoteHostValidationError": "Enter a valid host name or IP address",
-    "UnitTests.testErrorDiagnosticMessage": "Error",
-    "UnitTests.testFailDiagnosticMessage": "Fail",
-    "UnitTests.testSkippedDiagnosticMessage": "Skipped",
-    "UnitTests.configureTests": "Configure Test Framework",
-    "UnitTests.disableTests": "Disable Tests",
+    "Testing.testErrorDiagnosticMessage": "Error",
+    "Testing.testFailDiagnosticMessage": "Fail",
+    "Testing.testSkippedDiagnosticMessage": "Skipped",
+    "Testing.configureTests": "Configure Test Framework",
+    "Testing.disableTests": "Disable Tests",
     "Common.openOutputPanel": "Show output",
     "LanguageService.downloadFailedOutputMessage": "download failed",
     "LanguageService.extractionFailedOutputMessage": "extraction failed",

src/client/common/utils/localize.ts

@@ -193,12 +193,12 @@ export namespace DebugConfigurationPrompts {
     export const launchJsonConfigurationsCompletionDescription = localize('debug.launchJsonConfigurationsCompletionDescription', 'Select a debug configuration');
 }
 
-export namespace UnitTests {
-    export const testErrorDiagnosticMessage = localize('UnitTests.testErrorDiagnosticMessage', 'Error');
-    export const testFailDiagnosticMessage = localize('UnitTests.testFailDiagnosticMessage', 'Fail');
-    export const testSkippedDiagnosticMessage = localize('UnitTests.testSkippedDiagnosticMessage', 'Skipped');
-    export const configureTests = localize('UnitTests.configureTests', 'Configure Test Framework');
-    export const disableTests = localize('UnitTests.disableTests', 'Disable Tests');
+export namespace Testing {
+    export const testErrorDiagnosticMessage = localize('Testing.testErrorDiagnosticMessage', 'Error');
+    export const testFailDiagnosticMessage = localize('Testing.testFailDiagnosticMessage', 'Fail');
+    export const testSkippedDiagnosticMessage = localize('Testing.testSkippedDiagnosticMessage', 'Skipped');
+    export const configureTests = localize('Testing.configureTests', 'Configure Test Framework');
+    export const disableTests = localize('Testing.disableTests', 'Disable Tests');
 }
 
 // Skip using vscode-nls and instead just compute our strings based on key values. Key values

src/client/unittests/common/services/unitTestDiagnosticService.ts

@@ -24,9 +24,9 @@ export class UnitTestDiagnosticService implements IUnitTestDiagnosticService {
         this.MessageSeverities.set(PythonUnitTestMessageSeverity.Failure, DiagnosticSeverity.Error);
         this.MessageSeverities.set(PythonUnitTestMessageSeverity.Skip, DiagnosticSeverity.Information);
         this.MessageSeverities.set(PythonUnitTestMessageSeverity.Pass, undefined);
-        this.MessagePrefixes.set(DiagnosticMessageType.Error, localize.UnitTests.testErrorDiagnosticMessage());
-        this.MessagePrefixes.set(DiagnosticMessageType.Fail, localize.UnitTests.testFailDiagnosticMessage());
-        this.MessagePrefixes.set(DiagnosticMessageType.Skipped, localize.UnitTests.testSkippedDiagnosticMessage());
+        this.MessagePrefixes.set(DiagnosticMessageType.Error, localize.Testing.testErrorDiagnosticMessage());
+        this.MessagePrefixes.set(DiagnosticMessageType.Fail, localize.Testing.testFailDiagnosticMessage());
+        this.MessagePrefixes.set(DiagnosticMessageType.Skipped, localize.Testing.testSkippedDiagnosticMessage());
         this.MessagePrefixes.set(DiagnosticMessageType.Pass, '');
     }
     public getMessagePrefix(status: TestStatus): string | undefined {

src/client/unittests/display/main.ts

@@ -5,7 +5,7 @@ import { IApplicationShell, ICommandManager } from '../../common/application/typ
 import * as constants from '../../common/constants';
 import { isNotInstalledError } from '../../common/helpers';
 import { IConfigurationService } from '../../common/types';
-import { UnitTests } from '../../common/utils/localize';
+import { Testing } from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
 import { IServiceContainer } from '../../ioc/types';
 import { captureTelemetry } from '../../telemetry';
@@ -171,11 +171,11 @@ export class TestResultDisplay implements ITestResultDisplay {
         }
 
         if (!haveTests && !quietMode) {
-            this.appShell.showInformationMessage('No tests discovered, please check the configuration settings for the tests.', UnitTests.disableTests(), UnitTests.configureTests()).then(item => {
-                if (item === UnitTests.disableTests()) {
+            this.appShell.showInformationMessage('No tests discovered, please check the configuration settings for the tests.', Testing.disableTests(), Testing.configureTests()).then(item => {
+                if (item === Testing.disableTests()) {
                     this.disableTests()
                         .catch(ex => console.error('Python Extension: disableTests', ex));
-                } else if (item === UnitTests.configureTests()) {
+                } else if (item === Testing.configureTests()) {
                     this.cmdManager.executeCommand(constants.Commands.Tests_Configure, undefined, undefined, undefined).then(noop);
                 }
             });

src/test/unittests/display/main.unit.test.ts

@@ -13,7 +13,7 @@ import { Commands } from '../../../client/common/constants';
 import '../../../client/common/extensions';
 import { IConfigurationService, IPythonSettings, IUnitTestSettings } from '../../../client/common/types';
 import { createDeferred } from '../../../client/common/utils/async';
-import { UnitTests } from '../../../client/common/utils/localize';
+import { Testing } from '../../../client/common/utils/localize';
 import { noop } from '../../../client/common/utils/misc';
 import { IServiceContainer } from '../../../client/ioc/types';
 import { CANCELLATION_REASON } from '../../../client/unittests/common/constants';
@@ -298,7 +298,7 @@ suite('Unit Tests - TestResultDisplay', () => {
 
         const tests = typeMoq.Mock.ofType<Tests>();
         appShell.setup(a => a.showInformationMessage(typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny()))
-            .returns(() => Promise.resolve(UnitTests.disableTests()))
+            .returns(() => Promise.resolve(Testing.disableTests()))
             .verifiable(typeMoq.Times.once());
 
         for (const setting of ['unitTest.promptToConfigure', 'unitTest.pyTestEnabled',
@@ -335,7 +335,7 @@ suite('Unit Tests - TestResultDisplay', () => {
 
         const tests = typeMoq.Mock.ofType<Tests>();
         appShell.setup(a => a.showInformationMessage(typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny()))
-            .returns(() => Promise.resolve(UnitTests.configureTests()))
+            .returns(() => Promise.resolve(Testing.configureTests()))
             .verifiable(typeMoq.Times.once());
 
         const undefinedArg = typeMoq.It.isValue(undefined);

src/test/unittests/unittest/unittest.diagnosticService.unit.test.ts

@@ -24,7 +24,7 @@ suite('UnitTestDiagnosticService: unittest', () => {
         suiteSetup(() => {
             actualPrefix = diagnosticService.getMessagePrefix(TestStatus.Error)!;
             actualSeverity = diagnosticService.getSeverity(PythonUnitTestMessageSeverity.Error)!;
-            expectedPrefix = localize.UnitTests.testErrorDiagnosticMessage();
+            expectedPrefix = localize.Testing.testErrorDiagnosticMessage();
             expectedSeverity = DiagnosticSeverity.Error;
         });
         test('Message Prefix', () => {
@@ -42,7 +42,7 @@ suite('UnitTestDiagnosticService: unittest', () => {
         suiteSetup(() => {
             actualPrefix = diagnosticService.getMessagePrefix(TestStatus.Fail)!;
             actualSeverity = diagnosticService.getSeverity(PythonUnitTestMessageSeverity.Failure)!;
-            expectedPrefix = localize.UnitTests.testFailDiagnosticMessage();
+            expectedPrefix = localize.Testing.testFailDiagnosticMessage();
             expectedSeverity = DiagnosticSeverity.Error;
         });
         test('Message Prefix', () => {
@@ -60,7 +60,7 @@ suite('UnitTestDiagnosticService: unittest', () => {
         suiteSetup(() => {
             actualPrefix = diagnosticService.getMessagePrefix(TestStatus.Skipped)!;
             actualSeverity = diagnosticService.getSeverity(PythonUnitTestMessageSeverity.Skip)!;
-            expectedPrefix = localize.UnitTests.testSkippedDiagnosticMessage();
+            expectedPrefix = localize.Testing.testSkippedDiagnosticMessage();
             expectedSeverity = DiagnosticSeverity.Information;
         });
         test('Message Prefix', () => {