Skip to content

Commit 11b36ea

Browse files
Youssef1313Youssef1313
committed
Fix global properties not propagating in new dotnet test for MTP
1 parent 4708311 commit 11b36ea

File tree

10 files changed

+212
-17
lines changed

10 files changed

+212
-17
lines changed

‎src/Cli/dotnet/commands/dotnet-test/MSBuildUtility.cs

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static (IEnumerable<TestModule> Projects, bool IsBuiltOrRestored) GetProj
3636
{
3737
bool isBuiltOrRestored = BuildOrRestoreProjectOrSolution(projectFilePath, buildOptions);
3838

39-
IEnumerable<TestModule> projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, GetGlobalProperties(buildOptions.BuildProperties), new ProjectCollection());
39+
IEnumerable<TestModule> projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, GetGlobalProperties(buildOptions), new ProjectCollection());
4040

4141
isBuiltOrRestored |= projects.Any();
4242

@@ -45,15 +45,12 @@ public static (IEnumerable<TestModule> Projects, bool IsBuiltOrRestored) GetProj
4545

4646
public static BuildOptions GetBuildOptions(ParseResult parseResult, int degreeOfParallelism)
4747
{
48-
IEnumerable<string> propertyTokens = GetPropertyTokens(parseResult.UnmatchedTokens);
4948
IEnumerable<string> binaryLoggerTokens = GetBinaryLoggerTokens(parseResult.UnmatchedTokens);
5049

5150
var msbuildArgs = parseResult.OptionValuesToBeForwarded(TestCommandParser.GetCommand())
52-
.Concat(propertyTokens)
5351
.Concat(binaryLoggerTokens);
5452

5553
List<string> unmatchedTokens = [.. parseResult.UnmatchedTokens];
56-
unmatchedTokens.RemoveAll(arg => propertyTokens.Contains(arg));
5754
unmatchedTokens.RemoveAll(arg => binaryLoggerTokens.Contains(arg));
5855

5956
PathOptions pathOptions = new(parseResult.GetValue(
@@ -73,6 +70,7 @@ public static BuildOptions GetBuildOptions(ParseResult parseResult, int degreeOf
7370
parseResult.GetValue(TestingPlatformOptions.NoBuildOption),
7471
parseResult.HasOption(CommonOptions.VerbosityOption) ? parseResult.GetValue(CommonOptions.VerbosityOption) : null,
7572
degreeOfParallelism,
73+
parseResult.GetValue(CommonOptions.PropertiesOption),
7674
unmatchedTokens,
7775
msbuildArgs);
7876
}
@@ -92,16 +90,7 @@ private static string ResolveRuntimeIdentifier(ParseResult parseResult)
9290
return CommonOptions.ResolveRidShorthandOptionsToRuntimeIdentifier(parseResult.GetValue(CommonOptions.OperatingSystemOption), parseResult.GetValue(CommonOptions.ArchitectureOption));
9391
}
9492

95-
public static IEnumerable<string> GetPropertyTokens(IEnumerable<string> unmatchedTokens)
96-
{
97-
return unmatchedTokens.Where(token =>
98-
token.StartsWith("--property:", StringComparison.OrdinalIgnoreCase) ||
99-
token.StartsWith("/property:", StringComparison.OrdinalIgnoreCase) ||
100-
token.StartsWith("-p:", StringComparison.OrdinalIgnoreCase) ||
101-
token.StartsWith("/p:", StringComparison.OrdinalIgnoreCase));
102-
}
103-
104-
public static IEnumerable<string> GetBinaryLoggerTokens(IEnumerable<string> args)
93+
private static IEnumerable<string> GetBinaryLoggerTokens(IEnumerable<string> args)
10594
{
10695
return args.Where(arg =>
10796
arg.StartsWith("/bl:", StringComparison.OrdinalIgnoreCase) || arg.Equals("/bl", StringComparison.OrdinalIgnoreCase) ||
@@ -135,7 +124,7 @@ private static ConcurrentBag<TestModule> GetProjectsProperties(ProjectCollection
135124
new ParallelOptions { MaxDegreeOfParallelism = buildOptions.DegreeOfParallelism },
136125
(project) =>
137126
{
138-
IEnumerable<TestModule> projectsMetadata = SolutionAndProjectUtility.GetProjectProperties(project, GetGlobalProperties(buildOptions.BuildProperties), projectCollection);
127+
IEnumerable<TestModule> projectsMetadata = SolutionAndProjectUtility.GetProjectProperties(project, GetGlobalProperties(buildOptions), projectCollection);
139128
foreach (var projectMetadata in projectsMetadata)
140129
{
141130
allProjects.Add(projectMetadata);
@@ -145,9 +134,25 @@ private static ConcurrentBag<TestModule> GetProjectsProperties(ProjectCollection
145134
return allProjects;
146135
}
147136

148-
private static Dictionary<string, string> GetGlobalProperties(BuildProperties buildProperties)
137+
private static Dictionary<string, string> GetGlobalProperties(BuildOptions buildOptions)
149138
{
150139
var globalProperties = new Dictionary<string, string>();
140+
var buildProperties = buildOptions.BuildProperties;
141+
142+
//foreach (var property in buildOptions.UserSpecifiedProperties)
143+
//{
144+
// foreach (var (key, value) in MSBuildPropertyParser.ParseProperties(property))
145+
// {
146+
// if (globalProperties.TryGetValue(key, out var existingValues))
147+
// {
148+
// globalProperties[key] = $"{existingValues};{value}";
149+
// }
150+
// else
151+
// {
152+
// globalProperties[key] = value;
153+
// }
154+
// }
155+
//}
151156

152157
if (!string.IsNullOrEmpty(buildProperties.Configuration))
153158
{

‎src/Cli/dotnet/commands/dotnet-test/Options.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ internal record PathOptions(string ProjectPath, string SolutionPath, string Dire
99

1010
internal record BuildProperties(string Configuration, string RuntimeIdentifier, string TargetFramework);
1111

12-
internal record BuildOptions(PathOptions PathOptions, BuildProperties BuildProperties, bool HasNoRestore, bool HasNoBuild, VerbosityOptions? Verbosity, int DegreeOfParallelism, List<string> UnmatchedTokens, IEnumerable<string> MSBuildArgs);
12+
internal record BuildOptions(PathOptions PathOptions, BuildProperties BuildProperties, bool HasNoRestore, bool HasNoBuild, VerbosityOptions? Verbosity, int DegreeOfParallelism, string[] UserSpecifiedProperties, List<string> UnmatchedTokens, IEnumerable<string> MSBuildArgs);
1313
}

‎src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ private static CliCommand GetTestingPlatformCliCommand()
234234
command.Options.Add(TestingPlatformOptions.TestModulesRootDirectoryOption);
235235
command.Options.Add(TestingPlatformOptions.MaxParallelTestModulesOption);
236236
command.Options.Add(CommonOptions.ArchitectureOption);
237+
command.Options.Add(CommonOptions.PropertiesOption);
237238
command.Options.Add(TestingPlatformOptions.ConfigurationOption);
238239
command.Options.Add(TestingPlatformOptions.FrameworkOption);
239240
command.Options.Add(CommonOptions.OperatingSystemOption);

‎test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/OtherTestProject/OtherTestProject.csproj

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
6+
<OutputType>Exe</OutputType>
7+
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
<Nullable>enable</Nullable>
10+
11+
<GenerateProgramFile>false</GenerateProgramFile>
12+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
13+
<IsTestingPlatformApplication Condition="'$(PROPERTY_TO_ENABLE_MTP)' != ''">true</IsTestingPlatformApplication>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
18+
</ItemGroup>
19+
</Project>

‎test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/OtherTestProject/Program.cs

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
using Microsoft.Testing.Platform.Builder;
2+
using Microsoft.Testing.Platform.Capabilities.TestFramework;
3+
using Microsoft.Testing.Platform.Extensions.Messages;
4+
using Microsoft.Testing.Platform.Extensions.TestFramework;
5+
6+
var testApplicationBuilder = await TestApplication.CreateBuilderAsync(args);
7+
8+
testApplicationBuilder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new DummyTestAdapter());
9+
10+
using var testApplication = await testApplicationBuilder.BuildAsync();
11+
return await testApplication.RunAsync();
12+
13+
public class DummyTestAdapter : ITestFramework, IDataProducer
14+
{
15+
public string Uid => nameof(DummyTestAdapter);
16+
17+
public string Version => "2.0.0";
18+
19+
public string DisplayName => nameof(DummyTestAdapter);
20+
21+
public string Description => nameof(DummyTestAdapter);
22+
23+
public Task<bool> IsEnabledAsync() => Task.FromResult(true);
24+
25+
public Type[] DataTypesProduced => new[] {
26+
typeof(TestNodeUpdateMessage)
27+
};
28+
29+
public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context)
30+
=> Task.FromResult(new CreateTestSessionResult() { IsSuccess = true });
31+
32+
public Task<CloseTestSessionResult> CloseTestSessionAsync(CloseTestSessionContext context)
33+
=> Task.FromResult(new CloseTestSessionResult() { IsSuccess = true });
34+
35+
public async Task ExecuteRequestAsync(ExecuteRequestContext context)
36+
{
37+
await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
38+
{
39+
Uid = "Test1",
40+
DisplayName = "Test1",
41+
Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")),
42+
}));
43+
44+
context.Complete();
45+
}
46+
}

‎test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/TestProject/Program.cs

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using Microsoft.Testing.Platform.Builder;
2+
using Microsoft.Testing.Platform.Capabilities.TestFramework;
3+
using Microsoft.Testing.Platform.Extensions.Messages;
4+
using Microsoft.Testing.Platform.Extensions.TestFramework;
5+
6+
ITestApplicationBuilder testApplicationBuilder = await TestApplication.CreateBuilderAsync(args);
7+
testApplicationBuilder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new DummyTestAdapter());
8+
9+
ITestApplication testApplication = await testApplicationBuilder.BuildAsync();
10+
return await testApplication.RunAsync();
11+
12+
public class DummyTestAdapter : ITestFramework, IDataProducer
13+
{
14+
public string Uid => nameof(DummyTestAdapter);
15+
16+
public string Version => "2.0.0";
17+
18+
public string DisplayName => nameof(DummyTestAdapter);
19+
20+
public string Description => nameof(DummyTestAdapter);
21+
22+
public Task<bool> IsEnabledAsync() => Task.FromResult(true);
23+
24+
public Type[] DataTypesProduced => new[] { typeof(TestNodeUpdateMessage) };
25+
26+
public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context)
27+
=> Task.FromResult(new CreateTestSessionResult() { IsSuccess = true });
28+
29+
public Task<CloseTestSessionResult> CloseTestSessionAsync(CloseTestSessionContext context)
30+
=> Task.FromResult(new CloseTestSessionResult() { IsSuccess = true });
31+
32+
public async Task ExecuteRequestAsync(ExecuteRequestContext context)
33+
{
34+
await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
35+
{
36+
Uid = "Test0",
37+
DisplayName = "Test0",
38+
Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")),
39+
}));
40+
41+
context.Complete();
42+
}
43+
}

