Update to xunit v3

tinglesoftware · Dec 25, 2024 · a5be85c · a5be85c
1 parent 963a319
commit a5be85c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,6 +11,7 @@
 
   <PropertyGroup>
     <WarningsAsErrors>$(WarningsAsErrors),IL2026,IL2060,IL2091,IL2095,IL3050</WarningsAsErrors>
+    <WarningsAsErrors>$(WarningsAsErrors),xUnit1051</WarningsAsErrors>
   </PropertyGroup>
 
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -10,14 +10,13 @@
 
   <ItemGroup>
     <Using Include="Xunit" />
-    <Using Include="Xunit.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.5.0" />
+    <PackageReference Include="MartinCostello.Logging.XUnit.v3" Version="0.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" />
+    <PackageReference Include="xunit.v3" Version="1.0.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 

diff --git a/tests/Tingle.PeriodicTasks.AspNetCore.Tests/EndpointRouteBuilderExtensionsTests.cs b/tests/Tingle.PeriodicTasks.AspNetCore.Tests/EndpointRouteBuilderExtensionsTests.cs
@@ -49,7 +49,7 @@ public async Task IgnoresRequestThatDoesNotMatchPath()
         using var server = new TestServer(builder);
         var client = server.CreateClient();
 
-        var response = await client.GetAsync("/frob");
+        var response = await client.GetAsync("/frob", TestContext.Current.CancellationToken);
         Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
     }
 
@@ -74,11 +74,11 @@ public async Task MatchIsCaseInsensitive()
         using var server = new TestServer(builder);
         var client = server.CreateClient();
 
-        var response = await client.GetAsync("/PERIODIC-tasks/registrations");
+        var response = await client.GetAsync("/PERIODIC-tasks/registrations", TestContext.Current.CancellationToken);
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         Assert.Equal("application/json; charset=utf-8", response.Content.Headers.ContentType!.ToString());
         Assert.NotEqual(0, response.Content.Headers.ContentLength);
-        Assert.Equal("[]", await response.Content.ReadAsStringAsync());
+        Assert.Equal("[]", await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken));
     }
 
     [Fact]
@@ -106,7 +106,7 @@ public async Task ListingWorks()
         using var server = new TestServer(builder);
         var client = server.CreateClient();
 
-        var response = await client.GetFromJsonAsync<PeriodicTaskRegistration[]>("/periodic-tasks/registrations");
+        var response = await client.GetFromJsonAsync<PeriodicTaskRegistration[]>("/periodic-tasks/registrations", TestContext.Current.CancellationToken);
         Assert.NotNull(response);
         var actual = Assert.Single(response);
         Assert.Equal(registration, actual);
@@ -137,7 +137,7 @@ public async Task GetWorks()
         using var server = new TestServer(builder);
         var client = server.CreateClient();
 
-        var actual = await client.GetFromJsonAsync<PeriodicTaskRegistration>("/periodic-tasks/registrations/dummy");
+        var actual = await client.GetFromJsonAsync<PeriodicTaskRegistration>("/periodic-tasks/registrations/dummy", TestContext.Current.CancellationToken);
         Assert.NotNull(actual);
         Assert.Equal(registration, actual);
     }
@@ -167,7 +167,7 @@ public async Task GetHistoryWorks()
         using var server = new TestServer(builder);
         var client = server.CreateClient();
 
-        var response = await client.GetFromJsonAsync<PeriodicTaskExecutionAttempt[]>("/periodic-tasks/registrations/dummy/history");
+        var response = await client.GetFromJsonAsync<PeriodicTaskExecutionAttempt[]>("/periodic-tasks/registrations/dummy/history", TestContext.Current.CancellationToken);
         Assert.NotNull(response);
         Assert.Empty(response);
     }
@@ -203,13 +203,13 @@ public async Task ExecuteWorks()
 
         var client = server.CreateClient();
         var content = new StringContent("{\"name\":\"dummy\",\"wait\":true}", Encoding.UTF8, "application/json");
-        var response = await client.PostAsync("/periodic-tasks/execute", content);
-        var attempt = await response.Content.ReadFromJsonAsync<PeriodicTaskExecutionAttempt>();
+        var response = await client.PostAsync("/periodic-tasks/execute", content, TestContext.Current.CancellationToken);
+        var attempt = await response.Content.ReadFromJsonAsync<PeriodicTaskExecutionAttempt>(TestContext.Current.CancellationToken);
         Assert.NotNull(attempt);
         Assert.Equal("dummy", attempt.Name);
         Assert.NotEqual(0, response.Content.Headers.ContentLength);
 
-        attempt = Assert.Single(await attemptsStore.GetAttemptsAsync());
+        attempt = Assert.Single(await attemptsStore.GetAttemptsAsync(cancellationToken: TestContext.Current.CancellationToken));
         Assert.Equal("dummy", attempt.Name);
         Assert.True(attempt.Successful);
     }

diff --git a/tests/Tingle.PeriodicTasks.EventBus.Tests/TriggerPeriodicTaskEventConsumerTests.cs b/tests/Tingle.PeriodicTasks.EventBus.Tests/TriggerPeriodicTaskEventConsumerTests.cs
@@ -39,7 +39,7 @@ public async Task ConsumeAsyncWorks()
         var publisher = provider.GetRequiredService<IEventPublisher>();
         var harness = provider.GetRequiredService<InMemoryTestHarness>();
 
-        await harness.StartAsync();
+        await harness.StartAsync(TestContext.Current.CancellationToken);
         try
         {
             var evt = new TriggerPeriodicTaskEvent
@@ -49,20 +49,20 @@ public async Task ConsumeAsyncWorks()
                 Wait = true,
             };
 
-            await publisher.PublishAsync(evt);
+            await publisher.PublishAsync(evt, cancellationToken: TestContext.Current.CancellationToken);
 
-            Assert.Empty(await harness.FailedAsync(TimeSpan.FromSeconds(3)));
+            Assert.Empty(await harness.FailedAsync(TimeSpan.FromSeconds(3), TestContext.Current.CancellationToken));
 
             var evt_ctx_con = Assert.IsType<EventContext<TriggerPeriodicTaskEvent>>(Assert.Single(harness.Consumed()));
             Assert.Equal(evt.Name, evt_ctx_con.Event.Name);
 
-            var attempt = Assert.Single(await attemptsStore.GetAttemptsAsync());
+            var attempt = Assert.Single(await attemptsStore.GetAttemptsAsync(cancellationToken: TestContext.Current.CancellationToken));
             Assert.Equal(evt.Name, attempt.Name);
             Assert.True(attempt.Successful);
         }
         finally
         {
-            await harness.StopAsync();
+            await harness.StopAsync(TestContext.Current.CancellationToken);
         }
     }
 

diff --git a/tests/Tingle.PeriodicTasks.Tests/CronScheduleTimerTests.cs b/tests/Tingle.PeriodicTasks.Tests/CronScheduleTimerTests.cs
@@ -12,8 +12,8 @@ public async Task CronScheduleTimer_Works()
             Interlocked.Increment(ref invocations);
             await t.StopAsync(ct);
         });
-        await timer.StartAsync();
-        await Task.Delay(TimeSpan.FromSeconds(7));
+        await timer.StartAsync(TestContext.Current.CancellationToken);
+        await Task.Delay(TimeSpan.FromSeconds(7), TestContext.Current.CancellationToken);
         Assert.Equal(1, invocations);
     }
 }