xunit v3 preparation

src/Polly/Bulkhead/BulkheadEngine.cs

@@ -1,4 +1,5 @@
 #nullable enable
+
 namespace Polly.Bulkhead;
 
 internal static class BulkheadEngine
@@ -26,12 +27,25 @@ internal static TResult Implementation<TResult>(
             }
             finally
             {
-                maxParallelizationSemaphore.Release();
+                SafeRelease(maxParallelizationSemaphore);
             }
         }
         finally
         {
-            maxQueuedActionsSemaphore.Release();
+            SafeRelease(maxQueuedActionsSemaphore);
+        }
+
+        [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+        static void SafeRelease(SemaphoreSlim semaphore)
+        {
+            try
+            {
+                semaphore.Release();
+            }
+            catch (ObjectDisposedException)
+            {
+                // Ignore - this can happen if the caller disposed the semaphore
+            }
         }
     }
 }

test/Polly.Core.Tests/CircuitBreaker/CircuitBreakerManualControlTests.cs

@@ -29,7 +29,7 @@ public void Ctor_Isolated(bool isolated)
     [Theory]
     public async Task IsolateAsync_NotInitialized_Ok(bool closedAfter)
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var control = new CircuitBreakerManualControl();
         await control.IsolateAsync(cancellationToken);
         if (closedAfter)
