diff --git a/Directory.Packages.props b/Directory.Packages.props index 73caa59f..545724c9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -19,10 +19,10 @@ - + diff --git a/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardCharCacheTests.cs b/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardCharCacheTests.cs index dc405bfd..502793bf 100644 --- a/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardCharCacheTests.cs +++ b/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardCharCacheTests.cs @@ -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; @@ -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] @@ -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] @@ -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] @@ -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(); } } \ No newline at end of file diff --git a/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardHandleTests.cs b/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardHandleTests.cs index b9ef4530..d61d7513 100644 --- a/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardHandleTests.cs +++ b/test/Demo.Engine.Core.UTs/Components/Keyboard/KeyboardHandleTests.cs @@ -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; @@ -19,11 +19,11 @@ public KeyboardHandleTests() { _mockKeyboardCache = Substitute.For(); _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() @@ -38,7 +38,7 @@ public void GetKeyPressed_Only_One_Pressed() foreach (var key in Enum.GetValues(typeof(VirtualKeys)).Cast()) { var result = keyboardHandle.GetKeyPressed(key); - result.Should().Be(key == TESTKEY, $"{key} is {result}"); + result.ShouldBe(key == TESTKEY, $"{key} is {result}"); } // Assert @@ -65,7 +65,7 @@ public void GetKeyPressed_Multiple_Keys_Pressed() foreach (var key in Enum.GetValues(typeof(VirtualKeys)).Cast()) { var result = keyboardHandle.GetKeyPressed(key); - result.Should().Be(testKeys.Contains(key), $"{key} is {result}"); + result.ShouldBe(testKeys.Contains(key), $"{key} is {result}"); } // Assert diff --git a/test/Demo.Engine.Core.UTs/Demo.Engine.Core.UTs.csproj b/test/Demo.Engine.Core.UTs/Demo.Engine.Core.UTs.csproj index 2affd494..69c41966 100644 --- a/test/Demo.Engine.Core.UTs/Demo.Engine.Core.UTs.csproj +++ b/test/Demo.Engine.Core.UTs/Demo.Engine.Core.UTs.csproj @@ -28,7 +28,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Demo.Engine.Core.UTs/Services/MainLoopServiceTests.cs b/test/Demo.Engine.Core.UTs/Services/MainLoopServiceTests.cs index c1a4cbee..0fbb1015 100644 --- a/test/Demo.Engine.Core.UTs/Services/MainLoopServiceTests.cs +++ b/test/Demo.Engine.Core.UTs/Services/MainLoopServiceTests.cs @@ -10,10 +10,10 @@ using Demo.Engine.Core.Interfaces.Rendering; using Demo.Engine.Core.Requests.Keyboard; using Demo.Engine.Core.Services; -using FluentAssertions; using MediatR; using Microsoft.Extensions.Hosting; using NSubstitute; +using Shouldly; using Xunit; namespace Demo.Engine.Core.UTs.Services; @@ -37,7 +37,7 @@ public MainLoopServiceTests() } private MainLoopService CreateService() - => new MainLoopService( + => new( _mockMediator, _mockHostApplicationLifetime, _mockOSMessageHandler, @@ -60,7 +60,7 @@ public void RunAsync_Throws_On_UpdateCallback_Null() cancellationToken); // Assert - func.Should().ThrowAsync(); + _ = func.ShouldThrowAsync(); } [Fact] @@ -79,7 +79,7 @@ public void RunAsync_Throws_On_RenderCallback_Null() cancellationToken); // Assert - func.Should().ThrowAsync(); + _ = func.ShouldThrowAsync(); } [Fact] @@ -98,14 +98,14 @@ public async Task RunAsync_CancellationToken_Properly_Cancels_After_Time() var keyboardCache = new KeyboardCharCache(keybaorCacheSub); var keyboardHandle = new KeyboardHandle(keybaorCacheSub); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) .Returns( keyboardCache); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) @@ -113,11 +113,11 @@ public async Task RunAsync_CancellationToken_Properly_Cancels_After_Time() keyboardHandle); var renderingControlMock = Substitute.For(); - _mockRenderingEngine.Control.Returns(renderingControlMock); + _ = _mockRenderingEngine.Control.Returns(renderingControlMock); - _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); + _ = _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); - _mockHostApplicationLifetime.ApplicationStopping.Returns(new CancellationToken()); + _ = _mockHostApplicationLifetime.ApplicationStopping.Returns(new CancellationToken()); // Act var sw = Stopwatch.StartNew(); @@ -129,7 +129,7 @@ await service.RunAsync( // Assert // We let it have a bit of a leeway - sw.Elapsed.TotalSeconds.Should().BeInRange( + sw.Elapsed.TotalSeconds.ShouldBeInRange( TimeSpan.FromSeconds(4.9).TotalSeconds, TimeSpan.FromSeconds(5.9).TotalSeconds); } @@ -157,14 +157,14 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) var keyboardCache = new KeyboardCharCache(keybaorCacheSub); var keyboardHandle = new KeyboardHandle(keybaorCacheSub); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) .Returns( keyboardCache); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) @@ -172,11 +172,11 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) keyboardHandle); var renderingControlMock = Substitute.For(); - _mockRenderingEngine.Control.Returns(renderingControlMock); + _ = _mockRenderingEngine.Control.Returns(renderingControlMock); - _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); + _ = _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); - _mockHostApplicationLifetime.ApplicationStopping.Returns(new CancellationToken()); + _ = _mockHostApplicationLifetime.ApplicationStopping.Returns(new CancellationToken()); // Act await service.RunAsync( @@ -185,7 +185,7 @@ await service.RunAsync( cts.Token); // Assert - iUpdate.Should().Be(6); + iUpdate.ShouldBe(6); } [Fact] @@ -213,14 +213,14 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) var keyboardCache = new KeyboardCharCache(keybaorCacheSub); var keyboardHandle = new KeyboardHandle(keybaorCacheSub); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) .Returns( keyboardCache); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) @@ -228,11 +228,11 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) keyboardHandle); var renderingControlMock = Substitute.For(); - _mockRenderingEngine.Control.Returns(renderingControlMock); + _ = _mockRenderingEngine.Control.Returns(renderingControlMock); - _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); + _ = _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); - _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); + _ = _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); // Act await service.RunAsync( @@ -241,7 +241,7 @@ await service.RunAsync( cts.Token); // Assert - iUpdate.Should().Be(6); + iUpdate.ShouldBe(6); } [Fact] @@ -272,14 +272,14 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) var keyboardCache = new KeyboardCharCache(keybaorCacheSub); var keyboardHandle = new KeyboardHandle(keybaorCacheSub); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) .Returns( keyboardCache); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) @@ -287,11 +287,11 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) keyboardHandle); var renderingControlMock = Substitute.For(); - _mockRenderingEngine.Control.Returns(renderingControlMock); + _ = _mockRenderingEngine.Control.Returns(renderingControlMock); - _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); + _ = _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); - _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); + _ = _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); // Act await service.RunAsync( @@ -300,8 +300,8 @@ await service.RunAsync( cts.Token); // Assert - iUpdate.Should().BeGreaterThan(0); - iRender.Should().BeGreaterThan(0); + iUpdate.ShouldBeGreaterThan(0); + iRender.ShouldBeGreaterThan(0); } [Fact] @@ -326,14 +326,14 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) var keyboardCache = new KeyboardCharCache(keybaorCacheSub); var keyboardHandle = new KeyboardHandle(keybaorCacheSub); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) .Returns( keyboardCache); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) @@ -341,11 +341,11 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) keyboardHandle); var renderingControlMock = Substitute.For(); - _mockRenderingEngine.Control.Returns(renderingControlMock); + _ = _mockRenderingEngine.Control.Returns(renderingControlMock); - _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(_ => iUpdate <= 5); + _ = _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(_ => iUpdate <= 5); - _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); + _ = _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); // Act await service.RunAsync( @@ -354,7 +354,7 @@ await service.RunAsync( cts.Token); // Assert - iUpdate.Should().Be(6); + iUpdate.ShouldBe(6); } [Fact] @@ -371,7 +371,7 @@ public async Task RunAsync_IsRunning_Is_Properly_Set() Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) { - service.IsRunning.Should().BeTrue(); + service.IsRunning.ShouldBeTrue(); return Task.CompletedTask; } @@ -379,14 +379,14 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) var keyboardCache = new KeyboardCharCache(keybaorCacheSub); var keyboardHandle = new KeyboardHandle(keybaorCacheSub); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) .Returns( keyboardCache); - _mockMediator + _ = _mockMediator .Send( Arg.Any(), Arg.Any()) @@ -394,20 +394,20 @@ Task UpdateCallback(KeyboardHandle _, KeyboardCharCache __) keyboardHandle); var renderingControlMock = Substitute.For(); - _mockRenderingEngine.Control.Returns(renderingControlMock); + _ = _mockRenderingEngine.Control.Returns(renderingControlMock); - _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); + _ = _mockOSMessageHandler.DoEvents(renderingControlMock).Returns(true); - _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); + _ = _mockHostApplicationLifetime.ApplicationStopping.Returns(appLifetimeCTS.Token); // Act - service.IsRunning.Should().BeFalse(); + service.IsRunning.ShouldBeFalse(); await service.RunAsync( UpdateCallback, RenderCallback, cts.Token); // Assert - service.IsRunning.Should().BeFalse(); + service.IsRunning.ShouldBeFalse(); } } \ No newline at end of file diff --git a/test/Demo.Tools.Common.UTs/Collections/CircularQueueTests.cs b/test/Demo.Tools.Common.UTs/Collections/CircularQueueTests.cs index b82e30d5..7f1a4b6a 100644 --- a/test/Demo.Tools.Common.UTs/Collections/CircularQueueTests.cs +++ b/test/Demo.Tools.Common.UTs/Collections/CircularQueueTests.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using Demo.Tools.Common.Collections; -using FluentAssertions; +using Shouldly; using Xunit; namespace Demo.Tools.Common.UTs.Collections; @@ -15,12 +15,12 @@ public void Enqueue_Enqueue_1() { var circQueue = new CircularQueue(2); circQueue.Enqueue(123); - circQueue.Count.Should().Be(1); + circQueue.Count.ShouldBe(1); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(123); - buffer[1].Should().Be(0); + buffer[0].ShouldBe(123); + buffer[1].ShouldBe(0); } [Fact] @@ -29,12 +29,12 @@ public void Enqueue_Enqueue_2() var circQueue = new CircularQueue(2); circQueue.Enqueue(123); circQueue.Enqueue(456); - circQueue.Count.Should().Be(2); + circQueue.Count.ShouldBe(2); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(123); - buffer[1].Should().Be(456); + buffer[0].ShouldBe(123); + buffer[1].ShouldBe(456); } [Fact] @@ -44,12 +44,12 @@ public void Enqueue_Enqueue_3() circQueue.Enqueue(123); circQueue.Enqueue(456); circQueue.Enqueue(789); - circQueue.Count.Should().Be(2); + circQueue.Count.ShouldBe(2); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(456); - buffer[1].Should().Be(789); + buffer[0].ShouldBe(456); + buffer[1].ShouldBe(789); } [Fact] @@ -61,12 +61,12 @@ public void Enqueue_Dequeue_1() circQueue.Enqueue(789); var dequeued = circQueue.Dequeue(); - circQueue.Count.Should().Be(1); - dequeued.Should().Be(456); + circQueue.Count.ShouldBe(1); + dequeued.ShouldBe(456); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(789); - buffer[1].Should().Be(0); + buffer[0].ShouldBe(789); + buffer[1].ShouldBe(0); } [Fact] @@ -79,12 +79,12 @@ public void Enqueue_3_Dequeue_1_Then_Enqueue_1() var dequeued = circQueue.Dequeue(); circQueue.Enqueue(159); - circQueue.Count.Should().Be(2); - dequeued.Should().Be(456); + circQueue.Count.ShouldBe(2); + dequeued.ShouldBe(456); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(789); - buffer[1].Should().Be(159); + buffer[0].ShouldBe(789); + buffer[1].ShouldBe(159); } [Fact] @@ -93,13 +93,13 @@ public void Dequeue_Empty_Throws_Exception() var circQueue = new CircularQueue(2); Action act = () => circQueue.Dequeue(); - act.Should().Throw(); + _ = act.ShouldThrow(); - circQueue.Count.Should().Be(0); + circQueue.Count.ShouldBe(0); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(0); - buffer[1].Should().Be(0); + buffer[0].ShouldBe(0); + buffer[1].ShouldBe(0); } [Fact] @@ -108,14 +108,14 @@ public void Dequeue_TryDequeue_On_Empty_Should_Not_Throw_Error() var circQueue = new CircularQueue(2); var peeked = circQueue.TryDequeue(out var result); - peeked.Should().BeFalse(); - result.Should().Be(default); + peeked.ShouldBeFalse(); + result.ShouldBe(default); - circQueue.Count.Should().Be(0); + circQueue.Count.ShouldBe(0); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(0); - buffer[1].Should().Be(0); + buffer[0].ShouldBe(0); + buffer[1].ShouldBe(0); } [Fact] @@ -127,12 +127,12 @@ public void Enqueue2_Peek() circQueue.Enqueue(789); var peaked = circQueue.Peek(); - circQueue.Count.Should().Be(2); - peaked.Should().Be(456); + circQueue.Count.ShouldBe(2); + peaked.ShouldBe(456); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(456); - buffer[1].Should().Be(789); + buffer[0].ShouldBe(456); + buffer[1].ShouldBe(789); } [Fact] @@ -145,14 +145,14 @@ public void Enqueue2_Peek_Peek() var peaked1 = circQueue.Peek(); var peaked2 = circQueue.Peek(); - circQueue.Count.Should().Be(2); - peaked1.Should().Be(456); - peaked2.Should().Be(456); + circQueue.Count.ShouldBe(2); + peaked1.ShouldBe(456); + peaked2.ShouldBe(456); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(456); - buffer[1].Should().Be(789); + buffer[0].ShouldBe(456); + buffer[1].ShouldBe(789); } [Fact] @@ -163,7 +163,7 @@ public void Enqueue2_Peek_Peek() public void Constructor_negative_capacity() { Action circQueue = () => new CircularQueue(-2); - circQueue.Should().Throw(); + _ = circQueue.ShouldThrow(); } [Fact] @@ -172,13 +172,13 @@ public void Queue_Peek_On_Emplty_Throws_Error() var circQueue = new CircularQueue(2); Action peek = () => circQueue.Peek(); - peek.Should().Throw(); + _ = peek.ShouldThrow(); - circQueue.Count.Should().Be(0); + circQueue.Count.ShouldBe(0); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(0); - buffer[1].Should().Be(0); + buffer[0].ShouldBe(0); + buffer[1].ShouldBe(0); } [Fact] @@ -187,13 +187,13 @@ public void Queue_TryPeek_On_Empty_Should_Not_Throw_Error() var circQueue = new CircularQueue(2); var peeked = circQueue.TryPeek(out var result); - peeked.Should().BeFalse(); - result.Should().Be(default); + peeked.ShouldBeFalse(); + result.ShouldBe(default); - circQueue.Count.Should().Be(0); + circQueue.Count.ShouldBe(0); var buffer = new int[2]; circQueue.CopyTo(buffer, 0); - buffer[0].Should().Be(0); - buffer[1].Should().Be(0); + buffer[0].ShouldBe(0); + buffer[1].ShouldBe(0); } } \ No newline at end of file diff --git a/test/Demo.Tools.Common.UTs/Demo.Tools.Common.UTs.csproj b/test/Demo.Tools.Common.UTs/Demo.Tools.Common.UTs.csproj index fb643a12..a7669f94 100644 --- a/test/Demo.Tools.Common.UTs/Demo.Tools.Common.UTs.csproj +++ b/test/Demo.Tools.Common.UTs/Demo.Tools.Common.UTs.csproj @@ -28,7 +28,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Demo.Tools.Common.UTs/Extensions/DependencyInjection/ScopedDIExtensionsTests.cs b/test/Demo.Tools.Common.UTs/Extensions/DependencyInjection/ScopedDIExtensionsTests.cs index ebdf226f..7943b582 100644 --- a/test/Demo.Tools.Common.UTs/Extensions/DependencyInjection/ScopedDIExtensionsTests.cs +++ b/test/Demo.Tools.Common.UTs/Extensions/DependencyInjection/ScopedDIExtensionsTests.cs @@ -2,8 +2,8 @@ // Distributed under MIT license. See LICENSE file in the root for more information. using Demo.Tools.Common.Extensions.DependencyInjection; -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; +using Shouldly; using Xunit; namespace Demo.Tools.Common.UTs.Extensions.DependencyInjection; @@ -16,12 +16,12 @@ public void AddScoped_Multiple_Interfaces_Control_Sample() // Arrange IServiceCollection services = new ServiceCollection(); var counter = new Counter(); - services.AddSingleton(_ => counter); + _ = services.AddSingleton(_ => counter); // Act - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); + _ = services.AddScoped(); + _ = services.AddScoped(); + _ = services.AddScoped(); //Assert var serviceProvider = services.BuildServiceProvider(); @@ -29,11 +29,11 @@ public void AddScoped_Multiple_Interfaces_Control_Sample() var foo2 = serviceProvider.GetRequiredService(); var bar = serviceProvider.GetRequiredService(); - foo1.Should().NotBeSameAs(bar); - foo2.Should().NotBeSameAs(bar); - foo2.Should().NotBeSameAs(foo1); + foo1.ShouldNotBeSameAs(bar); + foo2.ShouldNotBeSameAs(bar); + foo2.ShouldNotBeSameAs(foo1); - counter.ConstructedNo.Should().Be(3); + counter.ConstructedNo.ShouldBe(3); } [Fact] @@ -42,9 +42,9 @@ public void AddScoped_2_Interfaces_ExpectedBehavior() // Arrange IServiceCollection services = new ServiceCollection(); var counter = new Counter(); - services.AddSingleton(_ => counter); + _ = services.AddSingleton(_ => counter); // Act - services.AddScoped(); + _ = services.AddScoped(); // Assert var serviceProvider = services.BuildServiceProvider(); @@ -52,9 +52,9 @@ public void AddScoped_2_Interfaces_ExpectedBehavior() var foo2 = serviceProvider.GetRequiredService(); var bar = serviceProvider.GetRequiredService(); - foo1.Should().BeSameAs(bar); - foo2.Should().BeSameAs(bar); - counter.ConstructedNo.Should().Be(1); + foo1.ShouldBeSameAs(bar); + foo2.ShouldBeSameAs(bar); + counter.ConstructedNo.ShouldBe(1); } public interface Foo1 diff --git a/test/Demo.Tools.Common.UTs/Extensions/LockSlim/ReaderWriterLockSlimExtensionsTests.cs b/test/Demo.Tools.Common.UTs/Extensions/LockSlim/ReaderWriterLockSlimExtensionsTests.cs index e07931eb..354f123d 100644 --- a/test/Demo.Tools.Common.UTs/Extensions/LockSlim/ReaderWriterLockSlimExtensionsTests.cs +++ b/test/Demo.Tools.Common.UTs/Extensions/LockSlim/ReaderWriterLockSlimExtensionsTests.cs @@ -3,7 +3,7 @@ using System.Text; using Demo.Tools.Common.Extensions.LockSlim; -using FluentAssertions; +using Shouldly; using Xunit; namespace Demo.Tools.Common.UTs.Extensions.LockSlim; @@ -30,30 +30,30 @@ public async Task Test_Lock_2() var sb = new StringBuilder(); var threadJobs = new List { - new ThreadJob(T1, () => lockSlim.TryEnterWriteLock(TimeSpan.FromSeconds(20))), - new ThreadJob(T1, () => + new(T1, () => lockSlim.TryEnterWriteLock(TimeSpan.FromSeconds(20))), + new(T1, () => { - sb.Append("T1 start"); + _ = sb.Append("T1 start"); Thread.Sleep(5); }), - new ThreadJob(T2, () => lockSlim.TryEnterWriteLock(TimeSpan.FromSeconds(20))), - new ThreadJob(T1, () => + new(T2, () => lockSlim.TryEnterWriteLock(TimeSpan.FromSeconds(20))), + new(T1, () => { - sb.Append("T1 end"); + _ = sb.Append("T1 end"); Thread.Sleep(5); }), - new ThreadJob(T1, () => lockSlim.ExitWriteLock()), - new ThreadJob(T2, () => + new(T1, lockSlim.ExitWriteLock), + new(T2, () => { - sb.Append("T2 start"); + _ = sb.Append("T2 start"); Thread.Sleep(5); }), - new ThreadJob(T2, () => + new(T2, () => { - sb.Append("T2 end"); + _ = sb.Append("T2 end"); Thread.Sleep(5); }), - new ThreadJob(T2, () => lockSlim.ExitWriteLock()) + new(T2, lockSlim.ExitWriteLock) }; var cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)); @@ -67,8 +67,8 @@ await Task.WhenAll( tw2.Start() }); - sb.ToString().Should().Contain("T1 startT1 end"); - sb.ToString().Should().Contain("T2 startT2 end"); + sb.ToString().ShouldContain("T1 startT1 end"); + sb.ToString().ShouldContain("T2 startT2 end"); } [Fact] @@ -89,32 +89,32 @@ public async Task Test_Write_Lock_Extensions() var threadJobs = new List { - new ThreadJob(T1, () => lockSlim.EnterWriteLockBlock(() => + new(T1, () => lockSlim.EnterWriteLockBlock(() => { - sb.Append("T1 start"); + _ = sb.Append("T1 start"); while (!cts.IsCancellationRequested && !t1FinishedWriting) { Thread.Sleep(5); t1Started = true; } - sb.Append("T1 end"); + _ = sb.Append("T1 end"); })), - new ThreadJob(T2, () => + new(T2, () => { while (!cts.IsCancellationRequested && !t1Started) { Thread.Sleep(5); } - sb.Append("T2 attempt"); + _ = sb.Append("T2 attempt"); t2Started = true; - lockSlim.EnterWriteLockBlock(() => + _ = lockSlim.EnterWriteLockBlock(() => { - sb.Append("T2 start"); + _ = sb.Append("T2 start"); Thread.Sleep(5); - sb.Append("T2 end"); + _ = sb.Append("T2 end"); }); }), - new ThreadJob(T3, () => + new(T3, () => { while (!t1Started || !t2Started) { @@ -134,7 +134,7 @@ await Task.WhenAll( tw2.Start(), tw3.Start()); - sb.ToString().Should().Be( + sb.ToString().ShouldBe( "T1 start" + "T2 attempt" + "T1 end" +