Skip to content

Enforce single unique category per test in xUnit device tests with compile-time analyzers #32366

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

Open
Copilot wants to merge 16 commits into
base: main
Choose a base branch
from
+444 −30
Open

Enforce single unique category per test in xUnit device tests with compile-time analyzers #32366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
671e8dc
Initial plan
Copilot Nov 3, 2025
4e63e17
Add validation for multiple Category attributes in xUnit device tests
Copilot Nov 3, 2025
2224ae1
Use Count() instead of ToList() for better performance
Copilot Nov 3, 2025
4b28ea2
Enforce single category per test - no multiple categories allowed
Copilot Nov 3, 2025
d9e06c0
Fix validation to check string[] and allow duplicate categories
Copilot Nov 3, 2025
156dfc1
Add xUnit device test analyzers for category validation
Copilot Nov 3, 2025
3773948
Move xUnit analyzers to separate DeviceTests.Analyzers project
Copilot Nov 3, 2025
80ef68d
Remove runtime validation - rely entirely on compile-time analyzers
Copilot Nov 3, 2025
0c20297
Add DeviceTests.Analyzers to solution files
Copilot Nov 3, 2025
0b3e59b
Fix missing category analyzer to not check base classes
Copilot Nov 4, 2025
9fbd63d
Properly add DeviceTests.Analyzers to all 6 solution files
Copilot Nov 4, 2025
a5f4fa2
Add GlobalSection config entries for DeviceTests.Analyzers in solutio…
Copilot Nov 4, 2025
7891d1e
Add DeviceTests.Analyzers to src folder in solution NestedProjects
Copilot Nov 4, 2025
f2cb2c8
Addressing PR comments
Copilot Nov 4, 2025
24de644
fix codes
mattleibow Nov 4, 2025
12e9d04
Fix some tests
mattleibow Nov 5, 2025
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
7 changes: 7 additions & 0 deletions Microsoft.Maui-dev.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.BindingSourceGen.U
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITest.Analyzers", "src\TestUtils\src\UITest.Analyzers\UITest.Analyzers.csproj", "{55905937-1399-46DB-BA38-E426801CB759}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceTests.Analyzers", "src\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj", "{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.ManualTests", "src\Controls\tests\ManualTests\Controls.ManualTests.csproj", "{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}"
Expand Down Expand Up @@ -613,6 +615,10 @@ Global
{55905937-1399-46DB-BA38-E426801CB759}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55905937-1399-46DB-BA38-E426801CB759}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55905937-1399-46DB-BA38-E426801CB759}.Release|Any CPU.Build.0 = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.Build.0 = Release|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -734,6 +740,7 @@ Global
{55905937-1399-46DB-BA38-E426801CB759} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
Expand Down
5 changes: 3 additions & 2 deletions Microsoft.Maui-mac.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@
"src\\TestUtils\\src\\UITest.NUnit\\UITest.NUnit.csproj",
"src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
"src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj",
"src\\Workload\\Microsoft.NET.Sdk.Maui.Manifest\\Microsoft.NET.Sdk.Maui.Manifest.csproj"
"src\\Workload\\Microsoft.NET.Sdk.Maui.Manifest\\Microsoft.NET.Sdk.Maui.Manifest.csproj",
"src\\TestUtils\\src\\DeviceTests.Analyzers\\DeviceTests.Analyzers.csproj"
]
}
}
}
7 changes: 7 additions & 0 deletions Microsoft.Maui-vscode.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.BindingSourceGen.U
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITest.Analyzers", "src\TestUtils\src\UITest.Analyzers\UITest.Analyzers.csproj", "{DA001142-4777-4EDE-97D5-B1AC08162F99}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceTests.Analyzers", "src\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj", "{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}"
Copy link
Member

@mattleibow mattleibow Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot smae here!