‎test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/TestProject/TestProject.csproj

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
3+
4+
<PropertyGroup>
5+
<OutputType>Exe</OutputType>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<Nullable>enable</Nullable>
9+
<GenerateProgramFile>false</GenerateProgramFile>
10+
<LangVersion>latest</LangVersion>
11+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
12+
<IsTestingPlatformApplication Condition="'$(PROPERTY_TO_ENABLE_MTP)' != ''">true</IsTestingPlatformApplication>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
17+
</ItemGroup>
18+
19+
</Project>

‎test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/TestProjectWithConditionOnGlobalProperty.sln

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.13.35505.181
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{D2E321F2-3513-99DE-C37E-6D48D15F404D}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtherTestProject", "OtherTestProject/OtherTestProject.csproj", "{6171FC1F-E2F2-4F66-A8DE-EC4765081661}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{D2E321F2-3513-99DE-C37E-6D48D15F404D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{D2E321F2-3513-99DE-C37E-6D48D15F404D}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{D2E321F2-3513-99DE-C37E-6D48D15F404D}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{D2E321F2-3513-99DE-C37E-6D48D15F404D}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {3D7914D1-7D03-4FFB-8D0F-7FFA6B6BA6A0}
30+
EndGlobalSection
31+
EndGlobal

‎test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/dotnet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[dotnet.test:runner]
2+
name= "Microsoft.Testing.Platform"

‎test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTests.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,5 +256,34 @@ public void RunOnProjectWithClassLibrary_ShouldReturnExitCodeSuccess(string conf
256256

257257
result.ExitCode.Should().Be(ExitCode.Success);
258258
}
259+
260+
[InlineData(TestingConstants.Debug)]
261+
[InlineData(TestingConstants.Release)]
262+
[Theory]
263+
public void RunningWithGlobalPropertyShouldProperlyPropagate(string configuration)
264+
{
265+
TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithConditionOnGlobalProperty", Guid.NewGuid().ToString())
266+
.WithSource();
267+
testInstance.WithTargetFramework($"{DotnetVersionHelper.GetPreviousDotnetVersion()}", "TestProject");
268+
269+
CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
270+
.WithWorkingDirectory(testInstance.Path)
271+
.WithEnableTestingPlatform()
272+
.Execute(
273+
TestingPlatformOptions.ConfigurationOption.Name, configuration,
274+
CommonOptions.PropertiesOption.Name, "PROPERTY_TO_ENABLE_MTP=1");
275+
276+
if (!TestContext.IsLocalized())
277+
{
278+
result.StdOut
279+
.Should().Contain("Test run summary: Passed!")
280+
.And.Contain("total: 2")
281+
.And.Contain("succeeded: 2")
282+
.And.Contain("failed: 0")
283+
.And.Contain("skipped: 0");
284+
}
285+
286+
result.ExitCode.Should().Be(ExitCode.Success);
287+
}
259288
}
260289
}

0 commit comments

Comments
 (0)