Skip to content

Migrating tests to Shouldly #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Migrating tests to Shouldly #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<PackageVersion Include="Vortice.D3DCompiler" Version="3.6.2" />
<PackageVersion Include="Vortice.Direct3D11" Version="3.6.2" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="Shouldly" Version="4.0.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
Expand Down
26 changes: 13 additions & 13 deletions test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardCharCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Demo.Engine.Core.Components.Keyboard;
using Demo.Engine.Core.Components.Keyboard.Internal;
using Demo.Engine.Core.Interfaces.Components;
using FluentAssertions;
using Shouldly;
using Xunit;

namespace Demo.Engine.Core.UTs.Components.Keyboard;
Expand Down Expand Up @@ -40,7 +40,7 @@ public void ReadChars_StateUnderTest_ExpectedBehavior()
var result = _charResponse.ReadCache();

// Assert
result.Should().Be("ala ma kota");
result.ShouldBe("ala ma kota");
}

[Fact]
Expand All @@ -53,8 +53,8 @@ public void ReadChars_Dequeues_Properly()
var result1 = _charResponse.ReadCache();
var result2 = _charResponse.ReadCache();

result1.Should().Be("abc");
result2.Should().BeEmpty();
result1.ShouldBe("abc");
result2.ShouldBeEmpty();
}

[Fact]
Expand All @@ -67,9 +67,9 @@ public void ReadChars_From_Multiple_Handlers()
_keyboardCache.Char('b');
_keyboardCache.Char('c');

_charResponse.ReadCache().Should().Be("abc");
charResponse1.ReadCache().Should().Be("abc");
charResponse2.ReadCache().Should().Be("abc");
_charResponse.ReadCache().ShouldBe("abc");
charResponse1.ReadCache().ShouldBe("abc");
charResponse2.ReadCache().ShouldBe("abc");
}

[Fact]
Expand All @@ -89,12 +89,12 @@ public void ReadChars_Multiple_Handlers_Mixed_Reads()
var charResponse2Read2 = charResponse2.ReadCache();
var charResponse3Read2 = _charResponse.ReadCache();

charResponse1Read1.Should().Be("a");
charResponse2Read1.Should().Be("ab");
charResponse3Read1.Should().Be("abc");
charResponse1Read1.ShouldBe("a");
charResponse2Read1.ShouldBe("ab");
charResponse3Read1.ShouldBe("abc");

charResponse1Read2.Should().Be("bc");
charResponse2Read2.Should().Be("c");
charResponse3Read2.Should().BeEmpty();
charResponse1Read2.ShouldBe("bc");
charResponse2Read2.ShouldBe("c");
charResponse3Read2.ShouldBeEmpty();
}
}
12 changes: 6 additions & 6 deletions test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardHandleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
using Demo.Engine.Core.Components.Keyboard;
using Demo.Engine.Core.Interfaces.Components;
using Demo.Engine.Core.Platform;
using FluentAssertions;
using NSubstitute;
using Shouldly;
using Xunit;

namespace Demo.Engine.Core.UTs.Components.Keyboard;
Expand All @@ -19,11 +19,11 @@ public KeyboardHandleTests()
{
_mockKeyboardCache = Substitute.For<IKeyboardCache>();
_keyboardCache = Enumerable.Repeat(false, 256).ToArray().AsMemory();
_mockKeyboardCache.KeysPressed.Returns(_keyboardCache);
_ = _mockKeyboardCache.KeysPressed.Returns(_keyboardCache);
}

private KeyboardHandle CreateKeyboardHandle() =>
new KeyboardHandle(_mockKeyboardCache);
private KeyboardHandle CreateKeyboardHandle()
=> new(_mockKeyboardCache);

[Fact]
public void GetKeyPressed_Only_One_Pressed()
Expand All @@ -38,7 +38,7 @@ public void GetKeyPressed_Only_One_Pressed()
foreach (var key in Enum.GetValues(typeof(VirtualKeys)).Cast<VirtualKeys>())
{
var result = keyboardHandle.GetKeyPressed(key);
result.Should().Be(key == TESTKEY, $"{key} is {result}");
result.ShouldBe(key == TESTKEY, $"{key} is {result}");
}

// Assert
Expand All @@ -65,7 +65,7 @@ public void GetKeyPressed_Multiple_Keys_Pressed()
foreach (var key in Enum.GetValues(typeof(VirtualKeys)).Cast<VirtualKeys>())
{
var result = keyboardHandle.GetKeyPressed(key);
result.Should().Be(testKeys.Contains(key), $"{key} is {result}");
result.ShouldBe(testKeys.Contains(key), $"{key} is {result}");
}

// Assert
Expand Down
2 changes: 1 addition & 1 deletion test/Demo.Engine.Core.UTs/Demo.Engine.Core.UTs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="NSubstitute.Analyzers.CSharp">
Expand Down
Loading