Skip to content
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.

Sign up for GitHub

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

Enable code coverage when "Code Coverage;arg1=val1;arg2=val2" is provided in cli #3172

Merged
merged 14 commits into from
Nov 16, 2021
Merged

Enable code coverage when "Code Coverage;arg1=val1;arg2=val2" is provided in cli #3172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
88da72d
Adding elements to code coverage config passed via commandline,
fhnaseer Nov 10, 2021
9207922
Adding tests,
fhnaseer Nov 11, 2021
3041a83
Update existing configuration if present,
fhnaseer Nov 11, 2021
016cb46
using correct tag for specifying output file format,
fhnaseer Nov 11, 2021
2036e5a
Merge remote-tracking branch 'origin/main' into dev/fhnaseer/cc-comma…
fhnaseer Nov 11, 2021
6325fae
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Nov 12, 2021
9d50fec
Merge remote-tracking branch 'origin/darc-main-f51f545b-6a53-4780-9c1…
fhnaseer Nov 12, 2021
7235856
fixing tests,
fhnaseer Nov 12, 2021
4412b40
fixing parameter name,
fhnaseer Nov 12, 2021
0cee134
Adding test for overriding format from settings file using collect co…
fhnaseer Nov 12, 2021
33f9698
Adding testadapterpath when additional config are provided for the fo…
fhnaseer Nov 16, 2021
0e6c690
Merging main,
fhnaseer Nov 16, 2021
34ce0cc
updating comment,
fhnaseer Nov 16, 2021
a6deec2
Adding string const,
fhnaseer Nov 16, 2021
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
8 changes: 7 additions & 1 deletion src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class VSTestTask : Task, ICancelableTask
private VSTestForwardingApp vsTestForwardingApp;

private const string vsTestAppName = "vstest.console.dll";
private const string CodeCovergaeString = "Code Coverage";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : misspelling

Suggested change
private const string CodeCovergaeString = "Code Coverage";
private const string CodeCoverageString= "Code Coverage";


public string TestFileFullPath
{
Expand Down Expand Up @@ -368,7 +369,12 @@ private List<string> AddArgs()
{
foreach (var arg in this.VSTestCollect)
{
if (arg.Equals("Code Coverage", StringComparison.OrdinalIgnoreCase))
// For collecting code coverage, argument value can be either "Code Coverage" or "Code Coverage;a=b;c=d".
// Split the argument with ';' and compare first token value.
var tokens = arg.Split(';');

if (arg.Equals(CodeCovergaeString, StringComparison.OrdinalIgnoreCase) ||
tokens[0].Equals(CodeCovergaeString, StringComparison.OrdinalIgnoreCase))
{
isCollectCodeCoverageEnabled = true;
}
Expand Down
13 changes: 13 additions & 0 deletions test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,19 @@ public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCo
CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
}

[TestMethod]
public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCodeCoverageCollectWithExtraConfigurations()
{
const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
this.vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
this.vsTestTask.VSTestCollect = new string[] { "code coverage;someParameter=someValue" };

var allArguments = this.vsTestTask.CreateArgument().ToArray();

const string expectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
}

[TestMethod]
public void CreateArgumentShouldNotAddTraceCollectorDirectoryPathAsTestAdapterForNonCodeCoverageCollect()
{
Expand Down