Changes xunit dependency library from v2.x to v3.x for ReactiveDomain.Transport.Tests class library.

Author: dealproc

src/ReactiveDomain.Transport.Tests/ReactiveDomain.Transport.Tests.csproj

@@ -5,16 +5,8 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.9.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.v3" Version="1.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>

src/ReactiveDomain.Transport.Tests/TcpBusClientSideTests.cs

@@ -1,15 +1,13 @@
-using System;
+using Newtonsoft.Json;
+using ReactiveDomain.Messaging;
+using ReactiveDomain.Messaging.Bus;
+using ReactiveDomain.Testing;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using ReactiveDomain.Messaging;
-using ReactiveDomain.Messaging.Bus;
-using ReactiveDomain.Testing;
-using ReactiveDomain.Transport.Serialization;
 using Xunit;
 
 namespace ReactiveDomain.Transport.Tests
@@ -77,7 +75,7 @@ public TcpBusClientSideTests()
         }
 
         [Fact]
-        public void can_send_command()
+        public async Task can_send_command()
         {
             var handler = new WoftamCommandHandler(_longProp);
             _subscriptions.Add(_localBus.Subscribe(handler));
@@ -86,13 +84,12 @@ public void can_send_command()
             _tcpBusClientSide.Handle(MessageBuilder.New(() => new WoftamCommand(ShortProp)));
 
             // expect to receive it on the client side
-            var gotMessage = _tcs.Task.Wait(TimeSpan.FromMilliseconds(1000));
-            Assert.True(gotMessage);
-            Assert.IsType<Success>(_tcs.Task.Result);
+            var result = await _tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(1000), TestContext.Current.CancellationToken);
+            Assert.IsType<Success>(result);
         }
 
         [Fact]
-        public void can_handle_split_frames() // Also tests custom deserializer
+        public async Task can_handle_split_frames() // Also tests custom deserializer
         {
             var handler = new WoftamCommandHandler(_longProp) { ReturnCustomResponse = true };
             _subscriptions.Add(_localBus.Subscribe(handler));
@@ -103,9 +100,8 @@ public void can_handle_split_frames() // Also tests custom deserializer
             _tcpBusClientSide.Handle(MessageBuilder.New(() => new WoftamCommand(ShortProp)));
 
             // expect to receive it on the client side
-            var gotMessage = _tcs.Task.Wait(TimeSpan.FromMilliseconds(1000));
-            Assert.True(gotMessage);
-            var response = Assert.IsType<WoftamCommandResponse>(_tcs.Task.Result);
+            var result = await _tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(1000), TestContext.Current.CancellationToken);
+            var response = Assert.IsType<WoftamCommandResponse>(result);
             Assert.Equal(_longProp, response.PropertyA);
         }
 

src/ReactiveDomain.Transport.Tests/TcpBusServerSideTests.cs

@@ -1,11 +1,10 @@
-using System;
+using ReactiveDomain.Messaging;
+using ReactiveDomain.Messaging.Bus;
+using ReactiveDomain.Testing;
+using System;
 using System.Linq;
 using System.Net;
-using System.Threading;
 using System.Threading.Tasks;
-using ReactiveDomain.Messaging;
-using ReactiveDomain.Messaging.Bus;
-using ReactiveDomain.Testing;
 using Xunit;
 
 namespace ReactiveDomain.Transport.Tests
@@ -23,7 +22,7 @@ public class TcpBusServerSideTests
         private readonly TaskCompletionSource<IMessage> _tcs = new TaskCompletionSource<IMessage>();
 
         [Fact]
-        public void can_handle_split_frames()
+        public async Task can_handle_split_frames()
         {
             // 16kb large enough to cause the transport to split up the frame.
             // it would be better if we did the splitting manually so we were sure it really happened.
@@ -56,8 +55,7 @@ public void can_handle_split_frames()
             tcpBusClientSide.Handle(new WoftamEvent(prop1, prop2));
 
             // expect to receive it in the server
-            var gotMessage = _tcs.Task.Wait(TimeSpan.FromMilliseconds(1000));
-            Assert.True(gotMessage);
+            await _tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(1000), TestContext.Current.CancellationToken);
             var evt = Assert.IsType<WoftamEvent>(_tcs.Task.Result);
             Assert.Equal(prop1, evt.Property1);
             Assert.Equal(prop2, evt.Property2);
@@ -67,7 +65,7 @@ public void can_handle_split_frames()
         }
 
         [Fact]
-        public void can_filter_out_message_types()
+        public async Task can_filter_out_message_types()
         {
             // server side
             var serverInbound = new QueuedHandler(
@@ -94,8 +92,7 @@ public void can_filter_out_message_types()
             tcpBusClientSide.Handle(new WoftamCommand("abc"));
 
             // expect to receive it in the server but drop it on the floor
-            var gotMessage = _tcs.Task.Wait(TimeSpan.FromMilliseconds(1000));
-            Assert.False(gotMessage);
+            _ = await Assert.ThrowsAsync<TimeoutException>(async () => await _tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(1000), TestContext.Current.CancellationToken));
 
             tcpBusClientSide.Dispose();
             tcpBusServerSide.Dispose();