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

Author: dealproc

src/ReactiveDomain.Testing/EventStore/StreamReaderTests.cs

@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 // ReSharper disable UnusedParameter.Local
 

src/ReactiveDomain.Testing/ReactiveDomain.Testing.csproj

@@ -11,16 +11,8 @@
     <None Remove="Domain\**" />
   </ItemGroup>
   <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.Testing/Specifications/TestQueueTests.cs

@@ -1,9 +1,6 @@
-
-
-using ReactiveDomain.Messaging;
+using ReactiveDomain.Messaging;
 using ReactiveDomain.Messaging.Bus;
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -133,8 +130,8 @@ public void waiting_for_message_throws_on_clear()
         {
             using (var tq = new TestQueue(_dispatcher, new[] { typeof(Event), typeof(Command) }))
             {
-                Task.Run(() => Assert.Throws<InvalidOperationException>(() => tq.WaitFor<TestEvent>(TimeSpan.FromMilliseconds(100))))
-                    .ContinueWith(t => tq.Clear());
+                Task.Run(() => Assert.Throws<InvalidOperationException>(() => tq.WaitFor<TestEvent>(TimeSpan.FromMilliseconds(100))), TestContext.Current.CancellationToken)
+                    .ContinueWith(t => tq.Clear(), TestContext.Current.CancellationToken);
                 tq.AssertEmpty();
             }
         }
@@ -143,8 +140,8 @@ public void waiting_for_id_throws_on_clear()
         {
             using (var tq = new TestQueue(_dispatcher, new[] { typeof(Event), typeof(Command) }))
             {
-                Task.Run(() => Assert.Throws<InvalidOperationException>(() => tq.WaitForMsgId(Guid.NewGuid(), TimeSpan.FromMilliseconds(100))))
-                    .ContinueWith(t => tq.Clear());
+                Task.Run(() => Assert.Throws<InvalidOperationException>(() => tq.WaitForMsgId(Guid.NewGuid(), TimeSpan.FromMilliseconds(100))), TestContext.Current.CancellationToken)
+                    .ContinueWith(t => tq.Clear(), TestContext.Current.CancellationToken);
                 tq.AssertEmpty();
             }
         }
@@ -157,8 +154,8 @@ public void can_wait_for_a_specific_message()
                 var evt = new TestEvent();
                 var evt2 = new TestEvent();
                 //before
-                var t1 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(1000)));
-                var t2 = Task.Run(() => tq.WaitForMsgId(evt2.MsgId, TimeSpan.FromMilliseconds(1000)));
+                var t1 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(1000)), TestContext.Current.CancellationToken);
+                var t2 = Task.Run(() => tq.WaitForMsgId(evt2.MsgId, TimeSpan.FromMilliseconds(1000)), TestContext.Current.CancellationToken);
                 AssertEx.EnsureRunning(t1,t2);
 
                 _dispatcher.Publish(evt);
@@ -179,8 +176,8 @@ public void can_wait_for_a_specific_message_twice()
             using (var tq = new TestQueue(_dispatcher))
             {
                 var evt = new TestEvent();
-                var t1 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(1000)));
-                var t2 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(1000)));
+                var t1 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(1000)), TestContext.Current.CancellationToken);
+                var t2 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(1000)), TestContext.Current.CancellationToken);
 
                 tq.Handle(evt);
                 tq.AssertNext<TestEvent>(evt.CorrelationId)
@@ -214,8 +211,8 @@ public void can_wait_for_multiple_messages_not_yet_received()
                 var evt = new TestEvent();
                 var evt2 = new TestEvent();
 
-                var t1 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(200)));
-                var t2 = Task.Run(() => tq.WaitForMsgId(evt2.MsgId, TimeSpan.FromMilliseconds(200)));
+                var t1 = Task.Run(() => tq.WaitForMsgId(evt.MsgId, TimeSpan.FromMilliseconds(200)), TestContext.Current.CancellationToken);
+                var t2 = Task.Run(() => tq.WaitForMsgId(evt2.MsgId, TimeSpan.FromMilliseconds(200)), TestContext.Current.CancellationToken);
 
                 _dispatcher.Publish(evt);
                 _dispatcher.Publish(evt2);