Skip to content

Commit 514a925

Browse files
JLdguJLdgu
authored
Use recent language features on Themes.WPF Test Converters (#3559)
1 parent 9fa402e commit 514a925

File tree

6 files changed

+35
-38
lines changed

6 files changed

+35
-38
lines changed

‎tests/MaterialDesignThemes.Wpf.Tests/Converters/BrushOpacityConverterTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using System.Globalization;
22
using System.Windows.Media;
33
using MaterialDesignThemes.Wpf.Converters;
4-
using Xunit;
54

65
namespace MaterialDesignThemes.Wpf.Tests.Converters;
76

8-
public class BrushOpacityConverterTests
7+
public sealed class BrushOpacityConverterTests
98
{
109
[Theory]
1110
[InlineData("0.16", 0.16)]
@@ -14,7 +13,7 @@ public void AllCultureParseParameterCorrectly(object parameter, double expectedO
1413
var converter = new BrushOpacityConverter();
1514
foreach (var culture in CultureInfo.GetCultures(CultureTypes.AllCultures))
1615
{
17-
var inputBrush = new SolidColorBrush { Color = Colors.Red };
16+
SolidColorBrush inputBrush = new () { Color = Colors.Red };
1817
var brush = (SolidColorBrush?)converter.Convert(inputBrush, typeof(Brush), parameter, culture);
1918
Assert.Equal(expectedOpacity, brush?.Opacity);
2019
}

‎tests/MaterialDesignThemes.Wpf.Tests/Converters/DoubleToCornerRadiusConverterTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
using System.Globalization;
22
using MaterialDesignThemes.Wpf.Converters;
3-
using Xunit;
43

54
namespace MaterialDesignThemes.Wpf.Tests.Converters;
65

7-
public class DoubleToCornerRadiusConverterTests
6+
public sealed class DoubleToCornerRadiusConverterTests
87
{
98
[Theory]
109
[InlineData(-0.16, 0.0)]
1110
[InlineData(0.16, 0.16)]
1211
[InlineData(5.0, 5.0)]
1312
public void AllCultureParseParameterCorrectly(object parameter, double expectedCornerRadius)
1413
{
15-
var converter = new DoubleToCornerRadiusConverter();
14+
DoubleToCornerRadiusConverter converter = new ();
1615
foreach (var culture in CultureInfo.GetCultures(CultureTypes.AllCultures))
1716
{
1817
var cornerRadius = (CornerRadius?)converter.Convert(parameter, typeof(CornerRadius), parameter, culture);

‎tests/MaterialDesignThemes.Wpf.Tests/Converters/FloatingHintTransformConverterTests.cs

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Globalization;
22
using System.Windows.Media;
33
using MaterialDesignThemes.Wpf.Converters;
4-
using Xunit;
54

65
namespace MaterialDesignThemes.Wpf.Tests.Converters;
76

@@ -10,24 +9,24 @@ public class FloatingHintTransformConverterTests
109
public static IEnumerable<object?[]> InvalidParameters =>
1110
new[]
1211
{
13-
new object?[] {null, null, null, null},
14-
new object?[] {1.0, null, null, null},
15-
new object?[] {null, 1.0, null, null},
16-
new object?[] {null, null, 1.0, null},
17-
new object?[] {null, null, null, new Point()},
18-
new object?[] {1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue},
19-
new object?[] {DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue},
20-
new object?[] {DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue},
12+
[null, null, null, null],
13+
[1.0, null, null, null],
14+
[null, 1.0, null, null],
15+
[null, null, 1.0, null],
16+
[null, null, null, new Point()],
17+
[1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue],
18+
[DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue],
19+
[DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, 1.0, DependencyProperty.UnsetValue],
2120
new object?[] {DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, DependencyProperty.UnsetValue, new Point() },
2221
};
2322

2423
[Theory]
2524
[MemberData(nameof(InvalidParameters))]
2625
public void WhenParametersAreNotSetItReturnsIdentity(object? scale, object? lower, object? upper, object? offset)
2726
{
28-
var converter = new FloatingHintTransformConverter();
27+
FloatingHintTransformConverter converter = new ();
2928

30-
var result = converter.Convert(new[] { scale, lower, upper, offset },
29+
object? result = converter.Convert([scale, lower, upper, offset],
3130
typeof(Transform), null, CultureInfo.CurrentUICulture);
3231

3332
Assert.Equal(Transform.Identity, result);
@@ -38,9 +37,10 @@ public void WhenParametersAreNotSetItReturnsIdentity(object? scale, object? lowe
3837
[InlineData(1.5, 2.0, 3.0, 2.0, -3.0)]
3938
public void WhenParametersAreSpecifiedItReturnsTransforms(double scale, double lower, double upper, double x, double y)
4039
{
41-
var converter = new FloatingHintTransformConverter();
40+
FloatingHintTransformConverter converter = new();
4241

43-
var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y), 0 }, typeof(Transform), null, CultureInfo.CurrentUICulture);
42+
var result = (TransformGroup?)converter.Convert([scale, lower, upper, new Point(x, y), 0],
43+
typeof(Transform), null, CultureInfo.CurrentUICulture);
4444

4545
Assert.NotNull(result);
4646
var scaleTransform = (ScaleTransform)result!.Children[0];
@@ -58,9 +58,10 @@ public void WhenParametersAreSpecifiedItReturnsTransforms(double scale, double l
5858
[InlineData(1.5, 2.0, 3.0, 2.0, 3.0)]
5959
public void WhenParametersAreSpecifiedAndScaleTransformDisabledItReturnsTransforms(double scale, double lower, double upper, double x, double y)
6060
{
61-
var converter = new FloatingHintTransformConverter { ApplyScaleTransform = false };
61+
FloatingHintTransformConverter converter = new () { ApplyScaleTransform = false };
6262

63-
var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y), 0 }, typeof(Transform), null, CultureInfo.CurrentUICulture);
63+
var result = (TransformGroup?)converter.Convert([scale, lower, upper, new Point(x, y), 0],
64+
typeof(Transform), null, CultureInfo.CurrentUICulture);
6465

6566
Assert.NotNull(result);
6667
Assert.Single(result.Children);
@@ -72,9 +73,10 @@ public void WhenParametersAreSpecifiedAndScaleTransformDisabledItReturnsTransfor
7273
[InlineData(1.5, 2.0, 3.0, 2.0, 3.0)]
7374
public void WhenParametersAreSpecifiedAndTranslateTransformDisabledItReturnsTransforms(double scale, double lower, double upper, double x, double y)
7475
{
75-
var converter = new FloatingHintTransformConverter { ApplyTranslateTransform = false };
76+
FloatingHintTransformConverter converter = new () { ApplyTranslateTransform = false };
7677

77-
var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y), 0 }, typeof(Transform), null, CultureInfo.CurrentUICulture);
78+
var result = (TransformGroup?)converter.Convert([scale, lower, upper, new Point(x, y), 0],
79+
typeof(Transform), null, CultureInfo.CurrentUICulture);
7880

7981
Assert.NotNull(result);
8082
Assert.Single(result.Children);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
using System.Globalization;
22
using MaterialDesignThemes.Wpf.Converters;
3-
using Xunit;
43

54
namespace MaterialDesignThemes.Wpf.Tests.Converters;
65

7-
public class MathConverterTests
6+
public sealed class MathConverterTests
87
{
98
[Theory]
109
[EnumData]
1110
public void EnumValues_AreAllHandled(MathOperation operation)
1211
{
13-
var converter = new MathConverter
12+
MathConverter converter = new ()
1413
{
1514
Operation = operation
1615
};

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
using System.Globalization;
22
using MaterialDesignThemes.Wpf.Converters;
3-
using Xunit;
43

54
namespace MaterialDesignThemes.Wpf.Tests.Converters;
65

7-
public class MathMultipleConverterTests
6+
public sealed class MathMultipleConverterTests
87
{
98
[Theory]
109
[EnumData]
1110
public void EnumValues_AreAllHandled(MathOperation operation)
1211
{
13-
var converter = new MathMultipleConverter
12+
MathMultipleConverter converter = new ()
1413
{
1514
Operation = operation
1615
};
1716

18-
Assert.True(converter.Convert(new object?[] { 1.0, 1.0 }, null, null, CultureInfo.CurrentUICulture) is double);
17+
Assert.True(converter.Convert([1.0, 1.0], null, null, CultureInfo.CurrentUICulture) is double);
1918
}
2019
}

‎tests/MaterialDesignThemes.Wpf.Tests/Converters/SliderToolTipConverterTests.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
using System.Globalization;
2-
using Xunit;
32

43
namespace MaterialDesignThemes.Wpf.Tests.Converters;
54

6-
public class SliderToolTipConverterTests
5+
public sealed class SliderToolTipConverterTests
76
{
87
[Theory]
98
[InlineData(1.4)]
@@ -12,25 +11,25 @@ public class SliderToolTipConverterTests
1211
[InlineData(42)]
1312
public void SliderConverterTest(object value)
1413
{
15-
Wpf.Converters.SliderToolTipConverter converter = new Wpf.Converters.SliderToolTipConverter();
14+
Wpf.Converters.SliderToolTipConverter converter = new ();
1615

1716
//test a valid case
18-
var result = converter.Convert(new object?[] { value, "Test String Format {0}" }, typeof(string), null, CultureInfo.CurrentCulture);
17+
object? result = converter.Convert([value, "Test String Format {0}"], typeof(string), null, CultureInfo.CurrentCulture);
1918
Assert.Equal($"Test String Format {value}", result);
2019

2120
//test too many placeholders in format string
22-
result = converter.Convert(new object?[] { value, "{0} {1}" }, typeof(string), null, CultureInfo.CurrentCulture);
21+
result = converter.Convert([value, "{0} {1}"], typeof(string), null, CultureInfo.CurrentCulture);
2322
Assert.Equal(value.ToString(), result);
2423

25-
result = converter.Convert(new object?[] { value, "{0} {1} {2}" }, typeof(string), null, CultureInfo.CurrentCulture);
24+
result = converter.Convert([value, "{0} {1} {2}"], typeof(string), null, CultureInfo.CurrentCulture);
2625
Assert.Equal(value.ToString(), result);
2726

2827
//test empty format string
29-
result = converter.Convert(new object?[] { value, "" }, typeof(string), null, CultureInfo.CurrentCulture);
28+
result = converter.Convert([value, ""], typeof(string), null, CultureInfo.CurrentCulture);
3029
Assert.Equal(value.ToString(), result);
3130

3231
//test null format string
33-
result = converter.Convert(new object?[] { value, null }, typeof(string), null, CultureInfo.CurrentCulture);
32+
result = converter.Convert([value, null], typeof(string), null, CultureInfo.CurrentCulture);
3433
Assert.Equal(value.ToString(), result);
3534
}
3635
}

0 commit comments

Comments
 (0)