Skip to content

Commit a0d8d77

Browse files
ericsnowcurrentlyericsnowcurrently
authored
Fix testing-related user-facing messages. (microsoft#5108)
1 parent e17c0d2 commit a0d8d77

6 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎package.nls.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,11 @@
214214
"debug.attachRemoteHostTitle": "Remote Debugging",
215215
"debug.attachRemoteHostPrompt": "Enter a host name or IP address",
216216
"debug.attachRemoteHostValidationError": "Enter a valid host name or IP address",
217-
"UnitTests.testErrorDiagnosticMessage": "Error",
218-
"UnitTests.testFailDiagnosticMessage": "Fail",
219-
"UnitTests.testSkippedDiagnosticMessage": "Skipped",
220-
"UnitTests.configureTests": "Configure Test Framework",
221-
"UnitTests.disableTests": "Disable Tests",
217+
"Testing.testErrorDiagnosticMessage": "Error",
218+
"Testing.testFailDiagnosticMessage": "Fail",
219+
"Testing.testSkippedDiagnosticMessage": "Skipped",
220+
"Testing.configureTests": "Configure Test Framework",
221+
"Testing.disableTests": "Disable Tests",
222222
"Common.openOutputPanel": "Show output",
223223
"LanguageService.downloadFailedOutputMessage": "download failed",
224224
"LanguageService.extractionFailedOutputMessage": "extraction failed",

‎src/client/common/utils/localize.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,12 @@ export namespace DebugConfigurationPrompts {
193193
export const launchJsonConfigurationsCompletionDescription = localize('debug.launchJsonConfigurationsCompletionDescription', 'Select a debug configuration');
194194
}
195195

196-
export namespace UnitTests {
197-
export const testErrorDiagnosticMessage = localize('UnitTests.testErrorDiagnosticMessage', 'Error');
198-
export const testFailDiagnosticMessage = localize('UnitTests.testFailDiagnosticMessage', 'Fail');
199-
export const testSkippedDiagnosticMessage = localize('UnitTests.testSkippedDiagnosticMessage', 'Skipped');
200-
export const configureTests = localize('UnitTests.configureTests', 'Configure Test Framework');
201-
export const disableTests = localize('UnitTests.disableTests', 'Disable Tests');
196+
export namespace Testing {
197+
export const testErrorDiagnosticMessage = localize('Testing.testErrorDiagnosticMessage', 'Error');
198+
export const testFailDiagnosticMessage = localize('Testing.testFailDiagnosticMessage', 'Fail');
199+
export const testSkippedDiagnosticMessage = localize('Testing.testSkippedDiagnosticMessage', 'Skipped');
200+
export const configureTests = localize('Testing.configureTests', 'Configure Test Framework');
201+
export const disableTests = localize('Testing.disableTests', 'Disable Tests');
202202
}
203203

204204
// Skip using vscode-nls and instead just compute our strings based on key values. Key values

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ export class UnitTestDiagnosticService implements IUnitTestDiagnosticService {
2424
this.MessageSeverities.set(PythonUnitTestMessageSeverity.Failure, DiagnosticSeverity.Error);
2525
this.MessageSeverities.set(PythonUnitTestMessageSeverity.Skip, DiagnosticSeverity.Information);
2626
this.MessageSeverities.set(PythonUnitTestMessageSeverity.Pass, undefined);
27-
this.MessagePrefixes.set(DiagnosticMessageType.Error, localize.UnitTests.testErrorDiagnosticMessage());
28-
this.MessagePrefixes.set(DiagnosticMessageType.Fail, localize.UnitTests.testFailDiagnosticMessage());
29-
this.MessagePrefixes.set(DiagnosticMessageType.Skipped, localize.UnitTests.testSkippedDiagnosticMessage());
27+
this.MessagePrefixes.set(DiagnosticMessageType.Error, localize.Testing.testErrorDiagnosticMessage());
28+
this.MessagePrefixes.set(DiagnosticMessageType.Fail, localize.Testing.testFailDiagnosticMessage());
29+
this.MessagePrefixes.set(DiagnosticMessageType.Skipped, localize.Testing.testSkippedDiagnosticMessage());
3030
this.MessagePrefixes.set(DiagnosticMessageType.Pass, '');
3131
}
3232
public getMessagePrefix(status: TestStatus): string | undefined {

‎src/client/unittests/display/main.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { IApplicationShell, ICommandManager } from '../../common/application/typ
55
import * as constants from '../../common/constants';
66
import { isNotInstalledError } from '../../common/helpers';
77
import { IConfigurationService } from '../../common/types';
8-
import { UnitTests } from '../../common/utils/localize';
8+
import { Testing } from '../../common/utils/localize';
99
import { noop } from '../../common/utils/misc';
1010
import { IServiceContainer } from '../../ioc/types';
1111
import { captureTelemetry } from '../../telemetry';
@@ -171,11 +171,11 @@ export class TestResultDisplay implements ITestResultDisplay {
171171
}
172172

173173
if (!haveTests && !quietMode) {
174-
this.appShell.showInformationMessage('No tests discovered, please check the configuration settings for the tests.', UnitTests.disableTests(), UnitTests.configureTests()).then(item => {
175-
if (item === UnitTests.disableTests()) {
174+
this.appShell.showInformationMessage('No tests discovered, please check the configuration settings for the tests.', Testing.disableTests(), Testing.configureTests()).then(item => {
175+
if (item === Testing.disableTests()) {
176176
this.disableTests()
177177
.catch(ex => console.error('Python Extension: disableTests', ex));
178-
} else if (item === UnitTests.configureTests()) {
178+
} else if (item === Testing.configureTests()) {
179179
this.cmdManager.executeCommand(constants.Commands.Tests_Configure, undefined, undefined, undefined).then(noop);
180180
}
181181
});

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Commands } from '../../../client/common/constants';
1313
import '../../../client/common/extensions';
1414
import { IConfigurationService, IPythonSettings, IUnitTestSettings } from '../../../client/common/types';
1515
import { createDeferred } from '../../../client/common/utils/async';
16-
import { UnitTests } from '../../../client/common/utils/localize';
16+
import { Testing } from '../../../client/common/utils/localize';
1717
import { noop } from '../../../client/common/utils/misc';
1818
import { IServiceContainer } from '../../../client/ioc/types';
1919
import { CANCELLATION_REASON } from '../../../client/unittests/common/constants';
@@ -298,7 +298,7 @@ suite('Unit Tests - TestResultDisplay', () => {
298298

299299
const tests = typeMoq.Mock.ofType<Tests>();
300300
appShell.setup(a => a.showInformationMessage(typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny()))
301-
.returns(() => Promise.resolve(UnitTests.disableTests()))
301+
.returns(() => Promise.resolve(Testing.disableTests()))
302302
.verifiable(typeMoq.Times.once());
303303

304304
for (const setting of ['unitTest.promptToConfigure', 'unitTest.pyTestEnabled',
@@ -335,7 +335,7 @@ suite('Unit Tests - TestResultDisplay', () => {
335335

336336
const tests = typeMoq.Mock.ofType<Tests>();
337337
appShell.setup(a => a.showInformationMessage(typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny(), typeMoq.It.isAny()))
338-
.returns(() => Promise.resolve(UnitTests.configureTests()))
338+
.returns(() => Promise.resolve(Testing.configureTests()))
339339
.verifiable(typeMoq.Times.once());
340340

341341
const undefinedArg = typeMoq.It.isValue(undefined);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ suite('UnitTestDiagnosticService: unittest', () => {
2424
suiteSetup(() => {
2525
actualPrefix = diagnosticService.getMessagePrefix(TestStatus.Error)!;
2626
actualSeverity = diagnosticService.getSeverity(PythonUnitTestMessageSeverity.Error)!;
27-
expectedPrefix = localize.UnitTests.testErrorDiagnosticMessage();
27+
expectedPrefix = localize.Testing.testErrorDiagnosticMessage();
2828
expectedSeverity = DiagnosticSeverity.Error;
2929
});
3030
test('Message Prefix', () => {
@@ -42,7 +42,7 @@ suite('UnitTestDiagnosticService: unittest', () => {
4242
suiteSetup(() => {
4343
actualPrefix = diagnosticService.getMessagePrefix(TestStatus.Fail)!;
4444
actualSeverity = diagnosticService.getSeverity(PythonUnitTestMessageSeverity.Failure)!;
45-
expectedPrefix = localize.UnitTests.testFailDiagnosticMessage();
45+
expectedPrefix = localize.Testing.testFailDiagnosticMessage();
4646
expectedSeverity = DiagnosticSeverity.Error;
4747
});
4848
test('Message Prefix', () => {
@@ -60,7 +60,7 @@ suite('UnitTestDiagnosticService: unittest', () => {
6060
suiteSetup(() => {
6161
actualPrefix = diagnosticService.getMessagePrefix(TestStatus.Skipped)!;
6262
actualSeverity = diagnosticService.getSeverity(PythonUnitTestMessageSeverity.Skip)!;
63-
expectedPrefix = localize.UnitTests.testSkippedDiagnosticMessage();
63+
expectedPrefix = localize.Testing.testSkippedDiagnosticMessage();
6464
expectedSeverity = DiagnosticSeverity.Information;
6565
});
6666
test('Message Prefix', () => {

0 commit comments

Comments
 (0)