Starting conversion to TUnit

Author: Keboo

Directory.packages.props

@@ -26,10 +26,11 @@
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="TUnit" Version="0.16.28" />
     <PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
     <PackageVersion Include="XAMLTest" Version="1.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
     <PackageVersion Include="Xunit.StaFact" Version="2.0.36-alpha" />
     <PackageVersion Include="xunit.v3" Version="1.1.0" />
   </ItemGroup>
-</Project>
+</Project>

src/MaterialDesignColors.Wpf/SwatchesProvider.cs

@@ -12,6 +12,7 @@ namespace MaterialDesignColors;
 /// </summary>
 public class SwatchesProvider
 {
+    private static readonly object _syncLock = new();
     /// <summary>
     /// Generates an instance reading swatches from the provided assembly, allowing 
     /// colours outside of the standard material palette to be loaded provided the are stored in the expected XAML format.
@@ -39,12 +40,7 @@ public SwatchesProvider(Assembly assembly)
                 Read(assemblyName, x.SingleOrDefault(y => y.match.Groups["type"].Value == "primary")?.key),
                 Read(assemblyName, x.SingleOrDefault(y => y.match.Groups["type"].Value == "secondary")?.key)
             ))
-            .ToList() ??
-#if NETCOREAPP3_1_OR_GREATER
-            (IEnumerable<Swatch>)Array.Empty<Swatch>();
-#else
-            (IEnumerable<Swatch>)new Swatch[0];
-#endif
+            .ToList() ?? [];
     }
 
     /// <summary>
@@ -98,8 +94,12 @@ static Hue GetHue(ResourceDictionary dictionary, DictionaryEntry entry)
         if (assemblyName is null || path is null)
             return null;
 
-        return (ResourceDictionary)Application.LoadComponent(new Uri(
-            $"/{assemblyName};component/{path.Replace(".baml", ".xaml")}",
-            UriKind.RelativeOrAbsolute));
+        lock (_syncLock)
+        {
+            //NB: Application.LoadComponent is not thread safe
+            return (ResourceDictionary)Application.LoadComponent(new Uri(
+                $"/{assemblyName};component/{path.Replace(".baml", ".xaml")}",
+                UriKind.RelativeOrAbsolute));
+        }
     }
 }

tests/MaterialDesignColors.Wpf.Tests/ColorAssistTests.cs

@@ -1,21 +1,20 @@
 using System.Windows.Media;
 using MaterialDesignColors.ColorManipulation;
-using Xunit;
 
 namespace MaterialDesignColors.Wpf.Tests;
 
 public class ColorAssistTests
 {
-    [Fact]
-    public void EnsureContrastRatio_AdjustsColor()
+    [Test]
+    public async Task EnsureContrastRatio_AdjustsColor()
     {
         var background = Color.FromRgb(0xFA, 0xFA, 0xFA);
         var foreground = Color.FromRgb(0xFF, 0xC1, 0x07);
 
         var adjusted = foreground.EnsureContrastRatio(background, 3.0f);
 
         double contrastRatio = adjusted.ContrastRatio(background);
-        Assert.True(contrastRatio >= 2.9);
-        Assert.True(contrastRatio <= 3.1);
+        await Assert.That(contrastRatio).IsGreaterThanOrEqualTo(2.9);
+        await Assert.That(contrastRatio).IsLessThanOrEqualTo(3.1);
     }
 }

tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj

@@ -31,12 +31,6 @@
     <PackageReference Include="System.Net.Http" />
     <PackageReference Include="System.Private.Uri" />
     <PackageReference Include="System.Text.RegularExpressions" />
-    <PackageReference Include="Shouldly" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="TUnit" />
   </ItemGroup>
 </Project>

tests/MaterialDesignColors.Wpf.Tests/ResourceProviderFixture.cs

