Skip to content

Commit 5a8d66a

Browse files
dealprocRichard Bennett
authored andcommitted
Changes xunit dependency library from v2.x to v3.x for ReactiveDomain.Messaging.Tests class library.
1 parent 4ab936d commit 5a8d66a

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

src/ReactiveDomain.Messaging.Tests/LaterServiceTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void DelayPublishLoadTest() {
120120
delay.Handle(new DelaySendEnvelope(timeSource, TimeSpan.FromMilliseconds(50), new TestMessage()));
121121
}
122122
timeSource.AdvanceTime(50);
123-
cd.Wait(1000);
123+
cd.Wait(1000, TestContext.Current.CancellationToken);
124124
}
125125
Assert.True(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - start <= 15000, $"elapsed {DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - start}");
126126
}
@@ -135,7 +135,7 @@ public void DelayPublishLoadTestSystemTime() {
135135
for (int i = 0; i < iterations; i++) {
136136
delay.Handle(new DelaySendEnvelope(TimeSource.System, TimeSpan.FromMilliseconds(50), new TestMessage()));
137137
}
138-
cd.Wait(1000);
138+
cd.Wait(1000, TestContext.Current.CancellationToken);
139139
}
140140
Assert.True(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - start <= 15000, $"elapsed {DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - start}");
141141
}

src/ReactiveDomain.Messaging.Tests/ReactiveDomain.Messaging.Tests.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,8 @@
1010
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1111
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3-beta1" />
1212
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
13-
<PackageReference Include="xunit" Version="2.9.2" />
1413
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15-
<PackageReference Include="xunit.runner.console" Version="2.9.2">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
14+
<PackageReference Include="xunit.v3" Version="1.1.0" />
2315
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
2416
</ItemGroup>
2517
<ItemGroup>

src/ReactiveDomain.Messaging.Tests/when_sending_commands_via_single_queued_dispatcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public when_sending_commands_via_single_queued_dispatcher() {
3131

3232
[Fact]
3333
public void send_cmd_msg_sequence_is_correct() {
34-
var t1 = Task.Run(() => _dispatcher.Send(new TestCommands.Command1()));
34+
var t1 = Task.Run(() => _dispatcher.Send(new TestCommands.Command1()), TestContext.Current.CancellationToken);
3535
AssertEx.EnsureRunning(t1);
3636
AssertEx.IsOrBecomesTrue(() => Interlocked.Read(ref _gotAck) == 1);
3737
Assert.True(_commandHandleStarted == 0);

src/ReactiveDomain.Messaging.Tests/when_sending_remote_handled_commands.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void can_cancel_commands_from_either_bus() {
4242
{
4343
var ts1 = new CancellationTokenSource();
4444
CommandResponse response1 = null;
45-
var t1 = Task.Run(()=> Assert.False(_fixture.LocalBus.TrySend(new TestCommands.RemoteCancel(ts1.Token), out response1)));
45+
var t1 = Task.Run(()=> Assert.False(_fixture.LocalBus.TrySend(new TestCommands.RemoteCancel(ts1.Token), out response1)), TestContext.Current.CancellationToken);
4646
ts1.Cancel();
4747

4848
var ts2 = new CancellationTokenSource();
4949
CommandResponse response2 = null;
50-
var t2 = Task.Run(() => Assert.False(_fixture.RemoteBus.TrySend(new TestCommands.RemoteCancel(ts2.Token), out response2)));
50+
var t2 = Task.Run(() => Assert.False(_fixture.RemoteBus.TrySend(new TestCommands.RemoteCancel(ts2.Token), out response2)), TestContext.Current.CancellationToken);
5151
ts2.Cancel();
5252

5353
AssertEx.EnsureComplete(t1, t2);

0 commit comments

Comments
 (0)