From 65639c04bef009ed7a4280adf493cd3bf13be335 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Tue, 14 Dec 2021 15:22:01 +0800 Subject: [PATCH] fix: Use
to break lines in test message (#1345) --- package-lock.json | 6 +++--- package.json | 4 ++-- src/controller/testController.ts | 1 + src/runners/baseRunner/RunnerResultAnalyzer.ts | 6 +++--- src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 540ca324..e1f460c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -226,9 +226,9 @@ } }, "@types/vscode": { - "version": "1.61.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz", - "integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==", + "version": "1.63.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.63.0.tgz", + "integrity": "sha512-iePu1axOi5WSThV6l2TYcciBIpAlMarjBC8H0y8L8ocsZLxh7MttzwFU3pjoItF5fRVGxHS0Hsvje9jO3yJsfw==", "dev": true }, "@ungap/promise-all-settled": { diff --git a/package.json b/package.json index cc15338e..1a9e2f2b 100644 --- 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 index 29d5fbd5..1ffb03cb 100644 --- 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 index bd0b0e0c..43a64760 100644 --- 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, '>')); + // '<' & '>' will be escaped when displaying the test message, so replacing them to '[' & ']'. + traces.appendText(data.replace(//g, ']')); } - traces.appendText('\n'); + traces.appendMarkdown('
'); } } diff --git a/src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts b/src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts index 89dbd6ca..a6c253d0 100644 --- 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) {