Skip to content

Commit 03c9da2

Browse files
KebooKeboo
committed
WIP
1 parent 983a91d commit 03c9da2

36 files changed

+670
-547
lines changed

‎Directory.packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
2727
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
2828
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
29-
<PackageVersion Include="TUnit" Version="0.16.28" />
29+
<PackageVersion Include="TUnit" Version="0.19.86" />
3030
<PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
3131
<PackageVersion Include="XAMLTest" Version="1.2.2" />
3232
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />

‎tests/MaterialDesignThemes.UITests/TestBase.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using TUnit.Core.Interfaces;
55

66
[assembly: ParallelLimiter<SingleParallelLimit>]
7+
78
[assembly: GenerateHelpers(typeof(AutoSuggestBox))]
89
[assembly: GenerateHelpers(typeof(ColorPicker))]
910
[assembly: GenerateHelpers(typeof(DecimalUpDown))]

‎tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ namespace MaterialDesignThemes.UITests.WPF.AutoSuggestBoxes;
55

66
public class AutoSuggestBoxTests : TestBase
77
{
8+
public AutoSuggestBoxTests()
9+
{
10+
AttachedDebuggerToRemoteProcess = false;
11+
}
12+
813
[Test]
914
public async Task CanFilterItems_WithSuggestionsAndDisplayMember_FiltersSuggestions()
1015
{

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace MaterialDesignThemes.Wpf.Tests;
22

3-
public class AdornerExtensionsTests : IClassFixture<AdornerExtensionsTests.AdornerFixture>
3+
[ClassDataSource<AdornerFixture>(Shared = SharedType.PerClass)]
4+
public class AdornerExtensionsTests
45
{
56
private readonly AdornerFixture _testFixture;
67

@@ -9,18 +10,16 @@ public AdornerExtensionsTests(AdornerFixture fixture)
910
_testFixture = fixture;
1011
}
1112

12-
[Fact]
13-
public void AddAdornerNullArgumentThrowsException()
13+
[Test]
14+
public async Task AddAdornerNullArgumentThrowsException()
1415
{
15-
Assert.Throws<ArgumentNullException>(
16-
() => _testFixture._testElement.AddAdorner<BottomDashedLineAdorner>(null!));
16+
await Assert.That(() => _testFixture._testElement.AddAdorner<BottomDashedLineAdorner>(null!)).ThrowsExactly<ArgumentNullException>();
1717
}
1818

19-
[Fact]
20-
public void AddAdornerToElementWithoutAdornerLayerThrowsException()
19+
[Test]
20+
public async Task AddAdornerToElementWithoutAdornerLayerThrowsException()
2121
{
22-
Assert.Throws<InvalidOperationException>(
23-
() => _testFixture._testElement.AddAdorner(new BottomDashedLineAdorner(_testFixture._testElement)));
22+
await Assert.That(() => _testFixture._testElement.AddAdorner(new BottomDashedLineAdorner(_testFixture._testElement))).ThrowsExactly<InvalidOperationException>();
2423
}
2524

2625
#region Class : AdornerFixture

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
using MaterialDesignColors;
2-
using Xunit;
32

43
namespace MaterialDesignThemes.Wpf.Tests;
54

65
public class BundledThemeTests
76
{
8-
[StaTheory]
9-
[InlineData(null, null, null)]
10-
[InlineData(BaseTheme.Light, null, null)]
11-
[InlineData(BaseTheme.Inherit, null, null)]
12-
[InlineData(null, PrimaryColor.Blue, null)]
13-
[InlineData(BaseTheme.Light, PrimaryColor.Blue, null)]
14-
[InlineData(BaseTheme.Inherit, PrimaryColor.Blue, null)]
15-
[InlineData(null, null, SecondaryColor.Blue)]
16-
[InlineData(BaseTheme.Light, null, SecondaryColor.Blue)]
17-
[InlineData(BaseTheme.Inherit, null, SecondaryColor.Blue)]
18-
public void WhenValueIsMissingThemeIsNotSet(BaseTheme? baseTheme, PrimaryColor? primaryColor, SecondaryColor? secondaryColor)
7+
[Test, STAThreadExecutor]
8+
[Arguments(null, null, null)]
9+
[Arguments(BaseTheme.Light, null, null)]
10+
[Arguments(BaseTheme.Inherit, null, null)]
11+
[Arguments(null, PrimaryColor.Blue, null)]
12+
[Arguments(BaseTheme.Light, PrimaryColor.Blue, null)]
13+
[Arguments(BaseTheme.Inherit, PrimaryColor.Blue, null)]
14+
[Arguments(null, null, SecondaryColor.Blue)]
15+
[Arguments(BaseTheme.Light, null, SecondaryColor.Blue)]
16+
[Arguments(BaseTheme.Inherit, null, SecondaryColor.Blue)]
17+
public async Task WhenValueIsMissingThemeIsNotSet(BaseTheme? baseTheme, PrimaryColor? primaryColor, SecondaryColor? secondaryColor)
1918
{
2019
//Arrange
2120
var bundledTheme = new BundledTheme();
@@ -26,11 +25,11 @@ public void WhenValueIsMissingThemeIsNotSet(BaseTheme? baseTheme, PrimaryColor?
2625
bundledTheme.SecondaryColor = secondaryColor;
2726

2827
//Assert
29-
Assert.Throws<InvalidOperationException>(() => bundledTheme.GetTheme());
28+
await Assert.That(() => bundledTheme.GetTheme()).ThrowsExactly<InvalidOperationException>();
3029
}
3130

32-
[StaFact]
33-
public void WhenAllValuesAreSetThemeIsSet()
31+
[Test, STAThreadExecutor]
32+
public async Task WhenAllValuesAreSetThemeIsSet()
3433
{
3534
//Arrange
3635
var bundledTheme = new BundledTheme();
@@ -42,12 +41,11 @@ public void WhenAllValuesAreSetThemeIsSet()
4241

4342
//Assert
4443
Theme theme = bundledTheme.GetTheme();
45-
Assert.Equal(SwatchHelper.Lookup[(MaterialDesignColor)PrimaryColor.Purple], theme.PrimaryMid.Color);
46-
Assert.Equal(SwatchHelper.Lookup[(MaterialDesignColor)SecondaryColor.Lime], theme.SecondaryMid.Color);
44+
await Assert.That(theme.PrimaryMid.Color).IsEqualTo(SwatchHelper.Lookup[(MaterialDesignColor)PrimaryColor.Purple]);
45+
await Assert.That(theme.SecondaryMid.Color).IsEqualTo(SwatchHelper.Lookup[(MaterialDesignColor)SecondaryColor.Lime]);
4746

4847
var lightTheme = new Theme();
4948
lightTheme.SetLightTheme();
50-
Assert.Equal(lightTheme.Foreground, theme.Foreground);
51-
Assert.NotEqual(default, theme.Foreground);
49+
await Assert.That(theme.Foreground).IsEqualTo(lightTheme.Foreground).And.IsNotEqualTo(default);
5250
}
5351
}

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

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Windows.Media;
2-
using Xunit;
32

43
namespace MaterialDesignThemes.Wpf.Tests;
54

@@ -12,100 +11,100 @@ public ButtonProgressAssistTests()
1211
_testElement = new Button();
1312
}
1413

15-
[StaFact]
16-
public void TestMinimumProperty()
14+
[Test, STAThreadExecutor]
15+
public async Task TestMinimumProperty()
1716
{
1817
// Assert defaults
19-
Assert.Equal("Minimum", ButtonProgressAssist.MinimumProperty.Name);
20-
Assert.Equal(default, ButtonProgressAssist.GetMinimum(_testElement));
18+
await Assert.That(ButtonProgressAssist.MinimumProperty.Name).IsEqualTo("Minimum");
19+
await Assert.That(ButtonProgressAssist.GetMinimum(_testElement)).IsEqualTo(default);
2120

2221
// Assert setting works
2322
ButtonProgressAssist.SetMinimum(_testElement, 133.14);
24-
Assert.Equal(133.14, ButtonProgressAssist.GetMinimum(_testElement));
23+
await Assert.That(ButtonProgressAssist.GetMinimum(_testElement)).IsEqualTo(133.14);
2524
}
2625

27-
[StaFact]
28-
public void TestMaximumProperty()
26+
[Test, STAThreadExecutor]
27+
public async Task TestMaximumProperty()
2928
{
3029
// Assert defaults
31-
Assert.Equal("Maximum", ButtonProgressAssist.MaximumProperty.Name);
32-
Assert.Equal(100.0, ButtonProgressAssist.GetMaximum(_testElement));
30+
await Assert.That(ButtonProgressAssist.MaximumProperty.Name).IsEqualTo("Maximum");
31+
await Assert.That(ButtonProgressAssist.GetMaximum(_testElement)).IsEqualTo(100.0);
3332

3433
// Assert setting works
3534
ButtonProgressAssist.SetMaximum(_testElement, 39.56);
36-
Assert.Equal(39.56, ButtonProgressAssist.GetMaximum(_testElement));
35+
await Assert.That(ButtonProgressAssist.GetMaximum(_testElement)).IsEqualTo(39.56);
3736
}
3837

39-
[StaFact]
40-
public void TestValueProperty()
38+
[Test, STAThreadExecutor]
39+
public async Task TestValueProperty()
4140
{
4241
// Assert defaults
43-
Assert.Equal("Value", ButtonProgressAssist.ValueProperty.Name);
44-
Assert.Equal(default, ButtonProgressAssist.GetValue(_testElement));
42+
await Assert.That(ButtonProgressAssist.ValueProperty.Name).IsEqualTo("Value");
43+
await Assert.That(ButtonProgressAssist.GetValue(_testElement)).IsEqualTo(default);
4544

4645
// Assert setting works
4746
ButtonProgressAssist.SetValue(_testElement, 99.1);
48-
Assert.Equal(99.1, ButtonProgressAssist.GetValue(_testElement));
47+
await Assert.That(ButtonProgressAssist.GetValue(_testElement)).IsEqualTo(99.1);
4948
}
5049

51-
[StaFact]
52-
public void TestIsIndeterminateProperty()
50+
[Test, STAThreadExecutor]
51+
public async Task TestIsIndeterminateProperty()
5352
{
5453
// Assert defaults
55-
Assert.Equal("IsIndeterminate", ButtonProgressAssist.IsIndeterminateProperty.Name);
56-
Assert.Equal(default, ButtonProgressAssist.GetIsIndeterminate(_testElement));
54+
await Assert.That(ButtonProgressAssist.IsIndeterminateProperty.Name).IsEqualTo("IsIndeterminate");
55+
await Assert.That(ButtonProgressAssist.GetIsIndeterminate(_testElement)).IsEqualTo(default);
5756

5857
// Assert setting works
5958
ButtonProgressAssist.SetIsIndeterminate(_testElement, false);
60-
Assert.False(ButtonProgressAssist.GetIsIndeterminate(_testElement));
59+
await Assert.That(ButtonProgressAssist.GetIsIndeterminate(_testElement)).IsFalse();
6160
}
6261

63-
[StaFact]
64-
public void TestIndicatorForegroundProperty()
62+
[Test, STAThreadExecutor]
63+
public async Task TestIndicatorForegroundProperty()
6564
{
6665
// Assert defaults
67-
Assert.Equal("IndicatorForeground", ButtonProgressAssist.IndicatorForegroundProperty.Name);
68-
Assert.Equal(default, ButtonProgressAssist.GetIndicatorForeground(_testElement));
66+
await Assert.That(ButtonProgressAssist.IndicatorForegroundProperty.Name).IsEqualTo("IndicatorForeground");
67+
await Assert.That(ButtonProgressAssist.GetIndicatorForeground(_testElement)).IsEqualTo(default);
6968

7069
// Assert setting works
7170
ButtonProgressAssist.SetIndicatorForeground(_testElement, Brushes.LightBlue);
72-
Assert.Equal(Brushes.LightBlue, ButtonProgressAssist.GetIndicatorForeground(_testElement));
71+
await Assert.That(ButtonProgressAssist.GetIndicatorForeground(_testElement)).IsEqualTo(Brushes.LightBlue);
7372
}
7473

75-
[StaFact]
76-
public void TestIndicatorBackgroundProperty()
74+
[Test, STAThreadExecutor]
75+
public async Task TestIndicatorBackgroundProperty()
7776
{
7877
// Assert defaults
79-
Assert.Equal("IndicatorBackground", ButtonProgressAssist.IndicatorBackgroundProperty.Name);
80-
Assert.Equal(default, ButtonProgressAssist.GetIndicatorBackground(_testElement));
78+
await Assert.That(ButtonProgressAssist.IndicatorBackgroundProperty.Name).IsEqualTo("IndicatorBackground");
79+
await Assert.That(ButtonProgressAssist.GetIndicatorBackground(_testElement)).IsEqualTo(default);
8180

8281
// Assert setting works
8382
ButtonProgressAssist.SetIndicatorBackground(_testElement, Brushes.DarkGoldenrod);
84-
Assert.Equal(Brushes.DarkGoldenrod, ButtonProgressAssist.GetIndicatorBackground(_testElement));
83+
await Assert.That(ButtonProgressAssist.GetIndicatorBackground(_testElement)).IsEqualTo(Brushes.DarkGoldenrod);
8584
}
8685

87-
[StaFact]
88-
public void TestIsIndicatorVisibleProperty()
86+
[Test, STAThreadExecutor]
87+
public async Task TestIsIndicatorVisibleProperty()
8988
{
9089
// Assert defaults
91-
Assert.Equal("IsIndicatorVisible", ButtonProgressAssist.IsIndicatorVisibleProperty.Name);
92-
Assert.Equal(default, ButtonProgressAssist.GetIsIndicatorVisible(_testElement));
90+
await Assert.That(ButtonProgressAssist.IsIndicatorVisibleProperty.Name).IsEqualTo("IsIndicatorVisible");
91+
await Assert.That(ButtonProgressAssist.GetIsIndicatorVisible(_testElement)).IsEqualTo(default);
9392

9493
// Assert setting works
9594
ButtonProgressAssist.SetIsIndicatorVisible(_testElement, true);
96-
Assert.True(ButtonProgressAssist.GetIsIndicatorVisible(_testElement));
95+
await Assert.That(ButtonProgressAssist.GetIsIndicatorVisible(_testElement)).IsTrue();
9796
}
9897

99-
[StaFact]
100-
public void TestOpacityProperty()
98+
[Test, STAThreadExecutor]
99+
public async Task TestOpacityProperty()
101100
{
102101
// Assert defaults
103-
Assert.Equal("Opacity", ButtonProgressAssist.OpacityProperty.Name);
104-
Assert.Equal(default, ButtonProgressAssist.GetOpacity(_testElement));
102+
await Assert.That(ButtonProgressAssist.OpacityProperty.Name).IsEqualTo("Opacity");
103+
await Assert.That(ButtonProgressAssist.GetOpacity(_testElement)).IsEqualTo(default);
105104

106105
// Assert setting works
107106
ButtonProgressAssist.SetOpacity(_testElement, 311);
108-
Assert.Equal(311, ButtonProgressAssist.GetOpacity(_testElement));
107+
await Assert.That(ButtonProgressAssist.GetOpacity(_testElement)).IsEqualTo(311);
109108
}
110109

111110
}

0 commit comments

Comments
 (0)