Skip to content

Commit d469962

Browse files
KebooKeboo
committed
Removes TUnit dependencies from tests
Removes the TUnit library and associated code from test projects, modernizing testing using the default testing framework.
1 parent b02af5a commit d469962

23 files changed

+169
-338
lines changed

‎src/MaterialDesignThemes.Wpf/RatingBar.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -411,21 +411,21 @@ internal class TextBlockForegroundConverter : IMultiValueConverter
411411
return new SolidColorBrush(semiTransparent);
412412
}
413413

414-
GradientStopCollection CreateGradientStopCollection(Color originalColor, Color semiTransparent, double offset, bool invertDirection)
414+
static GradientStopCollection CreateGradientStopCollection(Color originalColor, Color semiTransparent, double offset, bool invertDirection)
415415
{
416416
if (invertDirection)
417417
{
418-
return new()
419-
{
418+
return
419+
[
420420
new GradientStop {Color = semiTransparent, Offset = offset},
421421
new GradientStop {Color = originalColor, Offset = offset},
422-
};
422+
];
423423
}
424-
return new()
425-
{
424+
return
425+
[
426426
new GradientStop {Color = originalColor, Offset = offset},
427427
new GradientStop {Color = semiTransparent, Offset = offset}
428-
};
428+
];
429429
}
430430

431431
// This should never happen (returning actual brush to avoid the compilers squiggly line warning)

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using System.Globalization;
22

3-
using TUnit.Core;
4-
using TUnit.Assertions;
5-
using TUnit.Assertions.Extensions;
6-
using System.Threading.Tasks;
7-
83
namespace MaterialDesignThemes.Wpf.Tests;
94