@@ -56,14 +56,14 @@ public async Task ResetAsync_NotInitialized_Ok()
     {
         var control = new CircuitBreakerManualControl();
 
-        await Should.NotThrowAsync(() => control.CloseAsync());
+        await Should.NotThrowAsync(() => control.CloseAsync(TestCancellation.Token));
     }
 
     [Fact]
     public async Task Initialize_Twice_Ok()
     {
         int called = 0;
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var control = new CircuitBreakerManualControl();
         control.Initialize(_ => Task.CompletedTask, _ => Task.CompletedTask);
         control.Initialize(_ => { called++; return Task.CompletedTask; }, _ => { called++; return Task.CompletedTask; });
@@ -78,7 +78,7 @@ public async Task Initialize_Twice_Ok()
     public async Task Initialize_DisposeRegistration_ShuldBeCancelled()
     {
         int called = 0;
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var control = new CircuitBreakerManualControl();
         var reg = control.Initialize(_ => { called++; return Task.CompletedTask; }, _ => { called++; return Task.CompletedTask; });
 
@@ -96,7 +96,7 @@ public async Task Initialize_DisposeRegistration_ShuldBeCancelled()
     [Fact]
     public async Task Initialize_Ok()
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var control = new CircuitBreakerManualControl();
         var isolateCalled = false;
         var resetCalled = false;

test/Polly.Core.Tests/CircuitBreaker/CircuitBreakerOptionsTests.cs

@@ -10,7 +10,7 @@ public class CircuitBreakerOptionsTests
     public async Task ShouldHandle_EnsureDefaults()
     {
         var options = new CircuitBreakerStrategyOptions();
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
 
         (await options.ShouldHandle(new CircuitBreakerPredicateArguments<object>(context, Outcome.FromResult<object>("dummy")))).ShouldBe(false);
         (await options.ShouldHandle(new CircuitBreakerPredicateArguments<object>(context, Outcome.FromException<object>(new OperationCanceledException())))).ShouldBe(false);

test/Polly.Core.Tests/CircuitBreaker/CircuitBreakerPredicateArgumentsTests.cs

@@ -8,7 +8,7 @@ public static class CircuitBreakerPredicateArgumentsTests
     public static void Ctor_Ok()
     {
         var args = new CircuitBreakerPredicateArguments<int>(
-            ResilienceContextPool.Shared.Get(CancellationToken.None),
+            ResilienceContextPool.Shared.Get(TestCancellation.Token),
             Outcome.FromResult(1));
 
         args.Context.ShouldNotBeNull();

test/Polly.Core.Tests/CircuitBreaker/CircuitBreakerResiliencePipelineBuilderTests.cs

@@ -57,7 +57,7 @@ public void AddCircuitBreaker_Validation()
     [Fact]
     public void AddCircuitBreaker_IntegrationTest()
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         int opened = 0;
         int closed = 0;
         int halfOpened = 0;
@@ -120,7 +120,7 @@ public void AddCircuitBreaker_IntegrationTest()
     [Fact]
     public void AddCircuitBreaker_IntegrationTest_WithBreakDurationGenerator()
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         int opened = 0;
         int closed = 0;
         int halfOpened = 0;
@@ -184,7 +184,7 @@ public void AddCircuitBreaker_IntegrationTest_WithBreakDurationGenerator()
     [Fact]
     public async Task AddCircuitBreakers_WithIsolatedManualControl_ShouldBeIsolated()
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var manualControl = new CircuitBreakerManualControl();
         await manualControl.IsolateAsync(cancellationToken);
 

test/Polly.Core.Tests/CircuitBreaker/CircuitBreakerResilienceStrategyTests.cs

@@ -30,7 +30,7 @@ public CircuitBreakerResilienceStrategyTests()
             null);
     }
 
-    private static CancellationToken CancellationToken => CancellationToken.None;
+    private static CancellationToken CancellationToken => TestCancellation.Token;
 
     [Fact]
     public void Ctor_Ok() =>

test/Polly.Core.Tests/CircuitBreaker/Controller/CircuitStateControllerTests.cs

@@ -26,7 +26,7 @@ public void Ctor_EnsureDefaults()
     public async Task IsolateAsync_Ok()
     {
         // arrange
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         bool called = false;
         _options.OnOpened = args =>
         {
@@ -69,7 +69,7 @@ public async Task IsolateAsync_Ok()
     public async Task BreakAsync_Ok()
     {
         // arrange
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         bool called = false;
         _options.OnClosed = args =>
         {
@@ -102,7 +102,7 @@ public async Task BreakAsync_Ok()
     [Fact]
     public async Task Disposed_EnsureThrows()
     {
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
 
         var controller = CreateController();
         controller.Dispose();
@@ -121,7 +121,7 @@ public async Task Disposed_EnsureThrows()
     [Fact]
     public async Task OnActionPreExecute_CircuitOpenedByValue()
     {
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
 
         await OpenCircuit(controller, Outcome.FromResult(99));
@@ -138,7 +138,7 @@ public async Task OnActionPreExecute_CircuitOpenedByValue()
     public async Task OnActionPreExecute_CircuitOpened_EnsureExceptionStackTraceDoesNotGrow(bool innerException)
     {
         var stacks = new List<string>();
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
 
         await OpenCircuit(
@@ -175,7 +175,7 @@ await OpenCircuit(
     [Fact]
     public async Task HalfOpen_EnsureBreakDuration()
     {
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
 
         await TransitionToState(controller, CircuitState.HalfOpen, context);
@@ -187,7 +187,7 @@ public async Task HalfOpen_EnsureBreakDuration()
     [Theory]
     public async Task HalfOpen_EnsureCorrectStateTransitionAfterExecution(bool success)
     {
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
 
         await TransitionToState(controller, CircuitState.HalfOpen, context);
@@ -213,7 +213,7 @@ public async Task HalfOpen_EnsureCorrectStateTransitionAfterExecution(bool succe
     [Fact]
     public async Task OnActionPreExecute_CircuitOpenedByException()
     {
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
 
         await OpenCircuit(controller, Outcome.FromException<int>(new InvalidOperationException()));
@@ -227,7 +227,7 @@ public async Task OnActionPreExecute_CircuitOpenedByException()
     public async Task OnActionFailure_EnsureLock()
     {
         // arrange
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var context = ResilienceContextPool.Shared.Get(cancellationToken);
 
         using var executing = new ManualResetEvent(false);
@@ -244,9 +244,9 @@ public async Task OnActionFailure_EnsureLock()
         using var controller = CreateController();
 
         // act
-        var executeAction = Task.Run(() => controller.OnHandledOutcomeAsync(Outcome.FromResult(0), context));
+        var executeAction = Task.Run(() => controller.OnHandledOutcomeAsync(Outcome.FromResult(0), context), cancellationToken);
         executing.WaitOne();
-        var executeAction2 = Task.Run(() => controller.OnHandledOutcomeAsync(Outcome.FromResult(0), context));
+        var executeAction2 = Task.Run(() => controller.OnHandledOutcomeAsync(Outcome.FromResult(0), context), cancellationToken);
 
         // assert
 #pragma warning disable xUnit1031 // Do not use blocking task operations in test method
@@ -261,7 +261,7 @@ public async Task OnActionFailure_EnsureLock()
     public async Task OnActionPreExecute_HalfOpen()
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         var called = false;
         _options.OnHalfOpened = _ =>
         {
@@ -293,7 +293,7 @@ public async Task OnActionPreExecute_HalfOpen()
     public async Task OnActionSuccess_EnsureCorrectBehavior(CircuitState state, CircuitState expectedState)
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         var called = false;
         _options.OnClosed = args =>
         {
@@ -329,7 +329,7 @@ public async Task OnActionSuccess_EnsureCorrectBehavior(CircuitState state, Circ
     public async Task OnActionFailureAsync_EnsureCorrectBehavior(CircuitState state, CircuitState expectedState, bool shouldBreak)
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         var called = false;
         _options.OnOpened = args =>
         {
@@ -370,7 +370,7 @@ public async Task OnActionFailureAsync_EnsureCorrectBehavior(CircuitState state,
     public async Task OnActionFailureAsync_EnsureBreakDurationGeneration()
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         _options.BreakDurationGenerator = static args =>
         {
             args.FailureCount.ShouldBe(1);
@@ -402,7 +402,7 @@ public async Task OnActionFailureAsync_EnsureBreakDurationGeneration()
     public async Task BreakDurationGenerator_EnsureHalfOpenAttempts()
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         var halfOpenAttempts = new List<int>();
 
         _options.BreakDurationGenerator = args =>
@@ -440,7 +440,7 @@ public async Task BreakDurationGenerator_EnsureHalfOpenAttempts()
     public async Task OnActionFailureAsync_EnsureBreakDurationNotOverflow(bool overflow)
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
         var shouldBreak = true;
         await TransitionToState(controller, CircuitState.HalfOpen, context);
@@ -475,7 +475,7 @@ public async Task OnActionFailureAsync_EnsureBreakDurationNotOverflow(bool overf
     public async Task OnActionFailureAsync_VoidResult_EnsureBreakingExceptionNotSet()
     {
         // arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
         bool shouldBreak = true;
         await TransitionToState(controller, CircuitState.Open, context);
@@ -497,7 +497,7 @@ public async Task OnActionFailureAsync_VoidResult_EnsureBreakingExceptionNotSet(
     [Fact]
     public async Task Flow_Closed_HalfOpen_Closed()
     {
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         using var controller = CreateController();
 
         await TransitionToState(controller, CircuitState.HalfOpen, context);
@@ -512,7 +512,7 @@ public async Task Flow_Closed_HalfOpen_Closed()
     [Fact]
     public async Task Flow_Closed_HalfOpen_Open_HalfOpen_Closed()
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var context = ResilienceContextPool.Shared.Get(cancellationToken);
 
         using var controller = CreateController();
@@ -550,7 +550,7 @@ public async Task Flow_Closed_HalfOpen_Open_HalfOpen_Closed()
     [Fact]
     public async Task ExecuteScheduledTask_Async_Ok()
     {
-        var cancellationToken = CancellationToken.None;
+        var cancellationToken = TestCancellation.Token;
         var context = ResilienceContextPool.Shared.Get(cancellationToken);
 
         var source = new TaskCompletionSource<string>();
@@ -605,7 +605,7 @@ private async Task OpenCircuit(CircuitStateController<int> controller, Outcome<i
 
         await controller.OnHandledOutcomeAsync(
             outcome ?? Outcome.FromResult(10),
-            ResilienceContextPool.Shared.Get().Initialize<int>(true));
+            ResilienceContextPool.Shared.Get(TestCancellation.Token).Initialize<int>(true));
     }
 
     private void AdvanceTime(TimeSpan timespan) => _timeProvider.Advance(timespan);

test/Polly.Core.Tests/CircuitBreaker/Controller/ScheduledTaskExecutorTests.cs

@@ -4,7 +4,7 @@ namespace Polly.Core.Tests.CircuitBreaker.Controller;
 
 public class ScheduledTaskExecutorTests
 {
-    private static CancellationToken CancellationToken => CancellationToken.None;
+    private static CancellationToken CancellationToken => TestCancellation.Token;
 
     [Fact]
     public async Task ScheduleTask_Success_EnsureExecuted()

test/Polly.Core.Tests/CircuitBreaker/OnCircuitClosedArgumentsTests.cs

@@ -8,7 +8,7 @@ public static class OnCircuitClosedArgumentsTests
     public static void Ctor_Ok()
     {
         // Arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
 
         // Act
         var args = new OnCircuitClosedArguments<int>(context, Outcome.FromResult(1), true);

test/Polly.Core.Tests/CircuitBreaker/OnCircuitHalfOpenedArgumentsTests.cs

@@ -8,7 +8,7 @@ public static class OnCircuitHalfOpenedArgumentsTests
     public static void Ctor_Ok()
     {
         // Arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
 
         // Act
         var target = new OnCircuitHalfOpenedArguments(context);

test/Polly.Core.Tests/CircuitBreaker/OnCircuitOpenedArgumentsTests.cs

@@ -8,7 +8,7 @@ public static class OnCircuitOpenedArgumentsTests
     public static void Ctor_Ok()
     {
         // Arrange
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
 
         // Act
         var args = new OnCircuitOpenedArguments<int>(context, Outcome.FromResult(1), TimeSpan.FromSeconds(2), true);

test/Polly.Core.Tests/Fallback/FallbackHandlerTests.cs

@@ -7,7 +7,7 @@ public class FallbackHandlerTests
     public async Task GenerateAction_Generic_Ok()
     {
         var handler = FallbackHelper.CreateHandler(_ => true, () => Outcome.FromResult("secondary"));
-        var context = ResilienceContextPool.Shared.Get();
+        var context = ResilienceContextPool.Shared.Get(TestCancellation.Token);
         var outcome = await handler.ActionGenerator(new FallbackActionArguments<string>(context, Outcome.FromResult("primary")))!;
 
         outcome.Result.ShouldBe("secondary");