Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

TestPlatform insertion 16.1.0 #11312

Merged
merged 1 commit into from
May 13, 2019
Merged

TestPlatform insertion 16.1.0 #11312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
<NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.0.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.1.0</MicrosoftNETTestSdkPackageVersion>
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
Expand Down
24 changes: 16 additions & 8 deletions test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,14 @@ public void MStestMultiTFM()
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut
.Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass")
.And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
.And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.0 tests will fail")
.And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
.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("Total tests: 3")
.And.Contain("Passed: 1")
.And.Contain("Failed: 2")
.And.Contain("X VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
}
result.ExitCode.Should().Be(1);
}
Expand Down Expand Up @@ -73,12 +77,16 @@ public void XunitMultiTFM()
if (!DotnetUnderTest.IsLocalized())
{
// for target framework net46
result.StdOut.Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop");
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");

// for target framework netcoreapp1.0
result.StdOut.Should().Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.");
result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp");
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.ExitCode.Should().Be(1);
Expand Down
64 changes: 41 additions & 23 deletions test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ public void MSTestSingleTFM()
// Verify
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
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.ExitCode.Should().Be(1);
Expand All @@ -53,9 +55,13 @@ public void ItImplicitlyRestoresAProjectWhenTesting()

if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
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.ExitCode.Should().Be(1);
Expand Down Expand Up @@ -120,9 +126,11 @@ public void XunitSingleTFM()
// Verify
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTest");
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("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTest");
result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
}

result.ExitCode.Should().Be(1);
Expand All @@ -143,9 +151,11 @@ public void GivenAFailingTestItDisplaysFailureDetails()

if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
result.StdOut.Should().Contain("Assert.Equal() Failure");
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}
}

Expand Down Expand Up @@ -174,8 +184,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("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
result.StdOut.Should().Contain("\u221a VSTestPassTest");
result.StdOut.Should().Contain("X VSTestFailTest");
}

// Cleanup trxLoggerDirectory if it exist
Expand Down Expand Up @@ -301,9 +311,11 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory()

if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Passed VSTestPassTest");
result.StdOut.Should().Contain("Failed VSTestFailTest");
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.ExitCode.Should().Be(1);
Expand All @@ -323,15 +335,16 @@ public void ItUsesVerbosityPassedToDefineVerbosityOfConsoleLoggerOfTheTests()
// Verify
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().NotContain("Passed TestNamespace.VSTestTests.VSTestPassTest");
result.StdOut.Should().NotContain("Failed TestNamespace.VSTestTests.VSTestFailTest");
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.ExitCode.Should().Be(1);
}


[WindowsOnlyFact]
public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings()
{
Expand All @@ -357,7 +370,9 @@ public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings()
// Verify test results
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
}

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

// Verify coverage file.
Expand All @@ -418,7 +435,8 @@ public void ItShouldShowWarningMessageOnCollectCodeCoverage()
if (!DotnetUnderTest.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. Passed: 1. Failed: 0. Skipped: 0.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Test Run Successful.");
}

Expand Down
8 changes: 5 additions & 3 deletions test/dotnet-vstest.Tests/VSTestTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ public void TestsFromAGivenContainerShouldRunWithExpectedOutput()
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut
.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.")
.And.Contain("Passed VSTestPassTest")
.And.Contain("Failed VSTestFailTest");
.Should().Contain("Total tests: 2")
.And.Contain("Passed: 1")
.And.Contain("Failed: 1")
.And.Contain("\u221a VSTestPassTest")
.And.Contain("X VSTestFailTest");
}

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