105
public class CalendarFormatInfoTests
@@ -56,7 +51,7 @@ public async Task TestFromCultureInfo(string cultureName, string yearMonth, stri
5651
[Arguments("X' , 'ddd", "ddd", ",", false)]
5752
[Arguments("Xddddd", "ddd", "", false)]
5853
[Arguments("X,ddddd", "ddd", "", false)]
59-
public void CanParseDayOfWeek(string s, string pattern, string separator, bool isFirst)
54+
public async Task CanParseDayOfWeek(string s, string pattern, string separator, bool isFirst)
6055
{
6156
var result = CalendarFormatInfo.DayOfWeekStyle.Parse(s);
6257

@@ -66,7 +61,7 @@ public void CanParseDayOfWeek(string s, string pattern, string separator, bool i
6661
}
6762

6863
[Test, STAThreadExecutor]
69-
public void SettingYearPattern()
64+
public async Task SettingYearPattern()
7065
{
7166
const string cultureName = "en-001";
7267
CalendarFormatInfo.SetYearPattern(cultureName, "A");
@@ -79,7 +74,7 @@ public void SettingYearPattern()
7974
}
8075

8176
[Test, STAThreadExecutor]
82-
public void SettingYearPatternOfMultipleCultures()
77+
public async Task SettingYearPatternOfMultipleCultures()
8378
{
8479
string[] cultureNames = { "en-001", "en-150" };
8580
CalendarFormatInfo.SetYearPattern(cultureNames, "B");
@@ -91,7 +86,7 @@ public void SettingYearPatternOfMultipleCultures()
9186
}
9287

9388
[Test, STAThreadExecutor]
94-
public void SettingDayOfWeekStyle()
89+
public async Task SettingDayOfWeekStyle()
9590
{
9691
const string cultureName = "en-001";
9792
CalendarFormatInfo.SetDayOfWeekStyle(cultureName, new CalendarFormatInfo.DayOfWeekStyle("Z", "@", true));
@@ -106,7 +101,7 @@ public void SettingDayOfWeekStyle()
106101
}
107102

108103
[Test, STAThreadExecutor]
109-
public void SettingDayOfWeekStyleOfMultipleCultures()
104+
public async Task SettingDayOfWeekStyleOfMultipleCultures()
110105
{
111106
string[] cultureNames = { "en-001", "en-150" };
112107
CalendarFormatInfo.SetDayOfWeekStyle(cultureNames, new CalendarFormatInfo.DayOfWeekStyle("Z", "@", true));
@@ -119,18 +114,18 @@ public void SettingDayOfWeekStyleOfMultipleCultures()
119114
}
120115

121116
[Test, STAThreadExecutor]
122-
public void ResettingDayOfWeekStyle()
117+
public async Task ResettingDayOfWeekStyle()
123118
{
124119
const string cultureName = "en-001";
125120
CalendarFormatInfo.SetDayOfWeekStyle(cultureName, new CalendarFormatInfo.DayOfWeekStyle("Z", "@", true));
126121
CalendarFormatInfo.ResetDayOfWeekStyle(cultureName);
127122
var result = CalendarFormatInfo.FromCultureInfo(CultureInfo.GetCultureInfo(cultureName));
128123
await Assert.That(result.ComponentOnePattern).IsEqualTo("d MMM");
129-
await Assert.That(", result.ComponentTwoPattern).IsEqualTo("ddd);
124+
await Assert.That(result.ComponentTwoPattern).IsEqualTo("ddd");
130125
}
131126

132127
[Test, STAThreadExecutor]
133-
public void ResettingDayOfWeekStyleOfMultipleCultures()
128+
public async Task ResettingDayOfWeekStyleOfMultipleCultures()
134129
{
135130
string[] cultureNames = { "en-001", "en-150" };
136131
CalendarFormatInfo.SetDayOfWeekStyle(cultureNames, new CalendarFormatInfo.DayOfWeekStyle("Z", "@", true));
@@ -139,7 +134,7 @@ public void ResettingDayOfWeekStyleOfMultipleCultures()
139134
{
140135
var result = CalendarFormatInfo.FromCultureInfo(CultureInfo.GetCultureInfo(cultureName));
141136
await Assert.That(result.ComponentOnePattern).IsEqualTo("d MMM");
142-
await Assert.That(", result.ComponentTwoPattern).IsEqualTo("ddd);
137+
await Assert.That(result.ComponentTwoPattern).IsEqualTo("ddd");
143138
}
144139
}
145140
}

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-

2-
using TUnit.Core;
3-
using TUnit.Assertions;
4-
using TUnit.Assertions.Extensions;
5-
using System.Threading.Tasks;
6-
7-
namespace MaterialDesignThemes.Wpf.Tests;
1+
namespace MaterialDesignThemes.Wpf.Tests;
82

93
public class CheckBoxAssistTests
104
{

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-

2-
using TUnit.Core;
3-
using TUnit.Assertions;
4-
using TUnit.Assertions.Extensions;
5-
using System.Threading.Tasks;
6-
7-
namespace MaterialDesignThemes.Wpf.Tests;
1+
namespace MaterialDesignThemes.Wpf.Tests;
82

93
public class ClockTests
104
{
11-
[StaFact(Timeout = 500)]
5+
[Test, STAThreadExecutor]
126
public async Task CanGenerateHoursButtons()
137
{
148
var clock = new Clock();
@@ -21,7 +15,7 @@ public async Task CanGenerateHoursButtons()
2115
await Assert.That(buttonContents.OrderBy(x => x)).IsEqualTo(expected.OrderBy(x => x));
2216
}
2317

24-
[StaFact(Timeout = 500)]
18+
[Test, STAThreadExecutor]
2519
public async Task CanGenerateHoursButtonsWith24Hours()
2620
{
2721
var clock = new Clock { Is24Hours = true };
@@ -36,8 +30,8 @@ public async Task CanGenerateHoursButtonsWith24Hours()
3630
await Assert.That(buttonContents.OrderBy(x => x)).IsEqualTo(expected.OrderBy(x => x));
3731
}
3832

39-
[StaFact(Timeout = 500)]
40-
public void CanGenerateMinuteButtons()
33+
[Test, STAThreadExecutor]
34+
public async Task CanGenerateMinuteButtons()
4135
{
4236
var clock = new Clock();
4337
clock.ApplyDefaultStyle();
@@ -49,8 +43,8 @@ public void CanGenerateMinuteButtons()
4943
await Assert.That(buttonContents.OrderBy(x => x)).IsEqualTo(expected.OrderBy(x => x));
5044
}
5145

52-
[StaFact(Timeout = 500)]
53-
public void CanGenerateSecondsButtons()
46+
[Test, STAThreadExecutor]
47+
public async Task CanGenerateSecondsButtons()
5448
{
5549
var clock = new Clock();
5650
clock.ApplyDefaultStyle();
@@ -62,8 +56,8 @@ public void CanGenerateSecondsButtons()
6256
await Assert.That(buttonContents.OrderBy(x => x)).IsEqualTo(expected.OrderBy(x => x));
6357
}
6458

65-
[StaFact(Timeout = 500)]
66-
public void TimeChangedEvent_WhenTimeChanges_EventIsRaised()
59+
[Test, STAThreadExecutor]
60+
public async Task TimeChangedEvent_WhenTimeChanges_EventIsRaised()
6761
{
6862
var clock = new Clock();
6963
clock.ApplyDefaultStyle();

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

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
using System.Windows.Media;
22

3-
using TUnit.Core;
4-
using TUnit.Assertions;
5-
using TUnit.Assertions.Extensions;
6-
using System.Threading.Tasks;
7-
83
namespace MaterialDesignThemes.Wpf.Tests;
94

105
public class CustomColorThemeTests
116
{
12-
[StaTheory]
7+
[Test, STAThreadExecutor]
138
[MethodDataSource(nameof(GetThemeValues))]
149
public async Task WhenValueIsMissingThemeIsNotSet(BaseTheme? baseTheme, Color? primaryColor, Color? secondaryColor)
1510
{
@@ -22,20 +17,20 @@ public async Task WhenValueIsMissingThemeIsNotSet(BaseTheme? baseTheme, Color? p
2217
bundledTheme.SecondaryColor = secondaryColor;
2318

2419
//Assert
25-
await Assert.That(() => bundledTheme.GetTheme()).ThrowsExactly<InvalidOperationException>();
20+
await Assert.That(bundledTheme.GetTheme).ThrowsExactly<InvalidOperationException>();
2621
}
2722

28-
public static IEnumerable<object?[]> GetThemeValues()
23+
public static IEnumerable<(BaseTheme?, Color?, Color?)> GetThemeValues()
2924
{
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 };
25+
yield return (null, null, null);
26+
yield return (BaseTheme.Light, null, null);
27+
yield return (BaseTheme.Inherit, null, null);
28+
yield return (null, Colors.Blue, null);
29+
yield return (BaseTheme.Light, Colors.Blue, null);
30+
yield return (BaseTheme.Inherit, Colors.Blue, null);
31+
yield return (null, null, Colors.Blue);
32+
yield return (BaseTheme.Light, null, Colors.Blue);
33+
yield return (BaseTheme.Inherit, null, Colors.Blue);
3934
}
4035

4136
[Test, STAThreadExecutor]
@@ -57,6 +52,6 @@ public async Task WhenAllValuesAreSetThemeIsSet()
5752
var lightTheme = new Theme();
5853
lightTheme.SetLightTheme();
5954
await Assert.That(theme.Foreground).IsEqualTo(lightTheme.Foreground);
60-
Assert.NotEqual(default, theme.Foreground);
55+
await Assert.That(theme.Foreground).IsNotDefault();
6156
}
6257
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using TUnit.Core;
2-
using TUnit.Assertions;
3-
using TUnit.Assertions.Extensions;
4-
using System.Threading.Tasks;
5-
6-
namespace MaterialDesignThemes.Wpf.Tests;
1+
namespace MaterialDesignThemes.Wpf.Tests;
72

83
public class DataGridAssistTests
94
{

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using System.ComponentModel;
22

3-
using TUnit.Core;
4-
using TUnit.Assertions;
5-
using TUnit.Assertions.Extensions;
6-
using System.Threading.Tasks;
7-
83
namespace MaterialDesignThemes.Wpf.Tests;
94

105
public class DrawerHostTests : IDisposable

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System.Reflection;
2-
using Xunit.Sdk;
3-
using Xunit.v3;
42

53
namespace MaterialDesignThemes.Wpf.Tests;
64

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-

2-
using TUnit.Core;
3-
using TUnit.Assertions;
4-
using TUnit.Assertions.Extensions;
5-
using System.Threading.Tasks;
6-
7-
namespace MaterialDesignThemes.Wpf.Tests;
1+
namespace MaterialDesignThemes.Wpf.Tests;
82

93
public class FlipperAssistTests
104
{

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using System.ComponentModel;
22

3-
using TUnit.Core;
4-
using TUnit.Assertions;
5-
using TUnit.Assertions.Extensions;
6-
using System.Threading.Tasks;
7-
83
namespace MaterialDesignThemes.Wpf.Tests;
94

105
public class LabelTests

0 commit comments

Comments
 (0)