@@ -1,65 +1,62 @@
-using Shouldly;
-using Xunit;
-
-namespace MaterialDesignColors.Wpf.Tests;
+namespace MaterialDesignColors.Wpf.Tests;
 
 public class ResourceProviderFixture
 {
-    [Fact]
-    public void ExcludesBlack()
+    [Test]
+    public async Task ExcludesBlack()
     {
         SwatchesProvider swatchesProvider = new ();
 
         bool containsBlack = swatchesProvider.Swatches.Any(
             swatch => string.Compare(swatch.Name, "Black", StringComparison.InvariantCultureIgnoreCase) == 0);
 
-        containsBlack.ShouldBe(false);
+        await Assert.That(containsBlack).IsFalse();
     }
 
-    [Fact]
-    public void IncludesGrey()
+    [Test]
+    public async Task IncludesGrey()
     {
         SwatchesProvider swatchesProvider = new ();
 
         bool containsBlack = swatchesProvider.Swatches.Any(
             swatch => string.Compare(swatch.Name, "Grey", StringComparison.InvariantCultureIgnoreCase) == 0);
 
-        containsBlack.ShouldBe(true);
+        await Assert.That(containsBlack).IsTrue();
     }
 
-    [Fact]
-    public void BrownHasNoSecondary()
+    [Test]
+    public async Task BrownHasNoSecondary()
     {
         SwatchesProvider swatchesProvider = new ();
 
         var brownSwatch = swatchesProvider.Swatches.Single(
             swatch => swatch.Name == "brown");
 
-        brownSwatch.SecondaryHues.ShouldNotBeNull();
-        brownSwatch.SecondaryHues.Count.ShouldBe(0);
+        await Assert.That(brownSwatch.SecondaryHues).IsNotNull();
+        await Assert.That(brownSwatch.SecondaryHues.Count).IsEqualTo(0);
     }
 
-    [Fact]
-    public void BrownHasPrimaries()
+    [Test]
+    public async Task BrownHasPrimaries()
     {
         SwatchesProvider swatchesProvider = new ();
 
         var brownSwatch = swatchesProvider.Swatches.Single(
             swatch => swatch.Name == "brown");
 
-        brownSwatch.PrimaryHues.ShouldNotBeNull();
-        brownSwatch.PrimaryHues.Count.ShouldBe(10);
+        await Assert.That(brownSwatch.PrimaryHues).IsNotNull();
+        await Assert.That(brownSwatch.PrimaryHues.Count).IsEqualTo(10);
     }
 
-    [Fact]
-    public void IndigoHasSecondaries()
+    [Test]
+    public async Task IndigoHasSecondaries()
     {
         SwatchesProvider swatchesProvider = new ();
 
         var brownSwatch = swatchesProvider.Swatches.Single(
             swatch => swatch.Name == "indigo");
 
-        brownSwatch.SecondaryHues.ShouldNotBeNull();
-        brownSwatch.SecondaryHues.Count.ShouldBe(4);
+        await Assert.That(brownSwatch.SecondaryHues).IsNotNull();
+        await Assert.That(brownSwatch.SecondaryHues.Count).IsEqualTo(4);
     }
 }

tests/MaterialDesignThemes.UITests/AllStyles.cs

