fix: Use <br> to break lines in test message (#1345)

microsoft · Dec 14, 2021 · 65639c0 · 65639c0
1 parent 0a23541
commit 65639c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     ],
     "aiKey": "90c182a8-8dab-45d4-bfb8-1353eb55aa7f",
     "engines": {
-        "vscode": "^1.61.0"
+        "vscode": "^1.63.0"
     },
     "categories": [
         "Testing"
@@ -424,7 +424,7 @@
         "@types/mocha": "^9.0.0",
         "@types/node": "^14.14.33",
         "@types/sinon": "^10.0.6",
-        "@types/vscode": "1.61.0",
+        "@types/vscode": "1.63.0",
         "glob": "^7.2.0",
         "mocha": "^9.1.2",
         "sinon": "^11.1.2",

diff --git a/src/controller/testController.ts b/src/controller/testController.ts
@@ -273,6 +273,7 @@ async function getIncludedItems(request: TestRunRequest, token?: CancellationTok
    }
    removeTestInvocations(testItems);
    testItems = await expandTests(testItems, TestLevel.Class, token);
+   // @ts-expect-error
    const excludingItems: TestItem[] = await expandTests(request.exclude || [], TestLevel.Class, token);
    testItems = _.differenceBy(testItems, excludingItems, 'id');
    return testItems;

diff --git a/src/runners/baseRunner/RunnerResultAnalyzer.ts b/src/runners/baseRunner/RunnerResultAnalyzer.ts
@@ -31,9 +31,9 @@ export abstract class RunnerResultAnalyzer {
                 }
             }
         } else {
-            // in case the message contains message like: 'expected: <..> but was: <..>'
-            traces.appendText(data.replace(/</g, '&lt;').replace(/>/g, '&gt;'));
+            // '<' & '>' will be escaped when displaying the test message, so replacing them to '[' & ']'.
+            traces.appendText(data.replace(/</g, '[').replace(/>/g, ']'));
         }
-        traces.appendText('\n');
+        traces.appendMarkdown('<br/>');
     }
 }
diff --git a/src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts b/src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts
@@ -109,6 +109,7 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
         } else if (data.startsWith(MessageId.TraceStart)) {
             this.traces = new MarkdownString();
             this.traces.isTrusted = true;
+            this.traces.supportHtml = true;
             this.recordingType = RecordingType.StackTrace;
         } else if (data.startsWith(MessageId.TraceEnd)) {
             if (!this.currentItem) {