Migrate Xaml.UnitTests from NUnit to xUnit by StephaneDelcroix · Pull Request #33012 · dotnet/maui

StephaneDelcroix · 2025-12-05T09:56:03Z

Note

Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Description

This PR migrates the Controls.Xaml.UnitTests project from NUnit to xUnit, as part of the effort tracked in #32247.

Changes

Test Framework Migration

Replaced NUnit [TestFixture] with xUnit [Collection] attributes
Converted [Test] to [Theory] with [MemberData] for parameterized tests
Replaced [Values] attribute pattern with XamlInflatorTestData member data provider
Updated assertions from NUnit Assert.That() / Assert.AreEqual() to xUnit Assert.Equal() / Assert.NotNull() etc.
Replaced [SetUp] / [TearDown] with xUnit constructor / IDisposable.Dispose() pattern
Replaced Assert.Throws<T> / Assert.DoesNotThrow with xUnit equivalents

Test Organization

Tests in root folder use [Collection("Xaml Inflation")]
Tests in Issues/ folder use [Collection("Issue")]
Added collection definitions with DisableParallelization = true to maintain test isolation

Infrastructure

Added XamlInflatorTestData class providing IEnumerable<object[]> for inflator variations
Removed NUnit package references
Removed dead code (XamlgTests.cs - was entirely commented out)

Test Results

All 1782 tests passing (same count as main branch).

Fixes #32247

Complete migration of src/Controls/tests/Xaml.UnitTests from NUnit to xUnit testing framework.

Copilot

Pull request overview

This PR migrates the Controls.Xaml.UnitTests project from NUnit to xUnit testing framework as part of issue #32247. The migration replaces NUnit attributes and assertions with xUnit equivalents while maintaining test functionality. All 1782 tests pass successfully.

Key changes:

Replaced NUnit test attributes with xUnit equivalents ([TestFixture] → [Collection], [Test] → [Fact]/[Theory])
Converted parameterized tests to use [Theory] with [XamlInflatorData] or [InlineData]
Updated assertions from NUnit syntax to xUnit (Assert.That() → Assert.Equal(), etc.)
Replaced [SetUp]/[TearDown] with constructor/IDisposable.Dispose()
Added collection attributes to organize tests and disable parallelization

Reviewed changes

Copilot reviewed 300 out of 412 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
Maui25406.xaml.cs	Migrated XamlC compilation test to xUnit with IDisposable pattern
Maui25309.xaml.cs	Converted generic converter test using XamlInflatorData
Maui25172.xaml.cs	Updated generic base class compilation test
Maui25141.xaml.cs	Migrated data trigger and multibinding test
Maui24900.xaml.cs	Converted OnPlatform test with Record.Exception pattern
Maui24849.xaml.cs	Updated VSG (Visual State Group) test with xUnit assertions
Maui24500.xaml.cs	Migrated OnIdiom binding test
Maui24472.xaml.cs	Converted x:Array test
Maui24384.xaml.cs	Updated immutable collection test
Maui2418.rtsg.xaml.cs	Migrated source info test with InlineData for specific inflators
Maui23989.xaml.cs	Converted ItemDisplayBinding test with XamlExceptionAssert
Maui23711.xaml.cs	Updated binding compilation test
Maui23347.xaml.cs	Migrated FontImageSource test
Maui23201.xaml.cs	Converted ToolBarItem AppTheme binding test
Maui2304Closed.xaml.cs	Updated XamlC test
Maui22877.xaml.cs	Migrated OnBinding release test
Maui22714.rt.xaml.cs	Converted resource dictionary test with inline data combinations
Maui22536.xaml.cs	Updated non-compiled resource dictionary test
Maui22105.xaml.cs	Migrated default value test
Maui22036.xaml.cs	Converted async style trigger leak test
(Additional files)	Similar xUnit migration patterns applied across 100+ test files

src/Controls/tests/Xaml.UnitTests/Issues/Bz18828.xaml.cs

rmarinho · 2025-12-05T17:43:46Z

src/Controls/tests/Xaml.UnitTests/Issues/Maui14158/PublicTypes.xaml.cs

-		[Test]
-		public void VerifyCorrectTypesUsed([Values] XamlInflator inflator)
+		[Theory]
+		[InlineData(XamlInflator.Runtime)]


Could this use XamlInflatorData ?

rmarinho

Did n t saw nothing bad, maybe just some exceptions where we check the lines, I wonder if we can use XamlExceptionAssert.ThrowsBuildException , but looks good to merge

rmarinho · 2025-12-05T17:50:03Z

src/Controls/tests/Xaml.UnitTests/Issues/Bz43694.rt.xaml.cs

 			else if (inflator == XamlInflator.Runtime)