@@ -1,40 +1,35 @@
-using System.Reflection;
-using MaterialDesignColors;
+using MaterialDesignColors;
 
 namespace MaterialDesignThemes.UITests;
 
 public class AllStyles : TestBase
 {
-    public AllStyles(ITestOutputHelper output)
-        : base(output)
-    { }
-
-    [Theory]
-    [InlineData("Button", "MaterialDesignRaisedButton")]
-    [InlineData("Calendar", "MaterialDesignCalendarPortrait")]
-    [InlineData("CheckBox", "MaterialDesignCheckBox")]
-    [InlineData("ComboBox", "MaterialDesignComboBox")]
-    [InlineData("DataGrid", "MaterialDesignDataGrid")]
-    [InlineData("DatePicker", "MaterialDesignDatePicker")]
-    [InlineData("Expander", "MaterialDesignExpander")]
-    [InlineData("GridSplitter", "MaterialDesignGridSplitter")]
-    [InlineData("GroupBox", "MaterialDesignGroupBox")]
-    [InlineData("Label", "MaterialDesignLabel")]
-    [InlineData("ListBox", "MaterialDesignListBox")]
-    [InlineData("ListView", "MaterialDesignListView")]
-    [InlineData("Menu", "MaterialDesignMenu")]
-    [InlineData("PasswordBox", "MaterialDesignPasswordBox")]
-    [InlineData("ProgressBar", "MaterialDesignLinearProgressBar")]
-    [InlineData("RadioButton", "MaterialDesignRadioButton")]
-    [InlineData("RichTextBox", "MaterialDesignRichTextBox")]
-    [InlineData("ScrollBar", "MaterialDesignScrollBar")]
-    [InlineData("ScrollViewer", "MaterialDesignScrollViewer")]
-    [InlineData("Slider", "MaterialDesignSlider")]
-    [InlineData("TabControl", "MaterialDesignTabControl")]
-    [InlineData("TextBox", "MaterialDesignTextBox")]
-    [InlineData("ToggleButton", "MaterialDesignSwitchToggleButton")]
-    [InlineData("ToolBar", "MaterialDesignToolBar")]
-    [InlineData("TreeView", "MaterialDesignTreeView")]
+    [Test]
+    [Arguments("Button", "MaterialDesignRaisedButton")]
+    [Arguments("Calendar", "MaterialDesignCalendarPortrait")]
+    [Arguments("CheckBox", "MaterialDesignCheckBox")]
+    [Arguments("ComboBox", "MaterialDesignComboBox")]
+    [Arguments("DataGrid", "MaterialDesignDataGrid")]
+    [Arguments("DatePicker", "MaterialDesignDatePicker")]
+    [Arguments("Expander", "MaterialDesignExpander")]
+    [Arguments("GridSplitter", "MaterialDesignGridSplitter")]
+    [Arguments("GroupBox", "MaterialDesignGroupBox")]
+    [Arguments("Label", "MaterialDesignLabel")]
+    [Arguments("ListBox", "MaterialDesignListBox")]
+    [Arguments("ListView", "MaterialDesignListView")]
+    [Arguments("Menu", "MaterialDesignMenu")]
+    [Arguments("PasswordBox", "MaterialDesignPasswordBox")]
+    [Arguments("ProgressBar", "MaterialDesignLinearProgressBar")]
+    [Arguments("RadioButton", "MaterialDesignRadioButton")]
+    [Arguments("RichTextBox", "MaterialDesignRichTextBox")]
+    [Arguments("ScrollBar", "MaterialDesignScrollBar")]
+    [Arguments("ScrollViewer", "MaterialDesignScrollViewer")]
+    [Arguments("Slider", "MaterialDesignSlider")]
+    [Arguments("TabControl", "MaterialDesignTabControl")]
+    [Arguments("TextBox", "MaterialDesignTextBox")]
+    [Arguments("ToggleButton", "MaterialDesignSwitchToggleButton")]
+    [Arguments("ToolBar", "MaterialDesignToolBar")]
+    [Arguments("TreeView", "MaterialDesignTreeView")]
     public async Task LoadStyleInIsolation_CanBeLoaded(string controlName, string styleName)
     {
         await using var recorder = new TestRecorder(App);
@@ -57,7 +52,7 @@ public async Task LoadStyleInIsolation_CanBeLoaded(string controlName, string st
         await App.Initialize(applicationResourceXaml,
             Path.GetFullPath("MaterialDesignColors.dll"),
             Path.GetFullPath("MaterialDesignThemes.Wpf.dll"),
-            Assembly.GetExecutingAssembly().Location);
+            System.Reflection.Assembly.GetExecutingAssembly().Location);
 
         IWindow window = await App.CreateWindow($$"""
              <Window
@@ -82,7 +77,7 @@ await App.Initialize(applicationResourceXaml,
             </Window>
             """);
 
-        Assert.True(await window.GetIsVisible());
+        await Assert.That(await window.GetIsVisible()).IsTrue();
 
         recorder.Success();
     }

tests/MaterialDesignThemes.UITests/MaterialDesignSpec.cs

@@ -22,6 +22,6 @@ public static void AssertContrastRatio(Color foreground, Color background, doubl
         const double tolerance = 0.1;
 
         var ratio = ColorAssist.ContrastRatio(foreground, background);
-        Assert.True(ratio >= minimumContrastRatio - tolerance, $"Contrast ratio '{ratio}' is less than {minimumContrastRatio} with a tolerance of 0.1");
+        await Assert.True(ratio >= minimumContrastRatio - tolerance, $"Contrast ratio '{ratio}' is less than {minimumContrastRatio} with a tolerance of 0.1");
     }
 }

tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj

@@ -26,13 +26,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="TUnit" />
   </ItemGroup>
 
   <ItemGroup>
     <Using Include="MaterialDesignThemes.Wpf" />
     <Using Include="XamlTest" />
-    <Using Include="Xunit" />
   </ItemGroup>
 
   <ItemGroup>

tests/MaterialDesignThemes.UITests/TestBase.cs

@@ -1,7 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Media;
+using MaterialDesignThemes.UITests;
+using TUnit.Core.Interfaces;
 
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
+[assembly: ParallelLimiter<SingleParallelLimit>]
 [assembly: GenerateHelpers(typeof(AutoSuggestBox))]
 [assembly: GenerateHelpers(typeof(ColorPicker))]
 [assembly: GenerateHelpers(typeof(DecimalUpDown))]
@@ -16,10 +18,15 @@
 
 namespace MaterialDesignThemes.UITests;
 
-public abstract class TestBase(ITestOutputHelper output) : IAsyncLifetime
+file record SingleParallelLimit : IParallelLimit
+{
+    public int Limit => 1;
+}
+
+public abstract class TestBase()
 {
     protected bool AttachedDebuggerToRemoteProcess { get; set; } = true;
-    protected ITestOutputHelper Output { get; } = output ?? throw new ArgumentNullException(nameof(output));
+    protected TextWriter Output => TestContext.Current?.OutputWriter ?? throw new InvalidOperationException("Could not find output writer");
 
     [NotNull]
     protected IApp? App { get; set; }
@@ -46,6 +53,7 @@ protected async Task<IVisualElement> LoadUserControl(Type userControlType)
         return await App.CreateWindowWithUserControl(userControlType);
     }
 
+    [Before(Test)]
     public async ValueTask InitializeAsync() =>
         App = await XamlTest.App.StartRemote(new AppOptions
         {
@@ -56,5 +64,6 @@ public async ValueTask InitializeAsync() =>
             LogMessage = Output.WriteLine
         });
 
+    [After(Test)]
     public async ValueTask DisposeAsync() => await App.DisposeAsync();
 }