Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7d964f1
Initial work on testingProvider
PascalSenn Feb 10, 2022
ed20ac3
Optimize scheduling
PascalSenn Feb 10, 2022
4715cb7
Add support for multiple target frameworks
PascalSenn Feb 10, 2022
bb58497
Fixed TSLint
PascalSenn Feb 10, 2022
12dec00
Merge branch 'master' into pse/add-test-manager-integration
PascalSenn Feb 10, 2022
7f08164
Performance improvement
PascalSenn Feb 10, 2022
a998b02
Merge branch 'pse/add-test-manager-integration' of github.com:PascalS…
PascalSenn Feb 10, 2022
b148df7
Fix format
PascalSenn Feb 11, 2022
9fd17d2
Fix format
PascalSenn Feb 11, 2022
868e006
Fix format
PascalSenn Feb 11, 2022
c03a807
Resolve comments
PascalSenn Feb 11, 2022
cf2cebf
Cleanup
PascalSenn Feb 11, 2022
fe45111
Cleanup
PascalSenn Feb 11, 2022
86da058
Merge branch 'pse/add-test-manager-integration' of github.com:PascalS…
PascalSenn Feb 11, 2022
736d99f
Allow multi frameworks
PascalSenn Feb 11, 2022
e5362bf
Improve batching
PascalSenn Feb 11, 2022
22ae581
Improve target framework support
PascalSenn Feb 11, 2022
cb84449
Add directory structure to tests
PascalSenn Feb 12, 2022
331d582
Add concurrently loading of projects
PascalSenn Feb 12, 2022
0aded0a
Improve batching of multiple target frameworks
PascalSenn Feb 12, 2022
0609694
Cleanup
PascalSenn Feb 12, 2022
fd413d1
Improve inline updates of tests
PascalSenn Feb 12, 2022
bfd8940
Improve test discovery
PascalSenn Feb 12, 2022
88288ad
Improve project load batching
PascalSenn Feb 12, 2022
5a8a612
Improve test explorer update;
PascalSenn Feb 12, 2022
4268a5b
fix: generate os independent folder tree
retterbot Feb 16, 2022
53abc87
fix: use fsPath rather than path for cross platform compatibility
retterbot Feb 16, 2022
ad24f72
Improve feedback of build errors
PascalSenn Feb 18, 2022
5319638
fix: duplicate test assembly node on windows
retterbot Feb 19, 2022
85094ef
fix: adapter typo
retterbot Feb 19, 2022
8822cb9
Merge branch 'master' into pse/add-test-manager-integration
retterbot Feb 19, 2022
04eff8c
Merge branch 'master' into pse/add-test-manager-integration
PascalSenn Mar 20, 2022
dab4f42
Merge branch 'pse/add-test-manager-integration' of github.com:PascalS…
PascalSenn Mar 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9,377 changes: 16 additions & 9,361 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"@types/semver": "5.5.0",
"@types/tmp": "0.0.33",
"@types/unzipper": "^0.9.1",
"@types/vscode": "1.58.0",
"@types/vscode": "1.59.0",
"@types/yauzl": "2.9.1",
"archiver": "5.3.0",
"chai": "4.3.4",
Expand Down
8 changes: 4 additions & 4 deletions src/features/dotnetTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,15 @@ export default class TestManager extends AbstractProvider {
return targetFrameworkVersion;
}

public async discoverTests(fileName: string, testFrameworkName: string, noBuild: boolean): Promise<protocol.V2.TestInfo[]> {

let targetFrameworkVersion = await this._recordRunAndGetFrameworkVersion(fileName, testFrameworkName);
public async discoverTests(fileName: string, testFrameworkName: string, noBuild: boolean, targetFrameworkVersion: string = null): Promise<protocol.V2.TestInfo[]> {
let runSettings = this._getRunSettings(fileName);

const request: protocol.V2.DiscoverTestsRequest = {
FileName: fileName,
RunSettings: runSettings,
TestFrameworkName: testFrameworkName,
TargetFrameworkVersion: targetFrameworkVersion,
TargetFrameworkVersion: targetFrameworkVersion ??
await this._recordRunAndGetFrameworkVersion(fileName, testFrameworkName),
NoBuild: noBuild
};

Expand Down Expand Up @@ -247,6 +246,7 @@ export default class TestManager extends AbstractProvider {
try {
let results = await this._runTestsInClass(fileName, runSettings, testFrameworkName, targetFrameworkVersion, methodsInClass, noBuild);
this._eventStream.post(new ReportDotNetTestResults(results));
return results;
}
catch (reason) {
this._eventStream.post(new DotNetTestRunFailure(reason));
Expand Down
Loading