Skip to content

Commit

Permalink
Update vstest to 16.8.0 in master (#12673)
Browse files Browse the repository at this point in the history 
* Remove unnecessary test

This test is testing CSC behavior. It does not test SDK code.
The behaivor is also changed due to dotnet/roslyn#42769

* Update dependencies from https://github.com/microsoft/vstest build 20200728-02

Microsoft.NET.Test.Sdk
 From Version 16.7.0-release-20200612-02 -> To Version 16.8.0-preview-20200728-02

* Fix more strings

* Revert output where normat output is used

* Fix even more output

Co-authored-by: William Li <wul@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
@nohwnd @dotnet-maestro
3 people authored Jul 29, 2020
1 parent 4ee0910 commit 2a14ba7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>d428c2a79aae81ade1caa326e04f65a119025f42</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200720-01">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200728-02">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>069d8bd6357e2dbc260a35016ddbefe5dfec4102</Sha>
<Sha>c4c4491da41cd51039eb64139ec5f26a5a202845</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20374.1">
<Uri>https://github.com/mono/linker</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/vstest -->
<MicrosoftNETTestSdkPackageVersion>16.8.0-preview-20200720-01</MicrosoftNETTestSdkPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.8.0-preview-20200728-02</MicrosoftNETTestSdkPackageVersion>
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
</PropertyGroup>
Expand Down
36 changes: 18 additions & 18 deletions src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ public void GivenAFailingTestItDisplaysFailureDetails()
if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("Total: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}
}

Expand Down Expand Up @@ -362,9 +362,9 @@ public void ItUsesVerbosityPassedToDefineVerbosityOfConsoleLoggerOfTheTests()
// Verify
if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("Total: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().NotContain("Passed TestNamespace.VSTestTests.VSTestPassTest");
result.StdOut.Should().NotContain("Failed TestNamespace.VSTestTests.VSTestFailTest");
}
Expand Down Expand Up @@ -424,9 +424,9 @@ public void ItAcceptsNoLogoAsCliArguments()
if (!TestContext.IsLocalized())
{
result.StdOut.Should().NotContain("Microsoft (R) Test Execution Command Line Tool Version");
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("Total: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}
}

Expand Down Expand Up @@ -458,9 +458,9 @@ public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings()
// Verify test results
if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("Total: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}

// Verify coverage file.
Expand Down Expand Up @@ -494,9 +494,9 @@ public void ItCreatesCoverageFileInResultsDirectory()
// Verify test results
if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("Total: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}

// Verify coverage file.
Expand All @@ -523,9 +523,9 @@ public void ItShouldShowWarningMessageOnCollectCodeCoverage()
if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("No code coverage data available. Code coverage is currently supported only on Windows.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Test Run Successful.");
result.StdOut.Should().Contain("Total: 1");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().NotContain("Failed!");
}

result.ExitCode.Should().Be(0);
Expand Down

0 comments on commit 2a14ba7

Please sign in to comment.