From 2a14ba7224f9a91ba80faf619a081d70587fe80f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Wed, 29 Jul 2020 19:15:43 +0200
Subject: [PATCH] Update vstest to 16.8.0 in master (#12673)
* Remove unnecessary test
This test is testing CSC behavior. It does not test SDK code.
The behaivor is also changed due to https://github.com/dotnet/roslyn/pull/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>
---
eng/Version.Details.xml | 4 +--
eng/Versions.props | 2 +-
...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 36 +++++++++----------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5c1de04eb1d2..1ddfa533fb0e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -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>
diff --git a/eng/Versions.props b/eng/Versions.props
index fcb0d0cd9f1e..029fc8741042 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -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>
diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index dbcda6595679..b7b4259b788f 100644
--- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -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");
}
}
@@ -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");
}
@@ -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");
}
}
@@ -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.
@@ -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.
@@ -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);