-
Notifications
You must be signed in to change notification settings - Fork 97
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Display test results in CodeLens #24
Changes from 3 commits
ab22289
e9ca54b
019450d
1b65c4e
83afd27
f38bfdc
d741e97
a75d816
c816619
10bef7b
59e8e66
5c4eda9
89baa35
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ import { TreeDataProvider, TreeItem, TreeItemCollapsibleState } from "vscode"; | |
import { AppInsightsClient } from "./appInsightsClient"; | ||
import { Executor } from "./executor"; | ||
import { TestNode } from "./testNode"; | ||
import { TestResultsFile } from "./testResultsFile"; | ||
import { Utility } from "./utility"; | ||
|
||
export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | ||
|
@@ -16,7 +17,7 @@ export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | |
*/ | ||
private testDirectoryPath: string; | ||
|
||
constructor(private context: vscode.ExtensionContext) {} | ||
constructor(private context: vscode.ExtensionContext, private resultsFile : TestResultsFile) { } | ||
|
||
/** | ||
* @description | ||
|
@@ -41,7 +42,7 @@ export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | |
*/ | ||
public runAllTests(): void { | ||
this.evaluateTestDirectory(); | ||
Executor.runInTerminal(`dotnet test${this.checkBuildOption()}${this.checkRestoreOption()}`, this.testDirectoryPath); | ||
Executor.runInTerminal(`dotnet test${this.getDotNetTestOptions()}${this.outputTestResults()}`, this.testDirectoryPath); | ||
AppInsightsClient.sendEvent("runAllTests"); | ||
} | ||
|
||
|
@@ -53,7 +54,7 @@ export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | |
* to do a restore, so it can be very slow. | ||
*/ | ||
public runTest(test: TestNode): void { | ||
Executor.runInTerminal(`dotnet test${this.checkBuildOption()}${this.checkRestoreOption()} --filter FullyQualifiedName~${test.fullName}`, this.testDirectoryPath); | ||
Executor.runInTerminal(`dotnet test${this.getDotNetTestOptions()}${this.outputTestResults()} --filter FullyQualifiedName~${test.fullName}`, this.testDirectoryPath); | ||
AppInsightsClient.sendEvent("runTest"); | ||
} | ||
|
||
|
@@ -175,6 +176,22 @@ export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | |
return option ? "" : " --no-restore"; | ||
} | ||
|
||
/** | ||
* @description | ||
* Gets the options for build/restore before running tests. | ||
*/ | ||
private getDotNetTestOptions(): string { | ||
return this.checkBuildOption() + this.checkRestoreOption(); | ||
} | ||
|
||
/** | ||
* @description | ||
* Gets the dotnet test argument to speicfy the output for the test results. | ||
*/ | ||
private outputTestResults(): string { | ||
return " --logger 'trx;LogFileName=" + this.resultsFile.fileName + "'"; | ||
} | ||
|
||
/** | ||
* @description | ||
* Checks to see if the options specify a directory to run the | ||
|
@@ -198,7 +215,7 @@ export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | |
return new Promise((c, e) => { | ||
try { | ||
const results = Executor | ||
.execSync(`dotnet test -t -v=q${this.checkBuildOption()}${this.checkRestoreOption()}`, this.testDirectoryPath) | ||
.execSync(`dotnet test -t -v=q${this.getDotNetTestOptions()}`, this.testDirectoryPath) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You did not add There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, please ignore. It only lists the tests. |
||
.split(/[\r\n]+/g) | ||
/* | ||
* The dotnet-cli prefixes all discovered unit tests | ||
|
@@ -207,7 +224,7 @@ export class DotnetTestExplorer implements TreeDataProvider<TestNode> { | |
* structures. | ||
**/ | ||
.filter((item) => item && item.startsWith(" ")) | ||
.sort((a, b) => a > b ? 1 : b > a ? - 1 : 0 ) | ||
.sort((a, b) => a > b ? 1 : b > a ? - 1 : 0) | ||
.map((item) => item.trim()); | ||
|
||
c(results); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
export class TestResult { | ||
public constructor(private _name: string, private _outcome: string) { | ||
} | ||
|
||
public get testName(): string { | ||
return this._name; | ||
} | ||
|
||
public get outcome(): string { | ||
return this._outcome; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
"use strict"; | ||
import * as fs from "fs"; | ||
import * as path from "path"; | ||
import { Disposable, EventEmitter, Event } from "vscode"; | ||
import { setTimeout } from "timers"; | ||
import { DOMParser } from "xmldom"; | ||
import { TestResult } from "./testResult" | ||
|
||
function getAttributeValue(node, name: string): string { | ||
let attribute = node.attributes.getNamedItem(name); | ||
return (attribute === null) ? null : attribute.nodeValue; | ||
} | ||
|
||
export class TestResultsFile implements Disposable { | ||
private static readonly ResultsFileName = "TestExplorerResults.trx"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What if we have multiple test project opened in different VS Code? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm now using a temporary random folder to store the results, so now works across multiple instances |
||
private onNewResultsEmitter = new EventEmitter<TestResult[]>(); | ||
private resultsFile: string; | ||
private watcher: fs.FSWatcher; | ||
|
||
public constructor() { | ||
const tempFolder = process.platform === "win32" ? process.env["TEMP"] : "/tmp"; | ||
this.resultsFile = path.join(tempFolder, TestResultsFile.ResultsFileName); | ||
|
||
// The change event gets called multiple times, so use a one-second | ||
// delay before we read anything to avoid doing too much work | ||
let me = this; | ||
let timeout: NodeJS.Timer; | ||
this.watcher = fs.watch(tempFolder, (eventType, fileName) => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only do this when 'showCodeLens' is true There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch, done |
||
if ((fileName == TestResultsFile.ResultsFileName) && (eventType == "change")) { | ||
if (!timeout) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you could use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure that does the same thing, as it a timeout previously established by calling There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you could refer to https://github.com/formulahendry/vscode-docker-explorer/blob/master/src/dockerTreeBase.ts#L21:31 The logic should be similar. When the test is running, I guess the trx file will be changed continuously. I am not sure whether the TRX will always be a valid XML and could be read normally during the test is running. If it is, I think current implementation is good, since we could have a quick update when test is running. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Like it, done! 😄 |
||
timeout = setTimeout(() => { | ||
timeout = null; | ||
me.parseResults(); | ||
}, 1000); | ||
} | ||
} | ||
}); | ||
} | ||
|
||
public dispose(): void { | ||
try { | ||
this.watcher.close(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also handle when when 'showCodeLens' is false |
||
fs.unlinkSync(this.resultsFile); | ||
} catch { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. miss There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added |
||
} | ||
} | ||
|
||
public get fileName(): string { | ||
return this.resultsFile; | ||
} | ||
|
||
public get onNewResults(): Event<TestResult[]> { | ||
return this.onNewResultsEmitter.event; | ||
} | ||
|
||
private parseResults(): void { | ||
console.log("Loading test results file '%s'", this.resultsFile); | ||
const emitter = this.onNewResultsEmitter | ||
fs.readFile(this.resultsFile, (err, data) => { | ||
if (err) { | ||
console.log("Error reading test results file: '%s'", err); | ||
} else { | ||
let results: TestResult[] = []; | ||
const xdoc = new DOMParser().parseFromString(data.toString(), "application/xml"); | ||
const nodes = xdoc.documentElement.getElementsByTagName("UnitTestResult"); | ||
for (var i = 0; i < nodes.length; i++) { | ||
results.push(new TestResult( | ||
getAttributeValue(nodes[i], "testName"), | ||
getAttributeValue(nodes[i], "outcome") | ||
)); | ||
} | ||
|
||
emitter.fire(results); | ||
} | ||
}); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
"use strict"; | ||
import { CodeLens, Range } from "vscode"; | ||
|
||
export class TestStatusCodeLens extends CodeLens { | ||
public constructor(range: Range, status: string) { | ||
super(range); | ||
|
||
this.command = { | ||
title: status, | ||
command: null | ||
}; | ||
} | ||
|
||
public static parseOutcome(outcome: string): string { | ||
if (outcome === "Passed") { | ||
return "✔️"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Test on macOS, it is showing a black check mark (https://emojipedia.org/heavy-check-mark/) which is hard to see.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've added settings now so the user can override what we display. I've kept the heavy check mark for platforms apart from OS X, in which case it uses the white heavy check mark (I'm not a big fan of it, but I can't find any alternatives). Since the user can specify the text, they could even switch to "passing", "FAILING" etc if they want so hopefully this is OK? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks great to me! |
||
} else if (outcome === "Failed") { | ||
return "❌"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, using unicode: https://emojipedia.org/cross-mark/ |
||
} else if (outcome === "NotExecuted") { | ||
return "️️⚠️"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, using unicode |
||
} else { | ||
return null; | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
"use strict"; | ||
import { CancellationToken, commands, CodeLens, CodeLensProvider, Disposable, Event, EventEmitter, Range, SymbolInformation, TextDocument, workspace, SymbolKind } from "vscode"; | ||
import { TestResult } from "./testResult"; | ||
import { TestResultsFile } from "./testResultsFile"; | ||
import { TestStatusCodeLens } from "./testStatusCodeLens"; | ||
|
||
export class TestStatusCodeLensProvider implements CodeLensProvider { | ||
private disposables: Disposable[] = []; | ||
private enabled: boolean; | ||
private onDidChangeCodeLensesEmitter = new EventEmitter<void>(); | ||
|
||
// Store everything in a map so we can remember old tests results for the | ||
// scenario where a single test is ran. If the test no longer exists in | ||
// code it will never be mapped to the symbol, so no harm (though there is | ||
// a memory impact) | ||
private testResults = new Map<string, TestResult>(); | ||
|
||
public constructor(testResultFile: TestResultsFile) { | ||
this.checkEnabledOption(); | ||
|
||
this.disposables.push( | ||
testResultFile.onNewResults(this.addTestResults, this)); | ||
|
||
this.disposables.push( | ||
workspace.onDidChangeConfiguration(this.checkEnabledOption, this)); | ||
} | ||
|
||
public dispose() { | ||
while (this.disposables.length) { | ||
this.disposables.pop().dispose(); | ||
} | ||
} | ||
|
||
public get onDidChangeCodeLenses(): Event<void> { | ||
return this.onDidChangeCodeLensesEmitter.event; | ||
} | ||
|
||
public provideCodeLenses(document: TextDocument, token: CancellationToken): CodeLens[] | Thenable<CodeLens[]> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Try with xUnit, NUnit and MSTest. Seems only xUnit is showing the test result icon. It would be great if you could also support NUnit and MSTest. 😃 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should now be fixed in the latest version, I've tried xUnit, MSTest and NUnit (the later two have the same format) |
||
if (!this.enabled) { | ||
return []; | ||
} | ||
|
||
const results = this.testResults; | ||
return commands.executeCommand<SymbolInformation[]>("vscode.executeDocumentSymbolProvider", document.uri) | ||
.then(symbols => { | ||
let mapped: CodeLens[] = []; | ||
for (let symbol of symbols.filter(x => x.kind === SymbolKind.Method)) { | ||
let fullName = symbol.containerName + '.' + symbol.name; | ||
for (let result of results.values()) { | ||
if (result.testName.endsWith(fullName)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The symbol provider doesn't return anything for the namespace and the container of the class is empty, so would need to look at perhaps using omni-sharp directly? There's actually an issue with the test discovery with NUnit that only lists the method names, so if two tests exist with the same method name in different classes, NUnit only returns one of them. Not sure how you want to approach this one? Accept it as a corner case until the extension uses omni-sharp to parse the files to discover the unit test methods? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this corner case could be accepted. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you have interest to look at omni-sharp or other approach, it is warmly welcome! You could send PR in the future. |
||
let state = TestStatusCodeLens.parseOutcome(result.outcome); | ||
if (state) { | ||
mapped.push(new TestStatusCodeLens(symbol.location.range, state)); | ||
} | ||
} | ||
} | ||
} | ||
|
||
return mapped; | ||
}); | ||
} | ||
|
||
public resolveCodeLens(codeLens: CodeLens, token: CancellationToken): CodeLens { | ||
return codeLens; | ||
} | ||
|
||
private addTestResults(results: TestResult[]) { | ||
for (let result of results) { | ||
this.testResults.set(result.testName, result); | ||
}; | ||
|
||
this.onDidChangeCodeLensesEmitter.fire(); | ||
} | ||
|
||
private checkEnabledOption(): void { | ||
this.enabled = workspace.getConfiguration("csharp").get<boolean>("testsCodeLens.enabled", true); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure it is better to add an extra boolean setting, in case user want to only show the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added an extra setting |
||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I test it on Windows, it is failed, After I change single quote to double quote, it is working. How about you?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It did work for me, but I've replaced with double quotes and it still works for me so hopefully that should fix it for you
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess you are using PowerShell. Both are working on PowerShell, while single quote does not work on CMD.