Copy link
Contributor Author

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already fixed in commit ce46fd7 - added the 4 GlobalSection config lines at lines 542-545.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGen.UnitTests", "src\Controls\tests\SourceGen.UnitTests\SourceGen.UnitTests.csproj", "{A426B2FC-F012-436B-BDD9-BEC0025DB96B}"
Expand Down Expand Up @@ -537,6 +539,10 @@ Global
{DA001142-4777-4EDE-97D5-B1AC08162F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA001142-4777-4EDE-97D5-B1AC08162F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA001142-4777-4EDE-97D5-B1AC08162F99}.Release|Any CPU.Build.0 = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.Build.0 = Release|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -650,6 +656,7 @@ Global
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
{A426B2FC-F012-436B-BDD9-BEC0025DB96B} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
{9A0A5037-DB03-4C80-876C-61FCDAE4CCAD} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
Expand Down
5 changes: 3 additions & 2 deletions Microsoft.Maui-windows.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
"src\\TestUtils\\src\\UITest.Core\\UITest.Core.csproj",
"src\\TestUtils\\src\\UITest.NUnit\\UITest.NUnit.csproj",
"src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj",
"src\\Workload\\Microsoft.NET.Sdk.Maui.Manifest\\Microsoft.NET.Sdk.Maui.Manifest.csproj"
"src\\Workload\\Microsoft.NET.Sdk.Maui.Manifest\\Microsoft.NET.Sdk.Maui.Manifest.csproj",
"src\\TestUtils\\src\\DeviceTests.Analyzers\\DeviceTests.Analyzers.csproj"
]
}
}
}
7 changes: 7 additions & 0 deletions Microsoft.Maui.LegacyControlGallery.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.BindingSourceGen.U
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITest.Analyzers", "src\TestUtils\src\UITest.Analyzers\UITest.Analyzers.csproj", "{55905937-1399-46DB-BA38-E426801CB759}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceTests.Analyzers", "src\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj", "{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}"
Copy link
Member

@mattleibow mattleibow Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot and here!

Copy link
Contributor Author

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already fixed in commit ce46fd7 - added the 4 GlobalSection config lines at lines 674-677.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
EndProject
Global
Expand Down Expand Up @@ -669,6 +671,10 @@ Global
{55905937-1399-46DB-BA38-E426801CB759}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55905937-1399-46DB-BA38-E426801CB759}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55905937-1399-46DB-BA38-E426801CB759}.Release|Any CPU.Build.0 = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.Build.0 = Release|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -797,6 +803,7 @@ Global
{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
{55905937-1399-46DB-BA38-E426801CB759} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
Expand Down
7 changes: 7 additions & 0 deletions Microsoft.Maui.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.BindingSourceGen.U
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.Analyzers", "src\TestUtils\src\UITest.Analyzers\UITest.Analyzers.csproj", "{F1BC506B-3A9E-4779-994E-339AFB21C9B9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceTests.Analyzers", "src\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj", "{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}"
Copy link
Member

@mattleibow mattleibow Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot the sln please!

Copy link
Contributor Author

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already fixed in commit ce46fd7 - added the 4 GlobalSection config lines at lines 631-634.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.ManualTests", "src\Controls\tests\ManualTests\Controls.ManualTests.csproj", "{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}"
Expand Down Expand Up @@ -626,6 +628,10 @@ Global
{F1BC506B-3A9E-4779-994E-339AFB21C9B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1BC506B-3A9E-4779-994E-339AFB21C9B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1BC506B-3A9E-4779-994E-339AFB21C9B9}.Release|Any CPU.Build.0 = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB}.Release|Any CPU.Build.0 = Release|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -748,6 +754,7 @@ Global
{83C5E677-A9C8-4E46-B72C-CAF04DC5D3D5} = {50C758FE-4E10-409A-94F5-A75480960864}
{6AEE83CC-08CA-466A-BA86-774BE88A541B} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
{F1BC506B-3A9E-4779-994E-339AFB21C9B9} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{D1FAFCF9-571A-4502-BD16-5642A4F1D2EB} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
EndGlobalSection
Expand Down
1 change: 1 addition & 0 deletions src/BlazorWebView/tests/DeviceTests/MauiBlazorWebView.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests\TestUtils.DeviceTests.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners\TestUtils.DeviceTests.Runners.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners.SourceGen\TestUtils.DeviceTests.Runners.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
<ProjectReference Condition="'$(IncludeCompatibilityProjects)' == 'true'" Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests\TestUtils.DeviceTests.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners\TestUtils.DeviceTests.Runners.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners.SourceGen\TestUtils.DeviceTests.Runners.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/Controls/tests/DeviceTests/Elements/AlertDialog/AlertDialogTests.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Microsoft.Maui.DeviceTests
{
[Category(TestCategory.AlertDialog)]
public partial class AlertDialogTests : ControlsHandlerTestBase
{

Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Task<bool> GetPlatformIsVisible(ButtonHandler buttonHandler)
});
}

