From 40fac010fc7c080735d950f1e3e149d51f1d9c17 Mon Sep 17 00:00:00 2001 From: Joseph Tam Date: Sun, 15 Sep 2024 21:19:23 +0800 Subject: [PATCH] fix: unit tests --- .../Client.Test.cs | 8 ++++---- .../ClientBufferSender.Test.cs | 16 ++++++++-------- .../RtmpClientHandler.Test.cs | 6 +++--- .../RtmpChunkMessageWriterService.Test.cs | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/LiveStreamingServerNet.Networking.Test/Client.Test.cs b/test/LiveStreamingServerNet.Networking.Test/Client.Test.cs index e3f3d43f..3c5b38af 100644 --- a/test/LiveStreamingServerNet.Networking.Test/Client.Test.cs +++ b/test/LiveStreamingServerNet.Networking.Test/Client.Test.cs @@ -120,9 +120,9 @@ public async Task RunAsync_Should_BeCancellable() // Assert _ = _clientHandler.Received().HandleClientLoopAsync(Arg.Any(), Arg.Any()); - _ = _bufferSender.Received().DisposeAsync(); _ = _clientHandler.Received().DisposeAsync(); - _networkStream.Received().Dispose(); + _ = _bufferSender.Received().DisposeAsync(); + _ = _networkStream.Received().DisposeAsync(); _tcpClient.Received().Close(); } @@ -140,9 +140,9 @@ public async Task Disconnect_Should_CancelRunAsync() await clientTask; // Assert - _ = _bufferSender.Received().DisposeAsync(); _ = _clientHandler.Received().DisposeAsync(); - _networkStream.Received().Dispose(); + _ = _bufferSender.Received().DisposeAsync(); + _ = _networkStream.Received().DisposeAsync(); _tcpClient.Received().Close(); } diff --git a/test/LiveStreamingServerNet.Networking.Test/ClientBufferSender.Test.cs b/test/LiveStreamingServerNet.Networking.Test/ClientBufferSender.Test.cs index 412d63ed..80eac2ba 100644 --- a/test/LiveStreamingServerNet.Networking.Test/ClientBufferSender.Test.cs +++ b/test/LiveStreamingServerNet.Networking.Test/ClientBufferSender.Test.cs @@ -37,7 +37,7 @@ public async Task SendAsync_Should_WriteBufferIntoNetworkStream() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.Create(); _sut.Start(networkStream, _cancellationToken); @@ -63,7 +63,7 @@ public async Task SendAsyncWithRentedBuffer_Should_WriteBufferIntoNetworkStream( { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.Create(); _sut.Start(networkStream, _cancellationToken); @@ -91,7 +91,7 @@ public async Task SendAsyncWithWriter_Should_WriteBufferIntoNetworkStream() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.Create(); _sut.Start(networkStream, _cancellationToken); @@ -114,7 +114,7 @@ public async Task Send_Should_WriteBufferIntoNetworkStream() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.Create(); _sut.Start(networkStream, _cancellationToken); @@ -142,7 +142,7 @@ public async Task SendWithRentedBuffer_Should_WriteBufferIntoNetworkStream() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.Create(); _sut.Start(networkStream, _cancellationToken); @@ -172,7 +172,7 @@ public async Task SendWithWriter_Should_WriteBufferIntoNetworkStream() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.Create(); _sut.Start(networkStream, _cancellationToken); @@ -197,7 +197,7 @@ public async Task DataBufferSender_Should_BeCancellable() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); _sut.Start(networkStream, _cancellationToken); @@ -215,7 +215,7 @@ public async Task Send_Should_WriteBufferIntoNetworkStreamInOrder() { // Arrange using var innerStream = new MemoryStream(); - using var networkStream = new NetworkStream(innerStream); + await using var networkStream = new NetworkStream(innerStream); var expectedBuffer = _fixture.CreateMany(100).ToArray(); _sut.Start(networkStream, _cancellationToken); diff --git a/test/LiveStreamingServerNet.Rtmp.Test/RtmpClientHandler.Test.cs b/test/LiveStreamingServerNet.Rtmp.Test/RtmpClientHandler.Test.cs index 6c8beeb4..63545da2 100644 --- a/test/LiveStreamingServerNet.Rtmp.Test/RtmpClientHandler.Test.cs +++ b/test/LiveStreamingServerNet.Rtmp.Test/RtmpClientHandler.Test.cs @@ -10,7 +10,7 @@ namespace LiveStreamingServerNet.Rtmp.Test { - public class RtmpClientHandlerTest : IDisposable + public class RtmpClientHandlerTest : IAsyncDisposable { private readonly IMediator _mediator; private readonly IRtmpServerConnectionEventDispatcher _eventDispatcher; @@ -40,9 +40,9 @@ public RtmpClientHandlerTest() _sut = new RtmpClientHandler(_clientContext, _mediator, _eventDispatcher, _logger, _bandwidthLimiterFactory); } - public void Dispose() + public async ValueTask DisposeAsync() { - _networkStream.Dispose(); + await _networkStream.DisposeAsync(); } [Fact] diff --git a/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs b/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs index c89e5b73..cc5bc9b6 100644 --- a/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs +++ b/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs @@ -42,7 +42,7 @@ public async Task Write_Should_SeparateChunkType0MessageIntoChunks(uint timestam service.Write(streamBuffer, basicHeader, messageHeader, payloadBuffer.MoveTo(0), (uint)expectedChunkSize); // Assert - using var stream = new NetworkStream(new MemoryStream(streamBuffer.UnderlyingBuffer)); + await using var stream = new NetworkStream(new MemoryStream(streamBuffer.UnderlyingBuffer)); using var targetBuffer = new DataBuffer(); var remainingPayloadSize = expectedPayload.Length;