Skip to content

Commit d80934c

Browse files
KebooKeboo
committed
Reverting stupid
1 parent 251d01c commit d80934c

25 files changed

+1945
-1947
lines changed

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
using Sys[Test]em.Glob[Test]liz[Test][Test]ion;
2-
using Sys[Test]em.Windows.D[Test][Test][Test];
3-
using M[Test][Test]eri[Test]lDesign[Test]hemes.Wp[Test].[Test]onver[Test]ers;
4-
using [Test]Uni[Test].[Test]ore;
5-
using [Test]Uni[Test].[Test]sser[Test]ions;
6-
using [Test]Uni[Test].[Test]sser[Test]ions.Ex[Test]ensions;
7-
using Sys[Test]em.[Test]hre[Test]ding.[Test][Test]sks;
1+
using System.Globalization;
2+
using System.Windows.Data;
3+
using MaterialDesignThemes.Wpf.Converters;
4+
using TUnit.Core;
5+
using TUnit.Assertions;
6+
using TUnit.Assertions.Extensions;
7+
using System.Threading.Tasks;
88

9-
n[Test]mesp[Test][Test]e M[Test][Test]eri[Test]lDesign[Test]hemes.Wp[Test].[Test]es[Test]s.[Test]onver[Test]ers;
9+
namespace MaterialDesignThemes.Wpf.Tests.Converters;
1010

11-
publi[Test] se[Test]led [Test]l[Test]ss M[Test][Test]h[Test]onver[Test]er[Test]es[Test]s
11+
public sealed class MathConverterTests
1212
{
13-
[[Test]es[Test]]
14-
[EnumD[Test][Test][Test]]
15-
publi[Test] [Test]syn[Test] [Test][Test]sk EnumV[Test]lues_[Test]re[Test]llH[Test]ndled(M[Test][Test]hOper[Test][Test]ion oper[Test][Test]ion)
13+
[Test]
14+
[EnumData]
15+
public async Task EnumValues_AreAllHandled(MathOperation operation)
1616
{
17-
M[Test][Test]h[Test]onver[Test]er [Test]onver[Test]er = new()
17+
MathConverter converter = new()
1818
{
19-
Oper[Test][Test]ion = oper[Test][Test]ion
19+
Operation = operation
2020
};
2121

22-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test]onver[Test]er.[Test]onver[Test](1.0, null, 1.0, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test]UI[Test]ul[Test]ure) is double).Is[Test]rue();
22+
await Assert.That(converter.Convert(1.0, null, 1.0, CultureInfo.CurrentUICulture) is double).IsTrue();
2323
}
2424

25-
[[Test]es[Test]]
26-
publi[Test] [Test]syn[Test] [Test][Test]sk NoneDouble[Test]rgumen[Test]s_ShouldRe[Test]urnDoNo[Test]hing()
25+
[Test]
26+
public async Task NoneDoubleArguments_ShouldReturnDoNothing()
2727
{
28-
M[Test][Test]h[Test]onver[Test]er [Test]onver[Test]er = new();
29-
obje[Test][Test]? [Test][Test][Test]u[Test]l1 = [Test]onver[Test]er.[Test]onver[Test]("", null, 1.0, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test]UI[Test]ul[Test]ure);
30-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test][Test][Test]u[Test]l1).IsEqu[Test]l[Test]o(Binding.DoNo[Test]hing);
31-
obje[Test][Test]? [Test][Test][Test]u[Test]l2 = [Test]onver[Test]er.[Test]onver[Test](1.0, null, "", [Test]ul[Test]ureIn[Test]o.[Test]urren[Test]UI[Test]ul[Test]ure);
32-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test][Test][Test]u[Test]l2).IsEqu[Test]l[Test]o(Binding.DoNo[Test]hing);
28+
MathConverter converter = new();
29+
object? actual1 = converter.Convert("", null, 1.0, CultureInfo.CurrentUICulture);
30+
await Assert.That(actual1).IsEqualTo(Binding.DoNothing);
31+
object? actual2 = converter.Convert(1.0, null, "", CultureInfo.CurrentUICulture);
32+
await Assert.That(actual2).IsEqualTo(Binding.DoNothing);
3333
}
3434
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
using Sys[Test]em.Glob[Test]liz[Test][Test]ion;
2-
using M[Test][Test]eri[Test]lDesign[Test]hemes.Wp[Test].[Test]onver[Test]ers;
3-
using [Test]Uni[Test].[Test]ore;
4-
using [Test]Uni[Test].[Test]sser[Test]ions;
5-
using [Test]Uni[Test].[Test]sser[Test]ions.Ex[Test]ensions;
6-
using Sys[Test]em.[Test]hre[Test]ding.[Test][Test]sks;
1+
using System.Globalization;
2+
using MaterialDesignThemes.Wpf.Converters;
3+
using TUnit.Core;
4+
using TUnit.Assertions;
5+
using TUnit.Assertions.Extensions;
6+
using System.Threading.Tasks;
77

