Skip to content

Switch to xunit v3 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrikwidlund merged 1 commit into from
Nov 3, 2025
Merged

Switch to xunit v3 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/Dns.Tests/Dns.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
<PackageReference Include="coverlet.msbuild" Version="6.0.4" PrivateAssets="all" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="SimpleBase" Version="5.5.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="xunit.v3" Version="3.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/Mdns.Tests/Mdns.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="coverlet.msbuild" Version="6.0.4" PrivateAssets="all" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="xunit.v3" Version="3.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions tests/Mdns.Tests/MulticastServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ public async Task DuplicateResponse()
mdns.NetworkInterfaceDiscovered += async _ =>
{
await mdns.SendQuery(service);
await Task.Delay(250);
await Task.Delay(250, TestContext.Current.CancellationToken);
await mdns.SendQuery(service);
};

Expand Down Expand Up @@ -635,7 +635,7 @@ public async Task DuplicateResponse()
};

await mdns.Start(CancellationToken.None);
await Task.Delay(1000);
await Task.Delay(1000, TestContext.Current.CancellationToken);

answerCount.ShouldBe(1);
}
Expand All @@ -650,7 +650,7 @@ public async Task NoDuplicateResponse()
mdns.NetworkInterfaceDiscovered += async _ =>
{
await mdns.SendQuery(service);
await Task.Delay(250);
await Task.Delay(250, TestContext.Current.CancellationToken);
await mdns.SendQuery(service);
};

Expand Down Expand Up @@ -680,11 +680,11 @@ public async Task NoDuplicateResponse()
};

await mdns.Start(CancellationToken.None);
await Task.Delay(2000);
await Task.Delay(2000, TestContext.Current.CancellationToken);
answerCount.ShouldBe(1);

await mdns.SendQuery(service);
await Task.Delay(2000);
await Task.Delay(2000, TestContext.Current.CancellationToken);
answerCount.ShouldBe(2);
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Mdns.Tests/RecentMessagesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public async Task DuplicateCheck()
r.TryAdd(b).ShouldBeTrue();
r.TryAdd(a).ShouldBeFalse();

await Task.Delay(200);
await Task.Delay(200, TestContext.Current.CancellationToken);
r.TryAdd(a).ShouldBeTrue();
}
}
47 changes: 23 additions & 24 deletions tests/Mdns.Tests/ServiceDiscoveryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Makaretu.Dns;
using Shouldly;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;

namespace Makaretu.Mdns;
Expand All @@ -19,11 +18,11 @@ public class ServiceDiscoveryTest(ITestOutputHelper testOutputHelper)
[Fact]
public async Task Disposable()
{
using (var sd = await ServiceDiscovery.CreateInstance())
using (var sd = await ServiceDiscovery.CreateInstance(cancellationToken: TestContext.Current.CancellationToken))
sd.ShouldNotBeNull();

var mdns = new MulticastService();
using (var sd = await ServiceDiscovery.CreateInstance(mdns))
using (var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken))
sd.ShouldNotBeNull();
}

Expand Down Expand Up @@ -51,7 +50,7 @@ public async Task Advertises_Service()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await mdns.Start(CancellationToken.None);

Expand Down Expand Up @@ -87,7 +86,7 @@ public async Task Advertises_SharedService()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await mdns.Start(CancellationToken.None);

Expand All @@ -106,7 +105,7 @@ public async Task Probe_Service()
var done = new ManualResetEvent(false);

