From a29ecf8f9c05f6412b718c75a4f827da0e3df95c Mon Sep 17 00:00:00 2001 From: JLdgu Date: Sun, 12 May 2024 11:51:46 +0100 Subject: [PATCH] Use recent language features on Themes.WPF Test Converters --- .../Converters/BrushOpacityConverterTests.cs | 5 ++- .../DoubleToCornerRadiusConverterTests.cs | 5 ++- .../FloatingHintTransformConverterTests.cs | 36 ++++++++++--------- .../Converters/MathConverterTests.cs | 5 ++- .../Converters/MathMultipleConverterTests.cs | 7 ++-- .../Converters/SliderToolTipConverterTests.cs | 15 ++++---- 6 files changed, 35 insertions(+), 38 deletions(-) diff --git a/tests/MaterialDesignThemes.Wpf.Tests/Converters/BrushOpacityConverterTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/Converters/BrushOpacityConverterTests.cs index e0fda328b8..fc70855b1c 100644 --- a/tests/MaterialDesignThemes.Wpf.Tests/Converters/BrushOpacityConverterTests.cs +++ b/tests/MaterialDesignThemes.Wpf.Tests/Converters/BrushOpacityConverterTests.cs @@ -1,11 +1,10 @@ using System.Globalization; using System.Windows.Media; using MaterialDesignThemes.Wpf.Converters; -using Xunit; namespace MaterialDesignThemes.Wpf.Tests.Converters; -public class BrushOpacityConverterTests +public sealed class BrushOpacityConverterTests { [Theory] [InlineData("0.16", 0.16)] @@ -14,7 +13,7 @@ public void AllCultureParseParameterCorrectly(object parameter, double expectedO var converter = new BrushOpacityConverter(); foreach (var culture in CultureInfo.GetCultures(CultureTypes.AllCultures)) { - var inputBrush = new SolidColorBrush { Color = Colors.Red }; + SolidColorBrush inputBrush = new () { Color = Colors.Red }; var brush = (SolidColorBrush?)converter.Convert(inputBrush, typeof(Brush), parameter, culture); Assert.Equal(expectedOpacity, brush?.Opacity); } diff --git a/tests/MaterialDesignThemes.Wpf.Tests/Converters/DoubleToCornerRadiusConverterTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/Converters/DoubleToCornerRadiusConverterTests.cs index f6ffbe47fb..b943c4f1fa 100644 --- a/tests/MaterialDesignThemes.Wpf.Tests/Converters/DoubleToCornerRadiusConverterTests.cs +++ b/tests/MaterialDesignThemes.Wpf.Tests/Converters/DoubleToCornerRadiusConverterTests.cs @@ -1,10 +1,9 @@ using System.Globalization; using MaterialDesignThemes.Wpf.Converters; -using Xunit; namespace MaterialDesignThemes.Wpf.Tests.Converters; -public class DoubleToCornerRadiusConverterTests +public sealed class DoubleToCornerRadiusConverterTests { [Theory] [InlineData(-0.16, 0.0)] @@ -12,7 +11,7 @@ public class DoubleToCornerRadiusConverterTests [InlineData(5.0, 5.0)] public void AllCultureParseParameterCorrectly(object parameter, double expectedCornerRadius) { - var converter = new DoubleToCornerRadiusConverter(); + DoubleToCornerRadiusConverter converter = new (); foreach (var culture in CultureInfo.GetCultures(CultureTypes.AllCultures)) { var cornerRadius = (CornerRadius?)converter.Convert(parameter, typeof(CornerRadius), parameter, culture); diff --git a/tests/MaterialDesignThemes.Wpf.Tests/Converters/FloatingHintTransformConverterTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/Converters/FloatingHintTransformConverterTests.cs index 941e672fba..0b3d733cc1 100644 --- a/tests/MaterialDesignThemes.Wpf.Tests/Converters/FloatingHintTransformConverterTests.cs +++ b/tests/MaterialDesignThemes.Wpf.Tests/Converters/FloatingHintTransformConverterTests.cs @@ -1,7 +1,6 @@ using System.Globalization; using System.Windows.Media; using MaterialDesignThemes.Wpf.Converters; -using Xunit; namespace MaterialDesignThemes.Wpf.Tests.Converters; @@ -10,14 +9,14 @@ public class FloatingHintTransformConverterTests public static IEnumerable InvalidParameters => new[] { - new object?[] {null, null, null, null}, - new object?[] {1.0, null, null, null}, - new object?[] {null, 1.0, null, null}, - new object?[] {null, null, 1.0, null}, - new object?[] {null, null, null, new Point()}, - new object?[] {1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue}, - new object?[] {DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue}, - new object?[] {DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue}, + [null, null, null, null], + [1.0, null, null, null], + [null, 1.0, null, null], + [null, null, 1.0, null], + [null, null, null, new Point()], + [1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue], + [DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue], + [DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue], new object?[] {DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, new Point() }, }; @@ -25,9 +24,9 @@ public class FloatingHintTransformConverterTests [MemberData(nameof(InvalidParameters))] public void WhenParametersAreNotSetItReturnsIdentity(object? scale, object? lower, object? upper, object? offset) { - var converter = new FloatingHintTransformConverter(); + FloatingHintTransformConverter converter = new (); - var result = converter.Convert(new[] { scale, lower, upper, offset }, + object? result = converter.Convert([scale, lower, upper, offset], typeof(Transform), null, CultureInfo.CurrentUICulture); Assert.Equal(Transform.Identity, result); @@ -38,9 +37,10 @@ public void WhenParametersAreNotSetItReturnsIdentity(object? scale, object? lowe [InlineData(1.5, 2.0, 3.0, 2.0, -3.0)] public void WhenParametersAreSpecifiedItReturnsTransforms(double scale, double lower, double upper, double x, double y) { - var converter = new FloatingHintTransformConverter(); + FloatingHintTransformConverter converter = new(); - var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y), 0 }, typeof(Transform), null, CultureInfo.CurrentUICulture); + var result = (TransformGroup?)converter.Convert([scale, lower, upper, new Point(x, y), 0], + typeof(Transform), null, CultureInfo.CurrentUICulture); Assert.NotNull(result); var scaleTransform = (ScaleTransform)result!.Children[0]; @@ -58,9 +58,10 @@ public void WhenParametersAreSpecifiedItReturnsTransforms(double scale, double l [InlineData(1.5, 2.0, 3.0, 2.0, 3.0)] public void WhenParametersAreSpecifiedAndScaleTransformDisabledItReturnsTransforms(double scale, double lower, double upper, double x, double y) { - var converter = new FloatingHintTransformConverter { ApplyScaleTransform = false }; + FloatingHintTransformConverter converter = new () { ApplyScaleTransform = false }; - var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y), 0 }, typeof(Transform), null, CultureInfo.CurrentUICulture); + var result = (TransformGroup?)converter.Convert([scale, lower, upper, new Point(x, y), 0], + typeof(Transform), null, CultureInfo.CurrentUICulture); Assert.NotNull(result); Assert.Single(result.Children); @@ -72,9 +73,10 @@ public void WhenParametersAreSpecifiedAndScaleTransformDisabledItReturnsTransfor [InlineData(1.5, 2.0, 3.0, 2.0, 3.0)] public void WhenParametersAreSpecifiedAndTranslateTransformDisabledItReturnsTransforms(double scale, double lower, double upper, double x, double y) { - var converter = new FloatingHintTransformConverter { ApplyTranslateTransform = false }; + FloatingHintTransformConverter converter = new () { ApplyTranslateTransform = false }; - var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y), 0 }, typeof(Transform), null, CultureInfo.CurrentUICulture); + var result = (TransformGroup?)converter.Convert([scale, lower, upper, new Point(x, y), 0], + typeof(Transform), null, CultureInfo.CurrentUICulture); Assert.NotNull(result); Assert.Single(result.Children); diff --git a/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathConverterTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathConverterTests.cs index 6b2cdb4667..c24b824138 100644 --- a/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathConverterTests.cs +++ b/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathConverterTests.cs @@ -1,16 +1,15 @@ using System.Globalization; using MaterialDesignThemes.Wpf.Converters; -using Xunit; namespace MaterialDesignThemes.Wpf.Tests.Converters; -public class MathConverterTests +public sealed class MathConverterTests { [Theory] [EnumData] public void EnumValues_AreAllHandled(MathOperation operation) { - var converter = new MathConverter + MathConverter converter = new () { Operation = operation }; diff --git a/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathMultipleConverterTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathMultipleConverterTests.cs index 43e1e49425..cb6e195829 100644 --- a/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathMultipleConverterTests.cs +++ b/tests/MaterialDesignThemes.Wpf.Tests/Converters/MathMultipleConverterTests.cs @@ -1,20 +1,19 @@ using System.Globalization; using MaterialDesignThemes.Wpf.Converters; -using Xunit; namespace MaterialDesignThemes.Wpf.Tests.Converters; -public class MathMultipleConverterTests +public sealed class MathMultipleConverterTests { [Theory] [EnumData] public void EnumValues_AreAllHandled(MathOperation operation) { - var converter = new MathMultipleConverter + MathMultipleConverter converter = new () { Operation = operation }; - Assert.True(converter.Convert(new object?[] { 1.0, 1.0 }, null, null, CultureInfo.CurrentUICulture) is double); + Assert.True(converter.Convert([1.0, 1.0], null, null, CultureInfo.CurrentUICulture) is double); } } diff --git a/tests/MaterialDesignThemes.Wpf.Tests/Converters/SliderToolTipConverterTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/Converters/SliderToolTipConverterTests.cs index 15473814aa..f893a14d2b 100644 --- a/tests/MaterialDesignThemes.Wpf.Tests/Converters/SliderToolTipConverterTests.cs +++ b/tests/MaterialDesignThemes.Wpf.Tests/Converters/SliderToolTipConverterTests.cs @@ -1,9 +1,8 @@ using System.Globalization; -using Xunit; namespace MaterialDesignThemes.Wpf.Tests.Converters; -public class SliderToolTipConverterTests +public sealed class SliderToolTipConverterTests { [Theory] [InlineData(1.4)] @@ -12,25 +11,25 @@ public class SliderToolTipConverterTests [InlineData(42)] public void SliderConverterTest(object value) { - Wpf.Converters.SliderToolTipConverter converter = new Wpf.Converters.SliderToolTipConverter(); + Wpf.Converters.SliderToolTipConverter converter = new (); //test a valid case - var result = converter.Convert(new object?[] { value, "Test String Format {0}" }, typeof(string), null, CultureInfo.CurrentCulture); + object? result = converter.Convert([value, "Test String Format {0}"], typeof(string), null, CultureInfo.CurrentCulture); Assert.Equal($"Test String Format {value}", result); //test too many placeholders in format string - result = converter.Convert(new object?[] { value, "{0} {1}" }, typeof(string), null, CultureInfo.CurrentCulture); + result = converter.Convert([value, "{0} {1}"], typeof(string), null, CultureInfo.CurrentCulture); Assert.Equal(value.ToString(), result); - result = converter.Convert(new object?[] { value, "{0} {1} {2}" }, typeof(string), null, CultureInfo.CurrentCulture); + result = converter.Convert([value, "{0} {1} {2}"], typeof(string), null, CultureInfo.CurrentCulture); Assert.Equal(value.ToString(), result); //test empty format string - result = converter.Convert(new object?[] { value, "" }, typeof(string), null, CultureInfo.CurrentCulture); + result = converter.Convert([value, ""], typeof(string), null, CultureInfo.CurrentCulture); Assert.Equal(value.ToString(), result); //test null format string - result = converter.Convert(new object?[] { value, null }, typeof(string), null, CultureInfo.CurrentCulture); + result = converter.Convert([value, null], typeof(string), null, CultureInfo.CurrentCulture); Assert.Equal(value.ToString(), result); } }