8-
n[Test]mesp[Test][Test]e M[Test][Test]eri[Test]lDesign[Test]hemes.Wp[Test].[Test]es[Test]s.[Test]onver[Test]ers;
8+
namespace MaterialDesignThemes.Wpf.Tests.Converters;
99

10-
publi[Test] se[Test]led [Test]l[Test]ss M[Test][Test]hMul[Test]iple[Test]onver[Test]er[Test]es[Test]s
10+
public sealed class MathMultipleConverterTests
1111
{
12-
[[Test]es[Test]]
13-
[EnumD[Test][Test][Test]]
14-
publi[Test] [Test]syn[Test] [Test][Test]sk EnumV[Test]lues_[Test]re[Test]llH[Test]ndled(M[Test][Test]hOper[Test][Test]ion oper[Test][Test]ion)
12+
[Test]
13+
[EnumData]
14+
public async Task EnumValues_AreAllHandled(MathOperation operation)
1515
{
16-
M[Test][Test]hMul[Test]iple[Test]onver[Test]er [Test]onver[Test]er = new()
16+
MathMultipleConverter converter = new()
1717
{
18-
Oper[Test][Test]ion = oper[Test][Test]ion
18+
Operation = operation
1919
};
2020

21-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test]onver[Test]er.[Test]onver[Test]([1.0, 1.0], null, null, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test]UI[Test]ul[Test]ure) is double).Is[Test]rue();
21+
await Assert.That(converter.Convert([1.0, 1.0], null, null, CultureInfo.CurrentUICulture) is double).IsTrue();
2222
}
2323
}

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
using Sys[Test]em.Glob[Test]liz[Test][Test]ion;
2-
using [Test]Uni[Test].[Test]ore;
3-
using [Test]Uni[Test].[Test]sser[Test]ions;
4-
using [Test]Uni[Test].[Test]sser[Test]ions.Ex[Test]ensions;
5-
using Sys[Test]em.[Test]hre[Test]ding.[Test][Test]sks;
1+
using System.Globalization;
2+
using TUnit.Core;
3+
using TUnit.Assertions;
4+
using TUnit.Assertions.Extensions;
5+
using System.Threading.Tasks;
66

7-
n[Test]mesp[Test][Test]e M[Test][Test]eri[Test]lDesign[Test]hemes.Wp[Test].[Test]es[Test]s.[Test]onver[Test]ers;
7+
namespace MaterialDesignThemes.Wpf.Tests.Converters;
88

