more corrections

Author: Kartik Raj

src/client/unittests/explorer/commandHandlers.ts

@@ -21,7 +21,8 @@ import { ITestDataItemResource, TestDataItem } from '../types';
 const testNavigationCommandMapping = {
     [TestType.testFile]: Commands.navigateToTestFile,
     [TestType.testFunction]: Commands.navigateToTestFunction,
-    [TestType.testSuite]: Commands.navigateToTestSuite
+    [TestType.testSuite]: Commands.navigateToTestSuite,
+    [TestType.testFolder]: undefined
 };
 
 @injectable()

src/client/unittests/pytest/services/testMessageService.ts

@@ -107,14 +107,15 @@ export class TestMessageService implements ITestMessageService {
         testSourceFilePath = path.isAbsolute(testSourceFilePath) ? testSourceFilePath : path.resolve(rootDirectory, testSourceFilePath);
         const testSourceFileUri = Uri.file(testSourceFilePath);
         const testSourceFile = await workspace.openTextDocument(testSourceFileUri);
-        let testDefLine: TextLine | undefined;
+        let testDefLine: TextLine | null = null;
         let lineNum = testFunction.testFunction.line!;
         let lineText: string = '';
         let trimmedLineText: string = '';
         const testDefPrefix = 'def ';
         const testAsyncDefPrefix = 'async def ';
         let prefix = '';
-        while (testDefLine === undefined) {
+
+        while (testDefLine === null) {
             const possibleTestDefLine = testSourceFile.lineAt(lineNum);
             lineText = possibleTestDefLine.text;
             trimmedLineText = lineText.trimLeft()!;
@@ -204,7 +205,7 @@ export class TestMessageService implements ITestMessageService {
                 const lineClassName = matches ? matches[0] : undefined;
 
                 // Check if the indentation is proper.
-                if (parentIndentation === undefined) {
+                if (parentIndentation === -1) {
                     // The parentIndentation hasn't been set yet, so we are looking for a class that was
                     // defined in the global scope of the module.
                     if (trimmedLineText.length === lineText.length) {
@@ -227,7 +228,7 @@ export class TestMessageService implements ITestMessageService {
                         parentScopeEndIndex = index + 1;
                         continue;
                     }
-                    if (prevLowestIndentation === undefined || indentation < prevLowestIndentation) {
+                    if (prevLowestIndentation === -1 || indentation < prevLowestIndentation) {
                         if (lineClassName === suiteName) {
                             // This might be the line that we want.
                             suiteDefLineIndex = index;
@@ -239,19 +240,19 @@ export class TestMessageService implements ITestMessageService {
                     }
                 }
             }
-            if (suiteDefLineIndex === undefined) {
+            if (suiteDefLineIndex === -1) {
                 // Could not find the suite declaration line, so give up and move on with the latest one that we found.
                 break;
             }
             // Found the line to process.
             parentScopeStartIndex = suiteDefLineIndex;
-            parentIndentation = indentation;
+            parentIndentation = indentation!;
 
             // Invert the index to get the unreversed equivalent.
             const realIndex = (reversedTestFileLines.length - 1) - suiteDefLineIndex;
-            const startChar = indentation + classPrefix.length;
+            const startChar = indentation! + classPrefix.length;
             const suiteStartPos = new Position(realIndex, startChar);
-            const suiteEndPos = new Position(realIndex, (startChar + suiteName.length));
+            const suiteEndPos = new Position(realIndex, (startChar + suiteName!.length));
             const suiteRange = new Range(suiteStartPos, suiteEndPos);
             const suiteLocation = new Location(testFileUri, suiteRange);
             suiteLocationStackFrameDetails.push({ location: suiteLocation, lineText: testFile.getText(suiteRange) });

src/client/unittests/types.ts

@@ -133,7 +133,7 @@ export interface IPythonUnitTestMessage {
     provider: string | undefined;
     traceback?: string;
     testTime: number;
-    status: TestStatus;
+    status?: TestStatus;
     locationStack?: ILocationStackFrameDetails[];
     testFilePath: string;
 }