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

Add tests for dotnet test gesture #1958

Merged
merged 4 commits into from
Dec 19, 2023
Merged

Add tests for dotnet test gesture #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
826e235
Add tests for `dotnet test` gesture
Dec 18, 2023
10b2893
avoid !
Dec 18, 2023
9065a11
always restore
Dec 18, 2023
ab02057
fix baseline
Dec 19, 2023
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
15 changes: 15 additions & 0 deletions ...ests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,19 @@ public void TestMethod1()
yield return new TestArgumentsEntry<(string MultiTfm, BuildConfiguration BuildConfiguration)>((TargetFrameworks.All.ToMSBuildTargetFrameworks(), compilationMode), $"{TargetFrameworks.All.ToMSBuildTargetFrameworks()},{compilationMode}");
}
}

internal static IEnumerable<TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)>> GetBuildMatrixSingleAndMultiTfmBuildConfiguration()
{
foreach (TestArgumentsEntry<(string Tfm, BuildConfiguration BuildConfiguration)> entry in GetBuildMatrixTfmBuildConfiguration())
{
yield return new TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)>(
(entry.Arguments.Tfm, entry.Arguments.BuildConfiguration, false), $"{entry.Arguments.Tfm},{entry.Arguments.BuildConfiguration}");
}

foreach (TestArgumentsEntry<(string MultiTfm, BuildConfiguration BuildConfiguration)> entry in GetBuildMatrixMultiTfmBuildConfiguration())
{
yield return new TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)>(
(entry.Arguments.MultiTfm, entry.Arguments.BuildConfiguration, true), $"multitfm,{entry.Arguments.BuildConfiguration}");
}
}
}
30 changes: 16 additions & 14 deletions ...nTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildMSTestRunnerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,32 @@ public class MSBuildMSTestRunnerTests : AcceptanceTestBase
{
private readonly AcceptanceFixture _acceptanceFixture;
private const string AssetName = "MSTestProject";
private const string DotnetTestVerb = "test";

public MSBuildMSTestRunnerTests(ITestExecutionContext testExecutionContext, AcceptanceFixture acceptanceFixture)
: base(testExecutionContext)
{
_acceptanceFixture = acceptanceFixture;
}

internal static IEnumerable<TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)>> GetBuildMatrixSingleAndMultiTfmBuildConfiguration()
internal static IEnumerable<TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm, string Command)>> GetBuildMatrix()
{
foreach (TestArgumentsEntry<(string Tfm, BuildConfiguration BuildConfiguration)> entry in GetBuildMatrixTfmBuildConfiguration())
foreach (TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)> entry in GetBuildMatrixSingleAndMultiTfmBuildConfiguration())
{
yield return new TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)>(
(entry.Arguments.Tfm, entry.Arguments.BuildConfiguration, false), $"{entry.Arguments.Tfm},{entry.Arguments.BuildConfiguration}");
}

foreach (TestArgumentsEntry<(string MultiTfm, BuildConfiguration BuildConfiguration)> entry in GetBuildMatrixMultiTfmBuildConfiguration())
{
yield return new TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)>(
(entry.Arguments.MultiTfm, entry.Arguments.BuildConfiguration, true), $"multitfm,{entry.Arguments.BuildConfiguration}");
foreach (var command in new string[]
{
"build --no-restore /t:Test",
DotnetTestVerb,
})
{
yield return new TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm, string Command)>(
(entry.Arguments.SingleTfmOrMultiTfm, entry.Arguments.BuildConfiguration, entry.Arguments.IsMultiTfm, command), $"{(entry.Arguments.IsMultiTfm ? "multitfm" : entry.Arguments.SingleTfmOrMultiTfm)},{entry.Arguments.BuildConfiguration},{command}");
}
}
}