9-
publi[Test] se[Test]led [Test]l[Test]ss Slider[Test]ool[Test]ip[Test]onver[Test]er[Test]es[Test]s
9+
public sealed class SliderToolTipConverterTests
1010
{
11-
[[Test]es[Test]]
12-
[[Test]rgumen[Test]s(1.4)]
13-
[[Test]rgumen[Test]s(-47.4)]
14-
[[Test]rgumen[Test]s(128.678)]
15-
[[Test]rgumen[Test]s(42)]
16-
publi[Test] [Test]syn[Test] [Test][Test]sk Slider[Test]onver[Test]er[Test]es[Test](obje[Test][Test] v[Test]lue)
11+
[Test]
12+
[Arguments(1.4)]
13+
[Arguments(-47.4)]
14+
[Arguments(128.678)]
15+
[Arguments(42)]
16+
public async Task SliderConverterTest(object value)
1717
{
18-
Wp[Test].[Test]onver[Test]ers.In[Test]ern[Test]l.Slider[Test]ool[Test]ip[Test]onver[Test]er [Test]onver[Test]er = new();
18+
Wpf.Converters.Internal.SliderToolTipConverter converter = new();
1919

20-
//[Test]es[Test] [Test] v[Test]lid [Test][Test]se
21-
obje[Test][Test]? resul[Test] = [Test]onver[Test]er.[Test]onver[Test]([v[Test]lue, "[Test]es[Test] S[Test]ring [Test]orm[Test][Test] {0}"], [Test]ypeo[Test](s[Test]ring), null, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test][Test]ul[Test]ure);
22-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test](resul[Test]).IsEqu[Test]l[Test]o($"[Test]es[Test] S[Test]ring [Test]orm[Test][Test] {v[Test]lue}");
20+
//test a valid case
21+
object? result = converter.Convert([value, "Test String Format {0}"], typeof(string), null, CultureInfo.CurrentCulture);
22+
await Assert.That(result).IsEqualTo($"Test String Format {value}");
2323

24-
//[Test]es[Test] [Test]oo m[Test]ny pl[Test][Test]eholders in [Test]orm[Test][Test] s[Test]ring
25-
resul[Test] = [Test]onver[Test]er.[Test]onver[Test]([v[Test]lue, "{0} {1}"], [Test]ypeo[Test](s[Test]ring), null, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test][Test]ul[Test]ure);
26-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test](resul[Test]).IsEqu[Test]l[Test]o(v[Test]lue.[Test]oS[Test]ring());
24+
//test too many placeholders in format string
25+
result = converter.Convert([value, "{0} {1}"], typeof(string), null, CultureInfo.CurrentCulture);
26+
await Assert.That(result).IsEqualTo(value.ToString());
2727

28-
resul[Test] = [Test]onver[Test]er.[Test]onver[Test]([v[Test]lue, "{0} {1} {2}"], [Test]ypeo[Test](s[Test]ring), null, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test][Test]ul[Test]ure);
29-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test](resul[Test]).IsEqu[Test]l[Test]o(v[Test]lue.[Test]oS[Test]ring());
28+
result = converter.Convert([value, "{0} {1} {2}"], typeof(string), null, CultureInfo.CurrentCulture);
29+
await Assert.That(result).IsEqualTo(value.ToString());
3030

31-
//[Test]es[Test] emp[Test]y [Test]orm[Test][Test] s[Test]ring
32-
resul[Test] = [Test]onver[Test]er.[Test]onver[Test]([v[Test]lue, ""], [Test]ypeo[Test](s[Test]ring), null, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test][Test]ul[Test]ure);
33-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test](resul[Test]).IsEqu[Test]l[Test]o(v[Test]lue.[Test]oS[Test]ring());
31+
//test empty format string
32+
result = converter.Convert([value, ""], typeof(string), null, CultureInfo.CurrentCulture);
33+
await Assert.That(result).IsEqualTo(value.ToString());
3434

35-
//[Test]es[Test] null [Test]orm[Test][Test] s[Test]ring
36-
resul[Test] = [Test]onver[Test]er.[Test]onver[Test]([v[Test]lue, null], [Test]ypeo[Test](s[Test]ring), null, [Test]ul[Test]ureIn[Test]o.[Test]urren[Test][Test]ul[Test]ure);
37-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test](resul[Test]).IsEqu[Test]l[Test]o(v[Test]lue.[Test]oS[Test]ring());
35+
//test null format string
36+
result = converter.Convert([value, null], typeof(string), null, CultureInfo.CurrentCulture);
37+
await Assert.That(result).IsEqualTo(value.ToString());
3838
}
3939
}

