Skip to content

Update vstest to 16.8.0 in 5.0.1xx-preview8 #12669

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

Merged
ViktorHofer merged 5 commits into from
Jul 29, 2020
Merged

Update vstest to 16.8.0 in 5.0.1xx-preview8 #12669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fdaa6e
Fix Passed / Failed indicators
nohwnd Jul 27, 2020
88ec211
Update dependencies from https://github.com/microsoft/vstest build 20…
dotnet-maestro[bot] Jul 28, 2020
3248cf9
Fix more strings
nohwnd Jul 28, 2020
477f8cf
Revert output where normat output is used
nohwnd Jul 28, 2020
151f6e7
Fix even more output
nohwnd Jul 28, 2020
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>d428c2a79aae81ade1caa326e04f65a119025f42</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.7.0-release-20200612-02">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200728-02">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>df62aca07cacc5c018dc8e828f03a0cd79ee52da</Sha>
<Sha>c4c4491da41cd51039eb64139ec5f26a5a202845</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20361.1">
<Uri>https://github.com/mono/linker</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
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.7.0-release-20200612-02</MicrosoftNETTestSdkPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.8.0-preview-20200728-02</MicrosoftNETTestSdkPackageVersion>
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ public void MStestMultiTFM()
.Should().Contain("Total tests: 3")
.And.Contain("Passed: 2")
.And.Contain("Failed: 1")
.And.Contain("\u221a VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
.And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
.And.Contain("Total tests: 3")
.And.Contain("Passed: 1")
.And.Contain("Failed: 2")
.And.Contain("X VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
.And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
}
result.ExitCode.Should().Be(1);
}
Expand Down Expand Up @@ -87,13 +87,13 @@ public void XunitMultiTFM()
result.StdOut.Should().Contain("Total tests: 3");
result.StdOut.Should().Contain("Passed: 2");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop");
result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop");

// for target framework netcoreapp1.0
result.StdOut.Should().Contain("Total tests: 3");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 2");
result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp");
result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp");
}

result.ExitCode.Should().Be(1);
Expand Down
62 changes: 31 additions & 31 deletions src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public void MSTestSingleTFM()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("\u221a VSTestPassTest");
result.StdOut.Should().Contain("X VSTestFailTest");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
}

result.ExitCode.Should().Be(1);
Expand All @@ -74,8 +74,8 @@ public void ItImplicitlyRestoresAProjectWhenTesting()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("\u221a VSTestPassTest");
result.StdOut.Should().Contain("X VSTestFailTest");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
}

result.ExitCode.Should().Be(1);
Expand Down Expand Up @@ -142,8 +142,8 @@ public void XunitSingleTFM()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTest");
result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTest");
result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
}

result.ExitCode.Should().Be(1);
Expand All @@ -164,10 +164,10 @@ public void GivenAFailingTestItDisplaysFailureDetails()

if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("X 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("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
result.StdOut.Should().Contain("Total: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}
}

Expand Down Expand Up @@ -197,8 +197,8 @@ public void ItAcceptsMultipleLoggersAsCliArguments()
// We append current date time to trx file name, hence modifying this check
Assert.True(Directory.EnumerateFiles(trxLoggerDirectory, trxFileNamePattern).Any());

result.StdOut.Should().Contain("\u221a VSTestPassTest");
result.StdOut.Should().Contain("X VSTestFailTest");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
}

// Cleanup trxLoggerDirectory if it exist
Expand Down Expand Up @@ -341,8 +341,8 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
result.StdOut.Should().Contain("\u221a VSTestPassTest");
result.StdOut.Should().Contain("X VSTestFailTest");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
}

result.ExitCode.Should().Be(1);
Expand All @@ -362,11 +362,11 @@ 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().NotContain("\u221a TestNamespace.VSTestTests.VSTestPassTest");
result.StdOut.Should().NotContain("X TestNamespace.VSTestTests.VSTestFailTest");
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");
}

result.ExitCode.Should().Be(1);
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
4 changes: 2 additions & 2 deletions ...tnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void GivenAProjectAndMultipleTestRunParametersItPassesThemToVStestConsole
result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("\u221a VSTestTestRunParameters");
result.StdOut.Should().Contain("Passed VSTestTestRunParameters");
}

result.ExitCode.Should().Be(0);
Expand Down Expand Up @@ -86,7 +86,7 @@ public void GivenADllAndMultipleTestRunParametersItPassesThemToVStestConsoleInTh
result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("\u221a VSTestTestRunParameters");
result.StdOut.Should().Contain("Passed VSTestTestRunParameters");
}

result.ExitCode.Should().Be(0);
Expand Down
6 changes: 3 additions & 3 deletions src/Tests/dotnet-vstest.Tests/VSTestTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public void TestsFromAGivenContainerShouldRunWithExpectedOutput()
.Should().Contain("Total tests: 2")
.And.Contain("Passed: 1")
.And.Contain("Failed: 1")
.And.Contain("\u221a VSTestPassTest")
.And.Contain("X VSTestFailTest");
.And.Contain("Passed VSTestPassTest")
.And.Contain("Failed VSTestFailTest");
}

result.ExitCode.Should().Be(1);
Expand Down Expand Up @@ -88,7 +88,7 @@ public void GivenADllAndMultipleTestRunParametersItPassesThemToVStestConsoleInTh
result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("\u221a VSTestTestRunParameters");
result.StdOut.Should().Contain("Passed VSTestTestRunParameters");
}

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