[Theory(DisplayName = "Button Icon has Correct Position"), Category(TestCategory.Layout)]
[Theory(DisplayName = "Button Icon has Correct Position")]
[InlineData(Button.ButtonContentLayout.ImagePosition.Left)]
[InlineData(Button.ButtonContentLayout.ImagePosition.Top)]
[InlineData(Button.ButtonContentLayout.ImagePosition.Right)]
Expand Down
8 changes: 4 additions & 4 deletions src/Controls/tests/DeviceTests/Elements/ContentView/ContentViewTests.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static int GetContentChildCount(ContentViewHandler contentViewHandler)
return contentViewHandler.PlatformView.Subviews[0].Subviews.Length;
}

[Fact, Category(TestCategory.Layout)]
[Fact]
public async Task ContentViewHasExpectedSize()
{
var contentView = new ContentView();
Expand All @@ -42,7 +42,7 @@ public async Task ContentViewHasExpectedSize()
Assert.Equal(100, size.Height);
}

[Fact, Category(TestCategory.Layout)]
[Fact]
public async Task ContentViewRespondsWhenViewAdded()
{
var contentView = new ContentView();
Expand Down Expand Up @@ -78,7 +78,7 @@ public async Task ContentViewRespondsWhenViewAdded()
Assert.Equal(100, updatedSize.Height);
}

[Fact(Skip="Failing https://github.com/dotnet/maui/issues/32368"), Category(TestCategory.Layout)]
[Fact(Skip="Failing https://github.com/dotnet/maui/issues/32368")]
public async Task ContentViewRespondsWhenViewRemoved()
{
var contentView = new ContentView();
Expand Down Expand Up @@ -115,7 +115,7 @@ public async Task ContentViewRespondsWhenViewRemoved()
Assert.Equal(0, updatedSize.Height);
}

