Tests are now compiling

tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs

@@ -25,7 +25,7 @@ public async Task CanGenerateHoursButtonsWith24Hours()
         var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
 
         var expected = Enumerable.Range(13, 11).Select(x => $"{x:00}")
-            .Concat(new[] { "00" })
+            .Concat(["00"])
             .Concat(Enumerable.Range(1, 12).Select(x => $"{x:#}"));
         await Assert.That(buttonContents.OrderBy(x => x)).IsEqualTo(expected.OrderBy(x => x));
     }

tests/MaterialDesignThemes.Wpf.Tests/ColorPickerTests.cs

@@ -6,14 +6,14 @@ namespace MaterialDesignThemes.Wpf.Tests;
 //TODO: Many of these tests could be moved over to MaterialDesignThemes.UITests
 public class ColorPickerTests
 {
-    private readonly ColorPicker _colorPicker;
-    private readonly Slider _hueSlider;
-    private readonly Canvas _saturationBrightnessPicker;
-    private readonly Thumb _saturationBrightnessPickerThumb;
+    private readonly ColorPicker _colorPicker = new();
+    private Slider _hueSlider = null!;
+    private Canvas _saturationBrightnessPicker = null!;
+    private Thumb _saturationBrightnessPickerThumb = null!;
 
-    public ColorPickerTests()
+    [Before(Test)]
+    public void Setup()
     {
-        _colorPicker = new ColorPicker();
         _colorPicker.ApplyDefaultStyle();
         _colorPicker.Arrange(new Rect(0, 0, 400, 100));
 

tests/MaterialDesignThemes.Wpf.Tests/Converters/MathConverterTests.cs

@@ -1,18 +1,15 @@
 using System.Globalization;
 using System.Windows.Data;
 using MaterialDesignThemes.Wpf.Converters;
-using TUnit.Core;
-using TUnit.Assertions;
-using TUnit.Assertions.Extensions;
-using System.Threading.Tasks;
 
 namespace MaterialDesignThemes.Wpf.Tests.Converters;
 
 public sealed class MathConverterTests
 {
     [Test]
-    [EnumData]
-    public async Task EnumValues_AreAllHandled(MathOperation operation)
+    [MatrixDataSource]
+    public async Task EnumValues_AreAllHandled(
+        [EnumData<MathOperation>] MathOperation operation)
     {
         MathConverter converter = new()
         {

tests/MaterialDesignThemes.Wpf.Tests/Converters/MathMultipleConverterTests.cs

@@ -1,17 +1,14 @@
 using System.Globalization;
 using MaterialDesignThemes.Wpf.Converters;
-using TUnit.Core;
-using TUnit.Assertions;
-using TUnit.Assertions.Extensions;
-using System.Threading.Tasks;
 
 namespace MaterialDesignThemes.Wpf.Tests.Converters;
 
 public sealed class MathMultipleConverterTests
 {
     [Test]
-    [EnumData]
-    public async Task EnumValues_AreAllHandled(MathOperation operation)
+    [MatrixDataSource]
+    public async Task EnumValues_AreAllHandled(
+        [EnumData<MathOperation>]MathOperation operation)
     {
         MathMultipleConverter converter = new()
         {

tests/MaterialDesignThemes.Wpf.Tests/DialogHostTests.cs

@@ -4,18 +4,19 @@
 
 namespace MaterialDesignThemes.Wpf.Tests;
 
-public class DialogHostTests : IDisposable
+public class DialogHostTests
 {
-    private readonly DialogHost _dialogHost;
+    private readonly DialogHost _dialogHost = new();
 
-    public DialogHostTests()
+    [Before(Test)]
+    public void Setup()
     {
-        _dialogHost = new DialogHost();
         _dialogHost.ApplyDefaultStyle();
         _dialogHost.RaiseEvent(new RoutedEventArgs(FrameworkElement.LoadedEvent));
     }
 
-    public void Dispose()
+    [After(Test)]
+    public void Cleanup()
     {
         _dialogHost.RaiseEvent(new RoutedEventArgs(FrameworkElement.UnloadedEvent));
     }
@@ -403,7 +404,7 @@ public async Task WhenOnlySingleDialogHostIdentifierIsNullItShowsDialog()
     }
 
     [Test, STAThreadExecutor]
-    public async Task GetDialogSession_ShouldAllowAccessFromMultipleUIThreads()
+    public void GetDialogSession_ShouldAllowAccessFromMultipleUIThreads()
     {
         DialogHost? dialogHost = null;
         DialogHost? dialogHostOnOtherUiThread = null;

tests/MaterialDesignThemes.Wpf.Tests/EnumDataAttribute.cs

@@ -1,27 +1,15 @@
-using System.Reflection;
+namespace MaterialDesignThemes.Wpf.Tests;
 
-namespace MaterialDesignThemes.Wpf.Tests;
-
-public class EnumDataAttribute : DataAttribute
+public class EnumDataAttribute<TEnum> : MatrixAttribute<TEnum>
+    where TEnum : struct, Enum
 {
-    public override ValueTask<IReadOnlyCollection<ITheoryDataRow>> GetData(MethodInfo testMethod, DisposalTracker disposalTracker)
+    public EnumDataAttribute()
+#if NET6_0_OR_GREATER
+        : base(Enum.GetValues<TEnum>())
+#else
+        : base([.. Enum.GetValues(typeof(TEnum)).OfType<TEnum>()])
+#endif
     {
-        ParameterInfo[] parameters = testMethod.GetParameters();
-        if (parameters.Length != 1 ||
-            !parameters[0].ParameterType.IsEnum)
-        {
-            throw new Exception($"{testMethod.DeclaringType?.FullName}.{testMethod.Name} must have a single enum parameter");
-        }
-
-        return new([..GetDataImplementation(parameters[0].ParameterType)]);
 
-        static IEnumerable<ITheoryDataRow> GetDataImplementation(Type parameterType)
-        {
-            foreach (object enumValue in Enum.GetValues(parameterType).OfType<object>())
-            {
-                yield return new TheoryDataRow(enumValue);
-            }
-        }
     }
-    public override bool SupportsDiscoveryEnumeration() => true;
 }

tests/MaterialDesignThemes.Wpf.Tests/FlipperAssistTests.cs

@@ -30,7 +30,7 @@ public async Task CardStyle_StyleWithWrongTargetType_AttachedPropertyNotSet()
     }
 
     [Test, STAThreadExecutor]
-    public void CardStyle_StyleWithCorrectTargetType_AttachedPropertySet()
+    public async Task CardStyle_StyleWithCorrectTargetType_AttachedPropertySet()
     {
         // Arrange
         var style = new Style(typeof(Card));
@@ -43,7 +43,7 @@ public void CardStyle_StyleWithCorrectTargetType_AttachedPropertySet()
     }
 
     [Test, STAThreadExecutor]
-    public void CardStyle_StyleWithDerivedCardTargetType_AttachedPropertySet()
+    public async Task CardStyle_StyleWithDerivedCardTargetType_AttachedPropertySet()
     {
         // Arrange
         var style = new Style(typeof(DerivedCard));

tests/MaterialDesignThemes.Wpf.Tests/MdixHelper.cs

@@ -13,10 +13,10 @@ static MdixHelper()
 
     private static ResourceDictionary GenericResourceDictionary => GetResourceDictionary("Generic.xaml");
 
-    public static async Task ApplyStyle<T>(this T control, object styleKey, bool applyTemplate = true) where T : FrameworkElement
+    public static void ApplyStyle<T>(this T control, object styleKey, bool applyTemplate = true) where T : FrameworkElement
     {
-        var style = GetStyle(styleKey);
-        await Assert.That(style).IsNotNull().Because($"Could not find style with key '{styleKey}' for control type {typeof(T).FullName}");
+        var style = GetStyle(styleKey) ?? throw new InvalidOperationException($"Could not find style with key '{styleKey}' for control type {typeof(T).FullName}");
+
         control.Style = style;
         if (applyTemplate)
         {

tests/MaterialDesignThemes.Wpf.Tests/Properties/AssemblyInfo.cs

@@ -8,5 +8,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("a361c80e-f6cd-4c57-a96c-002db159c1f4")]
-
-[assembly: CollectionBehavior(DisableTestParallelization = true)]

tests/MaterialDesignThemes.Wpf.Tests/SnackbarMessageQueueItemTests.cs

@@ -7,7 +7,7 @@ public async Task IsDuplicate_ThrowsOnNullArgument()
     {
         SnackbarMessageQueueItem item = CreateItem();
         var ex = await Assert.That(() => item.IsDuplicate(null!)).ThrowsExactly<ArgumentNullException>();
-        await Assert.That(ex.ParamName).IsEqualTo("value");
+        await Assert.That(ex?.ParamName).IsEqualTo("value");
     }
 
     [Test]

tests/MaterialDesignThemes.Wpf.Tests/TextBlockTests.cs

@@ -11,7 +11,7 @@ public async Task DefaultVerticalAlignment_ShouldBeStretch()
         foreach (var styleKey in MdixHelper.GetStyleKeysFor<TextBlock>())
         {
             var textBlock = new TextBlock();
-            await textBlock.ApplyStyle(styleKey, false);
+            textBlock.ApplyStyle(styleKey, false);
 
             await Assert.That(textBlock.VerticalAlignment).IsEqualTo(VerticalAlignment.Stretch);
         }