Add TestCancellationToken to v2 and v3 TestWithLoggingBase

Both versions now implement IAsyncLifetime with per-test cancellation. v2 uses a standalone CTS; v3 links to TestContext.Current.CancellationToken. QueueTestBase updated to override base DisposeAsync.

Author: niemyjski

src/Foundatio.TestHarness/Queue/QueueTestBase.cs

@@ -1815,8 +1815,10 @@ await queue.StartWorkingAsync(async item =>
         }
     }
 
-    public async ValueTask DisposeAsync()
+    public override async ValueTask DisposeAsync()
     {
+        await base.DisposeAsync();
+
         using var queue = GetQueue();
         if (queue is null)
             return;

src/Foundatio.Xunit.v3/Logging/TestWithLoggingBase.cs

@@ -1,11 +1,14 @@
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
 namespace Foundatio.Xunit;
 
-public abstract class TestWithLoggingBase
+public abstract class TestWithLoggingBase : IAsyncLifetime
 {
+    private readonly CancellationTokenSource _testCancellationTokenSource =
+        CancellationTokenSource.CreateLinkedTokenSource(TestContext.Current.CancellationToken);
     protected readonly ILogger _logger;
 
     protected TestWithLoggingBase(ITestOutputHelper output)
@@ -17,7 +20,29 @@ protected TestWithLoggingBase(ITestOutputHelper output)
     protected TestLogger Log { get; }
 
     /// <summary>
-    /// Gets the cancellation token for the current test. This token is automatically cancelled when the test times out.
+    /// Gets a cancellation token that is cancelled when the current test completes or
+    /// when the test run is aborted/timed out. Pass this token to
+    /// <see cref="Foundatio.Messaging.IMessageSubscriber.SubscribeAsync{T}"/>
+    /// and other async operations to ensure automatic cleanup between tests.
     /// </summary>
-    protected static CancellationToken TestCancellationToken => TestContext.Current.CancellationToken;
+    /// <remarks>
+    /// <para>
+    /// This token is linked to <c>TestContext.Current.CancellationToken</c>, so it triggers on
+    /// both per-test disposal (via <see cref="DisposeAsync"/>) and run-level abort or timeout.
+    /// xUnit creates a new class instance per <c>[Fact]</c>, so each test gets a fresh linked token.
+    /// </para>
+    /// </remarks>
+    protected CancellationToken TestCancellationToken => _testCancellationTokenSource.Token;
+
+    public virtual ValueTask InitializeAsync()
+    {
+        return ValueTask.CompletedTask;
+    }
+
+    public virtual ValueTask DisposeAsync()
+    {
+        _testCancellationTokenSource.Cancel();
+        _testCancellationTokenSource.Dispose();
+        return ValueTask.CompletedTask;
+    }
 }

src/Foundatio.Xunit/Logging/TestWithLoggingBase.cs

@@ -1,10 +1,14 @@
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace Foundatio.Xunit;
 
-public abstract class TestWithLoggingBase
+public abstract class TestWithLoggingBase : IAsyncLifetime
 {
+    private readonly CancellationTokenSource _testCancellationTokenSource = new();
     protected readonly ILogger _logger;
 
     protected TestWithLoggingBase(ITestOutputHelper output)
@@ -14,4 +18,33 @@ protected TestWithLoggingBase(ITestOutputHelper output)
     }
 
     protected TestLogger Log { get; }
+
+    /// <summary>
+    /// Gets a cancellation token that is cancelled when the current test completes.
+    /// Pass this token to <see cref="Foundatio.Messaging.IMessageSubscriber.SubscribeAsync{T}"/>
+    /// and other async operations to ensure automatic cleanup between tests.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This token is cancelled in <see cref="DisposeAsync"/> after each test.
+    /// xUnit creates a new class instance per <c>[Fact]</c>, so each test gets a fresh token.
+    /// </para>
+    /// <para>
+    /// In Foundatio.Xunit.v3, this property uses a linked token source that also
+    /// respects <c>TestContext.Current.CancellationToken</c> for run-level abort and timeout.
+    /// </para>
+    /// </remarks>
+    protected CancellationToken TestCancellationToken => _testCancellationTokenSource.Token;
+
+    public virtual Task InitializeAsync()
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task DisposeAsync()
+    {
+        _testCancellationTokenSource.Cancel();
+        _testCancellationTokenSource.Dispose();
+        return Task.CompletedTask;
+    }
 }