Tests all compile

Author: Keboo

src/MaterialDesignThemes.Wpf/ResourceDictionaryExtensions.g.cs

@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by mdresgen.
+//     This code was generated by MaterialDesignToolkit.ResourceGeneration.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

src/MaterialDesignThemes.Wpf/Theme.g.cs

@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by mdresgen.
+//     This code was generated by MaterialDesignToolkit.ResourceGeneration.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs

@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by mdresgen.
+//     This code was generated by MaterialDesignToolkit.ResourceGeneration.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

src/MaterialDesignToolkit.ResourceGeneration/Brushes.cs

@@ -482,7 +482,7 @@ void WriteBrush(Brush brush, string name)
                     {{indent}}{{indent}}{
                     {{indent}}{{indent}}{{indent}}IVisualElement<TextBlock> textBlock = await panel.GetElement<TextBlock>("[Text=\"{{name}}\"]");
                     {{indent}}{{indent}}{{indent}}Color? textBlockBackground = await textBlock.GetBackgroundColor();
-                    {{indent}}{{indent}}{{indent}}Assert.Equal(await GetResourceColor("{{brush.Name}}"), textBlockBackground);
+                    {{indent}}{{indent}}{{indent}}await Assert.That(textBlockBackground).IsEqualTo(await GetResourceColor("{{brush.Name}}"));
                     {{indent}}{{indent}}}
                     """);
             }

tests/MaterialDesignThemes.UITests/MaterialDesignSpec.cs

@@ -17,11 +17,12 @@ public static class MaterialDesignSpec
     /// </summary>
     public const double MinimumContrastLargeText = 3.0;
 
-    public static void AssertContrastRatio(Color foreground, Color background, double minimumContrastRatio)
+    public static async Task AssertContrastRatio(Color foreground, Color background, double minimumContrastRatio)
     {
         const double tolerance = 0.1;
 
-        var ratio = ColorAssist.ContrastRatio(foreground, background);
-        await Assert.True(ratio >= minimumContrastRatio - tolerance, $"Contrast ratio '{ratio}' is less than {minimumContrastRatio} with a tolerance of 0.1");
+        double ratio = ColorAssist.ContrastRatio(foreground, background);
+        await Assert.That(ratio).IsGreaterThanOrEqualTo(minimumContrastRatio - tolerance)
+            .Because($"Contrast ratio '{ratio}' is less than {minimumContrastRatio} with a tolerance of 0.1");
     }
 }

tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj

@@ -31,6 +31,7 @@
 
   <ItemGroup>
     <Using Include="MaterialDesignThemes.Wpf" />
+    <Using Include="MaterialDesignThemes.UITests.TUnit"/>
     <Using Include="XamlTest" />
   </ItemGroup>
 

tests/MaterialDesignThemes.UITests/TUnit/IsCloseToExtensions.cs

@@ -0,0 +1,51 @@
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using TUnit.Assertions.AssertConditions;
+using TUnit.Assertions.AssertConditions.Interfaces;
+using TUnit.Assertions.AssertionBuilders;
+
+namespace MaterialDesignThemes.UITests.TUnit;
+
+public static class IsCloseToExtensions
+{
+    public static IsCloseToWrapper<double> IsCloseTo(this IValueSource<double> valueSource, double expected, double precision, [CallerArgumentExpression(nameof(expected))] string? doNotPopulateThisValue1 = null, [CallerArgumentExpression(nameof(precision))] string? doNotPopulateThisValue2 = null)
+    {
+        var assertionBuilder = valueSource.RegisterAssertion(new IsCloseToCondition<double>(expected, precision)
+            , [doNotPopulateThisValue1, doNotPopulateThisValue2]);
+
+        return new IsCloseToWrapper<double>(assertionBuilder);
+    }
+
+    public static IsCloseToWrapper<float> IsCloseTo(this IValueSource<float> valueSource, float expected, float precision, [CallerArgumentExpression(nameof(expected))] string? doNotPopulateThisValue1 = null, [CallerArgumentExpression(nameof(precision))] string? doNotPopulateThisValue2 = null)
+    {
+        var assertionBuilder = valueSource.RegisterAssertion(new IsCloseToCondition<float>(expected, precision)
+            , [doNotPopulateThisValue1, doNotPopulateThisValue2]);
+
+        return new IsCloseToWrapper<float>(assertionBuilder);
+    }
+}
+
+public class IsCloseToWrapper<TActual>(InvokableAssertionBuilder<TActual> invokableAssertionBuilder)
+    : InvokableValueAssertionBuilder<TActual>(invokableAssertionBuilder);
+
+file class IsCloseToCondition<TActual>(TActual expected, TActual tolerance) : BaseAssertCondition<TActual>
+    where TActual :
+    IFloatingPoint<TActual>,
+    INumberBase<TActual>
+{
+    protected override string GetExpectation() => $"to be within {tolerance} of {expected}";
+
+    protected override ValueTask<AssertionResult> GetResult(
+        TActual? actualValue, Exception? exception,
+        AssertionMetadata assertionMetadata
+    )
+    {
+        if(actualValue is null)
+            return AssertionResult.Fail("received null");
+
+        TActual difference = actualValue - expected;
+        TActual absoluteDifference = TActual.Abs(difference);
+        bool isInRange = absoluteDifference <= tolerance;
+        return AssertionResult.FailIf(!isInRange, $"received {actualValue}");
+    }
+}

tests/MaterialDesignThemes.UITests/TestBase.cs

@@ -18,15 +18,15 @@
 
 namespace MaterialDesignThemes.UITests;
 
-file record SingleParallelLimit : IParallelLimit
+public record SingleParallelLimit : IParallelLimit
 {
     public int Limit => 1;
 }
 
 public abstract class TestBase()
 {
     protected bool AttachedDebuggerToRemoteProcess { get; set; } = true;
-    protected TextWriter Output => TestContext.Current?.OutputWriter ?? throw new InvalidOperationException("Could not find output writer");
+    protected static TextWriter Output => TestContext.Current?.OutputWriter ?? throw new InvalidOperationException("Could not find output writer");
 
     [NotNull]
     protected IApp? App { get; set; }

tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs

@@ -1,14 +1,9 @@
 using System.Windows.Media;
 
-
 namespace MaterialDesignThemes.UITests.WPF.Cards;
 
 public class OutlinedCardTests : TestBase
 {
-    public OutlinedCardTests(ITestOutputHelper output)
-        : base(output)
-    { }
-
     [Test]
     public async Task OutlinedCard_UsesThemeColorForBorder()
     {
@@ -24,7 +19,7 @@ public async Task OutlinedCard_UsesThemeColorForBorder()
         Color? internalBorderColor = await internalBorder.GetBorderBrushColor();
 
         //Assert
-        await Assert.Equal(dividerColor, internalBorderColor);
+        await Assert.That(internalBorderColor).IsEqualTo(dividerColor);
 
         recorder.Success();
     }
@@ -43,10 +38,10 @@ public async Task OutlinedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnB
         CornerRadius? internalBorderCornerRadius = await internalBorder.GetCornerRadius();
 
         //Assert
-        await Assert.Equal(5, internalBorderCornerRadius.Value.TopLeft);
-        await Assert.Equal(5, internalBorderCornerRadius.Value.TopRight);
-        await Assert.Equal(5, internalBorderCornerRadius.Value.BottomRight);
-        await Assert.Equal(5, internalBorderCornerRadius.Value.BottomLeft);
+        await Assert.That(internalBorderCornerRadius.Value.TopLeft).IsEqualTo(5);
+        await Assert.That(internalBorderCornerRadius.Value.TopRight).IsEqualTo(5);
+        await Assert.That(internalBorderCornerRadius.Value.BottomRight).IsEqualTo(5);
+        await Assert.That(internalBorderCornerRadius.Value.BottomLeft).IsEqualTo(5);
 
         recorder.Success();
     }

tests/MaterialDesignThemes.UITests/WPF/ColorPickerTests.cs

@@ -1,16 +1,10 @@
 using System.Windows.Media;
 using MaterialDesignColors.ColorManipulation;
 
-
 namespace MaterialDesignThemes.UITests.WPF;
 
 public class ColorPickerTests : TestBase
 {
-    public ColorPickerTests(ITestOutputHelper output)
-        : base(output)
-    {
-    }
-
     [Test]
     public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
     {
@@ -35,7 +29,7 @@ public async Task OnLostFocusIfSelectedTimeIsNull_DatePartWillBeToday()
 
 
         double currentBrightness = (await colorPicker.GetColor()).ToHsb().Brightness;
-        await Assert.True(currentBrightness < lastBrightness, $"Brightness {currentBrightness} is not less than {lastBrightness}");
+        await Assert.That(currentBrightness).IsLessThan(lastBrightness);
 
         recorder.Success();
     }