[Fact, Category(TestCategory.Layout)]
[Fact]
public async Task ContentViewRespondsWhenViewUpdated()
{
var contentView = new ContentView();
Expand Down
5 changes: 2 additions & 3 deletions src/Controls/tests/DeviceTests/Elements/Layout/LayoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,13 @@ static void CreateLayout([DynamicallyAccessedMembers(System.Diagnostics.CodeAnal
}
}

[Fact, Category(TestCategory.FlexLayout)]
[Fact]
public async Task FlexLayoutInVerticalStackLayoutDoesNotCycle()
{
await FlexLayoutInStackLayoutDoesNotCycle(new VerticalStackLayout());
}

[Fact, Category(TestCategory.FlexLayout)]
[Fact]
public async Task FlexLayoutInHorizontalStackLayoutDoesNotCycle()
{
await FlexLayoutInStackLayoutDoesNotCycle(new HorizontalStackLayout());
Expand Down Expand Up @@ -341,7 +341,6 @@ await AttachAndRun(grid, (handler) =>
}

[Fact]
[Category(TestCategory.Button, TestCategory.FlexLayout)]
public async Task ButtonWithImageInFlexLayoutInGridDoesNotCycle()
{
EnsureHandlerCreated((builder) =>
Expand Down
1 change: 1 addition & 0 deletions src/Controls/tests/DeviceTests/Elements/TextInput/TextInputTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Microsoft.Maui.DeviceTests
{
[Category(TestCategory.TextInput)]
public abstract partial class TextInputTests<THandler, TView> : ControlsHandlerTestBase
where THandler : class, IViewHandler, IPlatformViewHandler, new()
where TView : InputView, IView, ITextInput, new()
Expand Down
1 change: 1 addition & 0 deletions src/Controls/tests/DeviceTests/TestCategory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public static class TestCategory
{
public const string Accessibility = "Accessibility";
public const string Application = "Application";
public const string AlertDialog = "AlertDialog";
public const string Behavior = "Behavior";
public const string Border = "Border";
public const string BoxView = "BoxView";
Expand Down
1 change: 1 addition & 0 deletions src/Core/tests/DeviceTests/Core.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests\TestUtils.DeviceTests.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners\TestUtils.DeviceTests.Runners.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners.SourceGen\TestUtils.DeviceTests.Runners.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Analyzers\DeviceTests.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
<ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj" />
<ProjectReference Include="..\DeviceTests.Shared\Core.DeviceTests.Shared.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions src/Core/tests/DeviceTests/Handlers/ContentView/ContentViewTests.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.Maui.DeviceTests.Handlers.ContentView
[Category(TestCategory.ContentView)]
public partial class ContentViewTests
{
[Fact, Category(TestCategory.FlowDirection)]
[Fact]
public async Task FlowDirectionPropagatesToContent()
{
var contentView = new ContentViewStub();
Expand All @@ -32,7 +32,7 @@ public async Task FlowDirectionPropagatesToContent()
Assert.Equal(UIUserInterfaceLayoutDirection.RightToLeft, labelFlowDirection);
}

[Fact, Category(TestCategory.FlowDirection)]
[Fact]
public async Task FlowDirectionPropagatesToDescendants()
{
var contentView = new ContentViewStub();
Expand All @@ -58,7 +58,7 @@ public async Task FlowDirectionPropagatesToDescendants()
Assert.Equal(UIUserInterfaceLayoutDirection.RightToLeft, labelFlowDirection);
}

[Fact, Category(TestCategory.FlowDirection)]
[Fact]
public async Task FlowDirectionPropagatesToUpdatedContent()
{
var contentView = new ContentViewStub() { FlowDirection = FlowDirection.RightToLeft };
Expand All @@ -84,7 +84,7 @@ public async Task FlowDirectionPropagatesToUpdatedContent()
Assert.Equal(UIUserInterfaceLayoutDirection.RightToLeft, labelFlowDirection);
}

[Fact, Category(TestCategory.FlowDirection)]
[Fact]
public async Task DoesNotPropagateToContentWithExplicitFlowDirection()
{
var contentView = new ContentViewStub();
Expand Down
1 change: 1 addition & 0 deletions src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public partial class ImageHandlerTests : ImageHandlerTests<ImageHandler, ImageSt
{
}

[Category(TestCategory.Image)]
public abstract partial class ImageHandlerTests<TImageHandler, TStub> : CoreHandlerTestBase<TImageHandler, TStub>
where TImageHandler : class, IImageHandler, new()
where TStub : StubBase, IImageStub, new()
Expand Down
2 changes: 0 additions & 2 deletions src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace Microsoft.Maui.DeviceTests
public partial class LabelHandlerTests
{
[Theory]
[Category(TestCategory.Fonts)]
[InlineData(true, Skip = "https://github.com/dotnet/maui/issues/26749")]
[InlineData(false)]
public async Task FontFamilyIsCorrectForRendering(bool validateSize)
Expand Down Expand Up @@ -43,7 +42,6 @@ public async Task FontFamilyIsCorrectForRendering(bool validateSize)
}

[Theory]
[Category(TestCategory.Fonts)]
[InlineData(true, Skip = "https://github.com/dotnet/maui/issues/26749")]
[InlineData(false)]
public async Task EmbeddedFontFamilyIsCorrectForRendering(bool validateSize)
Expand Down
3 changes: 0 additions & 3 deletions src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ await ValidateUnrelatedPropertyUnaffected(
#if !WINDOWS

[Fact]
[Category(TestCategory.TextFormatting)]
public async Task LineHeightAppliedWhenTextAdded()
{
double xplatLineHeight = 2;
Expand All @@ -230,7 +229,6 @@ public async Task LineHeightAppliedWhenTextAdded()
}

[Fact]
[Category(TestCategory.TextFormatting)]
public async Task CharacterSpacingAppliedWhenTextAdded()
{
double xplatCharacterSpacing = 1.5;
Expand All @@ -249,7 +247,6 @@ public async Task CharacterSpacingAppliedWhenTextAdded()
}

[Fact]
[Category(TestCategory.TextFormatting)]
public async Task LineHeightSurvivesCharacterSpacing()
{
double xplatCharacterSpacing = 1.5;
Expand Down
3 changes: 0 additions & 3 deletions src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public async Task TextDecorationsInitializesCorrectly()
}

[Fact]
[Category(TestCategory.TextFormatting)]
public async Task CanSetAlignmentAndLineHeight()
{
// Verifying that setting LineHeight (which requires an attributed string on iOS)
Expand Down Expand Up @@ -111,7 +110,6 @@ public async Task CanSetAlignmentAndLineHeight()
}

[Fact]
[Category(TestCategory.TextFormatting)]
public async Task TextDecorationsAppliedWhenTextAdded()
{
TextDecorations xplatTextDecorations = TextDecorations.Underline;
Expand All @@ -129,7 +127,6 @@ public async Task TextDecorationsAppliedWhenTextAdded()
}

[Fact]
[Category(TestCategory.TextFormatting)]
public async Task LineHeightSurvivesTextDecorations()
{
TextDecorations xplatTextDecorations = TextDecorations.Underline;
Expand Down
Loading
Loading