[ArgumentsProvider(nameof(GetBuildMatrixSingleAndMultiTfmBuildConfiguration))]
public async Task MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string singleTfmOrMultiTfm, BuildConfiguration buildConfiguration, bool isMultiTfm)
[ArgumentsProvider(nameof(GetBuildMatrix))]
public async Task MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string singleTfmOrMultiTfm, BuildConfiguration buildConfiguration, bool isMultiTfm, string command)
{
// Get the template project
using TestAsset generator = await TestAsset.GenerateAssetAsync(
Expand All @@ -44,7 +46,7 @@ public async Task MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(
.PatchCodeWithReplace("$MSTestVersion$", MSTestVersion)
.PatchCodeWithReplace("$EnableMSTestRunner$", "<EnableMSTestRunner>true</EnableMSTestRunner>")
.PatchCodeWithReplace("$OutputType$", "<OutputType>Exe</OutputType>")
.PatchCodeWithReplace("$Extra$", string.Empty),
.PatchCodeWithReplace("$Extra$", command == DotnetTestVerb ? "<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>" : string.Empty),
addPublicFeeds: true);

string projectContent = File.ReadAllText(Directory.GetFiles(generator.TargetAssetPath, "MSTestProject.csproj", SearchOption.AllDirectories).Single());
Expand All @@ -66,7 +68,7 @@ public async Task MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(
// Build the solution
var restoreResult = await DotnetCli.RunAsync($"restore -nodeReuse:false {solution.SolutionFile} --configfile {nugetFile}", _acceptanceFixture.NuGetGlobalPackagesFolder.Path);
restoreResult.AssertOutputNotContains("An approximate best match of");
var testResult = await DotnetCli.RunAsync($"build --no-restore /t:Test -nodeReuse:false {solution.SolutionFile}", _acceptanceFixture.NuGetGlobalPackagesFolder.Path);
var testResult = await DotnetCli.RunAsync($"{command} -nodeReuse:false {solution.SolutionFile}", _acceptanceFixture.NuGetGlobalPackagesFolder.Path);

if (isMultiTfm)
{
Expand Down
30 changes: 20 additions & 10 deletions ...IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/testsbaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,26 @@ Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platfor
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.InfoTests.Info_WhenNoExtensionRegistered_OutputDefaultInfoContent(string) (net6.0)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.InfoTests.Info_WhenNoExtensionRegistered_OutputDefaultInfoContent(string) (net7.0)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.InfoTests.Info_WhenNoExtensionRegistered_OutputDefaultInfoContent(string) (net8.0)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net462,Debug)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net462,Release)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net6.0,Debug)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net6.0,Release)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net7.0,Debug)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net7.0,Release)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net8.0,Debug)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (net8.0,Release)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (multitfm,Debug)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool) (multitfm,Release)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (multitfm,Debug,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (multitfm,Debug,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (multitfm,Release,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (multitfm,Release,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net462,Debug,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net462,Debug,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net462,Release,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net462,Release,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net6.0,Debug,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net6.0,Debug,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net6.0,Release,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net6.0,Release,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net7.0,Debug,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net7.0,Debug,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net7.0,Release,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net7.0,Release,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net8.0,Debug,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net8.0,Debug,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net8.0,Release,build --no-restore /t:Test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSBuildMSTestRunnerTests.MSBuildTestTarget_SingleAndMultiTfm_Should_Run_Solution_Tests(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, bool, string) (net8.0,Release,test)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSTestRunnerTests.EnableMSTestRunner_False_Will_Run_Empty_Program_EntryPoint_From_Tpv2_SDK(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, Microsoft.Testing.TestInfrastructure.Verb) (net462,Debug,build)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSTestRunnerTests.EnableMSTestRunner_False_Will_Run_Empty_Program_EntryPoint_From_Tpv2_SDK(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, Microsoft.Testing.TestInfrastructure.Verb) (net462,Debug,publish)
Microsoft.Testing.Platform.Acceptance.IntegrationTests.Microsoft.Testing.Platform.Acceptance.IntegrationTests.MSTestRunnerTests.EnableMSTestRunner_False_Will_Run_Empty_Program_EntryPoint_From_Tpv2_SDK(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, Microsoft.Testing.TestInfrastructure.Verb) (net462,Release,build)
Expand Down
Loading