using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
mdns.NetworkInterfaceDiscovered += async _ =>
{
if (await sd.Probe(service))
Expand All @@ -131,12 +130,12 @@ public async Task Probe_Service2()
{
var service = new ServiceProfile("z", "_sdtest-11._udp", 1024, [IPAddress.Loopback]);

using var sd = await ServiceDiscovery.CreateInstance();
using var sd = await ServiceDiscovery.CreateInstance(cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await sd.Mdns!.Start(CancellationToken.None);

var mdns = new MulticastService();
using var sd2 = await ServiceDiscovery.CreateInstance(mdns);
using var sd2 = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
mdns.NetworkInterfaceDiscovered += async _ =>
{
(await sd2.Probe(service)).ShouldBeTrue();
Expand All @@ -158,7 +157,7 @@ public async Task Probe_Service3()
var service = new ServiceProfile("z", "_sdtest-11._udp", 1024, [IPAddress.Loopback]);

var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
mdns.NetworkInterfaceDiscovered += async _ =>
{
(await sd.Probe(service)).ShouldBeFalse();
Expand Down Expand Up @@ -193,7 +192,7 @@ public async Task Advertises_ServiceInstances()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await mdns.Start(CancellationToken.None);

Expand Down Expand Up @@ -223,7 +222,7 @@ public async Task Advertises_ServiceInstance_Address()
};
try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await mdns.Start(CancellationToken.None);

Expand Down Expand Up @@ -255,7 +254,7 @@ public async Task Advertises_ServiceInstance_Subtype()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await mdns.Start(CancellationToken.None);

Expand All @@ -273,7 +272,7 @@ public async Task Discover_AllServices()
var service = new ServiceProfile("x", "_sdtest-2._udp", 1024);
var done = new ManualResetEvent(false);
using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);

mdns.NetworkInterfaceDiscovered += _ => sd.QueryAllServices();
sd.ServiceDiscovered += serviceName =>
Expand Down Expand Up @@ -303,7 +302,7 @@ public async Task Discover_AllServices_Unicast()
var service = new ServiceProfile("x", "_sdtest-5._udp", 1024);
var done = new ManualResetEvent(false);
using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);

mdns.NetworkInterfaceDiscovered += _ => sd.QueryUnicastAllServices();
sd.ServiceDiscovered += serviceName =>
Expand Down Expand Up @@ -332,7 +331,7 @@ public async Task Discover_ServiceInstance()
var service = new ServiceProfile("y", "_sdtest-2._udp", 1024);
var done = new ManualResetEvent(false);
using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);

mdns.NetworkInterfaceDiscovered += async _ =>
{
Expand Down Expand Up @@ -371,7 +370,7 @@ public async Task Discover_ServiceInstance_with_Subtype()
service2.Subtypes.Add("apiv2");
var done = new ManualResetEvent(false);
using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);

mdns.NetworkInterfaceDiscovered += async _ =>
{
Expand Down Expand Up @@ -409,7 +408,7 @@ public async Task Discover_ServiceInstance_Unicast()
var service = new ServiceProfile("y", "_sdtest-5._udp", 1024);
var done = new ManualResetEvent(false);
using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);

mdns.NetworkInterfaceDiscovered += async _ =>
{
Expand Down Expand Up @@ -447,7 +446,7 @@ public async Task Discover_ServiceInstance_WithAnswersContainingAdditionRecords(
var done = new ManualResetEvent(false);

using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.AnswersContainsAdditionalRecords = true;

Message discovered = null;
Expand Down Expand Up @@ -492,7 +491,7 @@ public async Task Unadvertise()
var service = new ServiceProfile("z", "_sdtest-7._udp", 1024);
var done = new ManualResetEvent(false);
using var mdns = new MulticastService();
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);

mdns.NetworkInterfaceDiscovered += _ => sd.QueryAllServices();
sd.ServiceInstanceShutdown += e =>
Expand Down Expand Up @@ -540,7 +539,7 @@ public async Task ReverseAddressMapping()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(service);
await mdns.Start(CancellationToken.None);

Expand Down Expand Up @@ -570,7 +569,7 @@ public async Task ResourceRecords()
profile.Subtypes.Add("apiv2");
profile.AddProperty("someprop", "somevalue");

using var sd = await ServiceDiscovery.CreateInstance();
using var sd = await ServiceDiscovery.CreateInstance(cancellationToken: TestContext.Current.CancellationToken);
sd.Advertise(profile);

sd.NameServer.Catalog.ShouldNotBeNull();
Expand Down Expand Up @@ -598,7 +597,7 @@ public async Task Announce_ContainsSharedRecords()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
mdns.NetworkInterfaceDiscovered += async _ =>
{
(await sd.Probe(service)).ShouldBeFalse();
Expand Down Expand Up @@ -641,7 +640,7 @@ public async Task Announce_ContainsResourceRecords()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
mdns.NetworkInterfaceDiscovered += async _ =>
{
(await sd.Probe(service)).ShouldBeFalse();
Expand Down Expand Up @@ -682,7 +681,7 @@ public async Task Announce_SentThrice()

try
{
using var sd = await ServiceDiscovery.CreateInstance(mdns);
using var sd = await ServiceDiscovery.CreateInstance(mdns, cancellationToken: TestContext.Current.CancellationToken);
mdns.NetworkInterfaceDiscovered += async _ =>
{
(await sd.Probe(service)).ShouldBeFalse();
Expand Down
Loading