-				Assert.Throws(new XamlParseExceptionConstraint(9, 6), () => new Bz43694(inflator));
+			{
+				var ex = Assert.ThrowsAny<Exception>(() => new Bz43694(inflator));


Do we need a way to check the line is correct here?

src/Controls/tests/Xaml.UnitTests/Issues/Bz44216.rt.xaml.cs

src/Controls/tests/Xaml.UnitTests/Issues/Gh2483.xaml.cs

rmarinho · 2025-12-05T18:01:48Z

src/Controls/tests/Xaml.UnitTests/Issues/Gh3082.rt.xaml.cs

+				Assert.Single(result.Diagnostics);
 			}
-			else
-				Assert.Ignore($"Test not supported for {inflator}");


We lost this one , but I think is fine.

rmarinho · 2025-12-05T18:04:40Z

src/Controls/tests/Xaml.UnitTests/Issues/Gh4751.rt.xaml.cs

@@ -46,7 +47,7 @@ public partial class Gh4751 : ContentPage
 """)
 					.RunMauiSourceGenerator(typeof(Gh4751));
 				//FIXME check the diagnostic code


Can we fix it now?

rmarinho · 2025-12-05T18:05:49Z

src/Controls/tests/Xaml.UnitTests/Issues/Gh5378_1.rt.xaml.cs

@@ -34,10 +35,8 @@ public partial class Gh5378_1 : ContentPage
 """)
 					.RunMauiSourceGenerator(typeof(Gh5378_1));
 				//FIXME check diagnostic code


can we fix it ?

rmarinho · 2025-12-05T18:08:01Z

src/Controls/tests/Xaml.UnitTests/Issues/Gh7187.rt.xaml.cs

@@ -34,10 +35,10 @@ public partial class Gh7187 : ContentPage
 """)
 					.RunMauiSourceGenerator(typeof(Gh7187));
 				//FIXME check diagnostic code


Can we check the code now ?

src/Controls/tests/Xaml.UnitTests/Issues/Issue2450.rt.xaml.cs

src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs

rmarinho · 2025-12-05T18:53:52Z

src/Controls/tests/Xaml.UnitTests/Issues/TestCases.cs

@@ -218,7 +219,6 @@ public void Issue1493(string culture)
 							cmp:RelativeLayout.WidthConstraint=""{cmp:ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.6}""/>";
 			View view = new View();
 			view.LoadFromXaml(xaml);


DO we need to use the Record.

src/Controls/tests/Xaml.UnitTests/FontConverterTests.cs

- Bz43694, Bz44216, Issue2450: Use XamlExceptionAssert to check exception line/position and message content - Maui17222: Replace IDisposable with try/finally for cleanup

Migrate Xaml.UnitTests from NUnit to xUnit

e69b5a8

Complete migration of src/Controls/tests/Xaml.UnitTests from NUnit to xUnit testing framework.

StephaneDelcroix force-pushed the feature/xaml-unittests-xunit-migration-32247 branch from 2c971b9 to e69b5a8 Compare December 5, 2025 11:38

StephaneDelcroix marked this pull request as ready for review December 5, 2025 11:38

Copilot AI review requested due to automatic review settings December 5, 2025 11:38

Copilot AI reviewed Dec 5, 2025

View reviewed changes

rmarinho reviewed Dec 5, 2025

View reviewed changes

src/Controls/tests/Xaml.UnitTests/Issues/Bz18828.xaml.cs Show resolved Hide resolved

rmarinho reviewed Dec 5, 2025

View reviewed changes

rmarinho previously approved these changes Dec 5, 2025

View reviewed changes

rmarinho reviewed Dec 5, 2025

View reviewed changes

src/Controls/tests/Xaml.UnitTests/FontConverterTests.cs Show resolved Hide resolved

Improve exception tests and remove unnecessary IDisposable

b976921

- Bz43694, Bz44216, Issue2450: Use XamlExceptionAssert to check exception line/position and message content - Maui17222: Replace IDisposable with try/finally for cleanup

StephaneDelcroix dismissed rmarinho’s stale review via b976921 December 6, 2025 10:58

rmarinho approved these changes Dec 6, 2025

View reviewed changes

rmarinho merged commit 36cd96a into main Dec 6, 2025
155 of 163 checks passed

rmarinho deleted the feature/xaml-unittests-xunit-migration-32247 branch December 6, 2025 13:22

github-actions bot locked and limited conversation to collaborators Jan 6, 2026

Conversation

StephaneDelcroix commented Dec 5, 2025

Description

Changes

Test Framework Migration

Test Organization

Infrastructure

Test Results

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rmarinho left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants