Only pass non-passing values to UnitTestDiagnosticService.

Author: ericsnowcurrently

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

@@ -6,34 +6,37 @@
 import { injectable } from 'inversify';
 import { DiagnosticSeverity } from 'vscode';
 import * as localize from '../../../common/utils/localize';
-import { DiagnosticMessageType, ITestDiagnosticService, PythonTestMessageSeverity } from '../../types';
-import { TestStatus } from '../types';
+import {
+    DiagnosticMessageType,
+    NonPassingTestMessageType,
+    ITestDiagnosticService,
+    NonPassingTestSeverity,
+    PythonTestMessageSeverity,
+} from '../../types';
+import { NonPassingTestStatus, TestStatus } from '../types';
 
 @injectable()
 export class UnitTestDiagnosticService implements ITestDiagnosticService {
-    private MessageTypes = new Map<TestStatus, DiagnosticMessageType>();
-    private MessageSeverities = new Map<PythonTestMessageSeverity, DiagnosticSeverity | undefined>();
-    private MessagePrefixes = new Map<DiagnosticMessageType, string>();
+    private MessageTypes = new Map<NonPassingTestStatus, NonPassingTestMessageType>();
+    private MessageSeverities = new Map<NonPassingTestSeverity, DiagnosticSeverity | undefined>();
+    private MessagePrefixes = new Map<NonPassingTestMessageType, string>();
 
     constructor() {
         this.MessageTypes.set(TestStatus.Error, DiagnosticMessageType.Error);
         this.MessageTypes.set(TestStatus.Fail, DiagnosticMessageType.Fail);
         this.MessageTypes.set(TestStatus.Skipped, DiagnosticMessageType.Skipped);
-        this.MessageTypes.set(TestStatus.Pass, DiagnosticMessageType.Pass);
         this.MessageSeverities.set(PythonTestMessageSeverity.Error, DiagnosticSeverity.Error);
         this.MessageSeverities.set(PythonTestMessageSeverity.Failure, DiagnosticSeverity.Error);
         this.MessageSeverities.set(PythonTestMessageSeverity.Skip, DiagnosticSeverity.Information);
-        this.MessageSeverities.set(PythonTestMessageSeverity.Pass, undefined);
         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 {
+    public getMessagePrefix(status: NonPassingTestStatus): string | undefined {
         const msgType = this.MessageTypes.get(status);
         return msgType !== undefined ? this.MessagePrefixes.get(msgType) : undefined;
     }
-    public getSeverity(unitTestSeverity: PythonTestMessageSeverity): DiagnosticSeverity | undefined {
+    public getSeverity(unitTestSeverity: NonPassingTestSeverity): DiagnosticSeverity | undefined {
         return this.MessageSeverities.get(unitTestSeverity);
     }
 }

src/test/testing/pytest/pytest.run.test.ts

@@ -29,6 +29,8 @@ import { CommandSource } from '../../../client/testing/common/constants';
 import { UnitTestDiagnosticService } from '../../../client/testing/common/services/unitTestDiagnosticService';
 import {
     FlattenedTestFunction,
+    isNonPassingTestStatus,
+    NonPassingTestStatus,
     ITestManager,
     ITestManagerFactory,
     Tests,
@@ -274,7 +276,8 @@ async function getExpectedDiagnosticFromTestDetails(testDetails: ITestDetails):
         expectedSourceTestFilePath = path.join(UNITTEST_TEST_FILES_PATH, testDetails.sourceFileName!);
     }
     const expectedSourceTestFileUri = vscode.Uri.file(expectedSourceTestFilePath);
-    const diagMsgPrefix = new UnitTestDiagnosticService().getMessagePrefix(testDetails.status);
+    assert.ok(isNonPassingTestStatus(testDetails.status));
+    const diagMsgPrefix = new UnitTestDiagnosticService().getMessagePrefix(testDetails.status as NonPassingTestStatus);
     const expectedDiagMsg = `${diagMsgPrefix ? `${diagMsgPrefix}: ` : ''}${testDetails.message}`;
     let expectedDiagRange = testDetails.testDefRange;
     let expectedSeverity = vscode.DiagnosticSeverity.Error;