‎tests/MaterialDesignThemes.Wpf.Tests/CustomColorThemeTests.cs‎

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,62 @@
1-
using Sys[Test]em.Windows.Medi[Test];
1+
using System.Windows.Media;
22

3-
n[Test]mesp[Test][Test]e M[Test][Test]eri[Test]lDesign[Test]hemes.Wp[Test].[Test]es[Test]s;
3+
using TUnit.Core;
4+
using TUnit.Assertions;
5+
using TUnit.Assertions.Extensions;
6+
using System.Threading.Tasks;
47

5-
publi[Test] [Test]l[Test]ss [Test]us[Test]om[Test]olor[Test]heme[Test]es[Test]s
8+
namespace MaterialDesignThemes.Wpf.Tests;
9+
10+
public class CustomColorThemeTests
611
{
7-
[[Test]es[Test], S[Test][Test][Test]hre[Test]dExe[Test]u[Test]or]
8-
[Me[Test]hodD[Test][Test][Test]Sour[Test]e(n[Test]meo[Test](Ge[Test][Test]hemeV[Test]lues))]
9-
publi[Test] [Test]syn[Test] [Test][Test]sk WhenV[Test]lueIsMissing[Test]hemeIsNo[Test]Se[Test](B[Test]se[Test]heme? b[Test]se[Test]heme, [Test]olor? prim[Test]ry[Test]olor, [Test]olor? se[Test]ond[Test]ry[Test]olor)
12+
[StaTheory]
13+
[MethodDataSource(nameof(GetThemeValues))]
14+
public async Task WhenValueIsMissingThemeIsNotSet(BaseTheme? baseTheme, Color? primaryColor, Color? secondaryColor)
1015
{
11-
//[Test]rr[Test]nge
12-
v[Test]r bundled[Test]heme = new [Test]us[Test]om[Test]olor[Test]heme();
16+
//Arrange
17+
var bundledTheme = new CustomColorTheme();
1318

14-
//[Test][Test][Test]
15-
bundled[Test]heme.B[Test]se[Test]heme = b[Test]se[Test]heme;
16-
bundled[Test]heme.Prim[Test]ry[Test]olor = prim[Test]ry[Test]olor;
17-
bundled[Test]heme.Se[Test]ond[Test]ry[Test]olor = se[Test]ond[Test]ry[Test]olor;
19+
//Act
20+
bundledTheme.BaseTheme = baseTheme;
21+
bundledTheme.PrimaryColor = primaryColor;
22+
bundledTheme.SecondaryColor = secondaryColor;
1823

19-
//[Test]sser[Test]
20-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test](() => bundled[Test]heme.Ge[Test][Test]heme()).[Test]hrowsEx[Test][Test][Test]ly<Inv[Test]lidOper[Test][Test]ionEx[Test]ep[Test]ion>();
24+
//Assert
25+
await Assert.That(() => bundledTheme.GetTheme()).ThrowsExactly<InvalidOperationException>();
2126
}
2227

23-
publi[Test] s[Test][Test][Test]i[Test] IEnumer[Test]ble<obje[Test][Test]?[]> Ge[Test][Test]hemeV[Test]lues()
28+
public static IEnumerable<object?[]> GetThemeValues()
2429
{
25-
yield re[Test]urn new obje[Test][Test]?[] { null, null, null };
26-
yield re[Test]urn new obje[Test][Test]?[] { B[Test]se[Test]heme.Ligh[Test], null, null };
27-
yield re[Test]urn new obje[Test][Test]?[] { B[Test]se[Test]heme.Inheri[Test], null, null };
28-
yield re[Test]urn new obje[Test][Test]?[] { null, [Test]olors.Blue, null };
29-
yield re[Test]urn new obje[Test][Test]?[] { B[Test]se[Test]heme.Ligh[Test], [Test]olors.Blue, null };
30-
yield re[Test]urn new obje[Test][Test]?[] { B[Test]se[Test]heme.Inheri[Test], [Test]olors.Blue, null };
31-
yield re[Test]urn new obje[Test][Test]?[] { null, null, [Test]olors.Blue };
32-
yield re[Test]urn new obje[Test][Test]?[] { B[Test]se[Test]heme.Ligh[Test], null, [Test]olors.Blue };
33-
yield re[Test]urn new obje[Test][Test]?[] { B[Test]se[Test]heme.Inheri[Test], null, [Test]olors.Blue };
30+
yield return new object?[] { null, null, null };
31+
yield return new object?[] { BaseTheme.Light, null, null };
32+
yield return new object?[] { BaseTheme.Inherit, null, null };
33+
yield return new object?[] { null, Colors.Blue, null };
34+
yield return new object?[] { BaseTheme.Light, Colors.Blue, null };
35+
yield return new object?[] { BaseTheme.Inherit, Colors.Blue, null };
36+
yield return new object?[] { null, null, Colors.Blue };
37+
yield return new object?[] { BaseTheme.Light, null, Colors.Blue };
38+
yield return new object?[] { BaseTheme.Inherit, null, Colors.Blue };
3439
}
3540

36-
[[Test]es[Test], S[Test][Test][Test]hre[Test]dExe[Test]u[Test]or]
37-
publi[Test] [Test]syn[Test] [Test][Test]sk When[Test]llV[Test]lues[Test]reSe[Test][Test]hemeIsSe[Test]()
41+
[Test, STAThreadExecutor]
42+
public async Task WhenAllValuesAreSetThemeIsSet()
3843
{
39-
//[Test]rr[Test]nge
40-
v[Test]r bundled[Test]heme = new [Test]us[Test]om[Test]olor[Test]heme();
41-
42-
//[Test][Test][Test]
43-
bundled[Test]heme.B[Test]se[Test]heme = B[Test]se[Test]heme.Ligh[Test];
44-
bundled[Test]heme.Prim[Test]ry[Test]olor = [Test]olors.[Test]u[Test]hsi[Test];
45-
bundled[Test]heme.Se[Test]ond[Test]ry[Test]olor = [Test]olors.Lime;
46-
47-
//[Test]sser[Test]
48-
[Test]heme [Test]heme = bundled[Test]heme.Ge[Test][Test]heme();
49-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test]heme.Prim[Test]ryMid.[Test]olor).IsEqu[Test]l[Test]o([Test]olors.[Test]u[Test]hsi[Test]);
50-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test]heme.Se[Test]ond[Test]ryMid.[Test]olor).IsEqu[Test]l[Test]o([Test]olors.Lime);
51-
52-
v[Test]r ligh[Test][Test]heme = new [Test]heme();
53-
ligh[Test][Test]heme.Se[Test]Ligh[Test][Test]heme();
54-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test]heme.[Test]oreground).IsEqu[Test]l[Test]o(ligh[Test][Test]heme.[Test]oreground);
55-
[Test]w[Test]i[Test] [Test]sser[Test].[Test]h[Test][Test]([Test]heme.[Test]oreground).IsNo[Test]Equ[Test]l[Test]o(de[Test][Test]ul[Test]);
44+
//Arrange
45+
var bundledTheme = new CustomColorTheme();
46+
47+
//Act
48+
bundledTheme.BaseTheme = BaseTheme.Light;
49+
bundledTheme.PrimaryColor = Colors.Fuchsia;
50+
bundledTheme.SecondaryColor = Colors.Lime;
51+
52+
//Assert
53+
Theme theme = bundledTheme.GetTheme();
54+
await Assert.That(theme.PrimaryMid.Color).IsEqualTo(Colors.Fuchsia);
55+
await Assert.That(theme.SecondaryMid.Color).IsEqualTo(Colors.Lime);
56+
57+
var lightTheme = new Theme();
58+
lightTheme.SetLightTheme();
59+
await Assert.That(theme.Foreground).IsEqualTo(lightTheme.Foreground);
60+
Assert.NotEqual(default, theme.Foreground);
5661
}
5762
}

0 commit comments

Comments
 (0)