Skip to content

Tidy-up Polly.Specs #1950

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
martincostello merged 3 commits into from
Feb 4, 2024
Merged

Tidy-up Polly.Specs #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7216704
Use var
martincostello Feb 4, 2024
7c848d0
Use using var
martincostello Feb 4, 2024
7237790
Remove redundant qualifiers
martincostello Feb 4, 2024
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
13 changes: 4 additions & 9 deletions test/Polly.Specs/Bulkhead/BulkheadAsyncSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
namespace Polly.Specs.Bulkhead;

[Collection(Helpers.Constants.ParallelThreadDependentTestCollection)]
public class BulkheadAsyncSpecs : BulkheadSpecsBase
[Collection(Constants.ParallelThreadDependentTestCollection)]
public class BulkheadAsyncSpecs(ITestOutputHelper testOutputHelper) : BulkheadSpecsBase(testOutputHelper)
{
public BulkheadAsyncSpecs(ITestOutputHelper testOutputHelper)
: base(testOutputHelper)
{
}

#region Configuration

[Fact]
Expand Down Expand Up @@ -55,11 +50,11 @@ public async Task Should_call_onBulkheadRejected_with_passed_context()

using var bulkhead = Policy.BulkheadAsync(1, onRejectedAsync);
TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
using (CancellationTokenSource cancellationSource = new CancellationTokenSource())
using (var cancellationSource = new CancellationTokenSource())
{
_ = Task.Run(() => { bulkhead.ExecuteAsync(async () => { await tcs.Task; }); });

Within(CohesionTimeLimit, () => BulkheadSpecsBase.Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));
Within(CohesionTimeLimit, () => Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));

await bulkhead.Awaiting(b => b.ExecuteAsync(_ => TaskHelper.EmptyTask, contextPassedToExecute)).Should().ThrowAsync<BulkheadRejectedException>();

Expand Down
4 changes: 2 additions & 2 deletions test/Polly.Specs/Bulkhead/BulkheadSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Polly.Specs.Bulkhead;

[Collection(Helpers.Constants.ParallelThreadDependentTestCollection)]
[Collection(Constants.ParallelThreadDependentTestCollection)]
public class BulkheadSpecs : BulkheadSpecsBase
{
public BulkheadSpecs(ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -59,7 +59,7 @@ public void Should_call_onBulkheadRejected_with_passed_context()
Task.Run(() => { bulkhead.Execute(() => { tcs.Task.Wait(); }); });

// Time for the other thread to kick up and take the bulkhead.
Within(CohesionTimeLimit, () => BulkheadSpecsBase.Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));
Within(CohesionTimeLimit, () => Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));

bulkhead.Invoking(b => b.Execute(_ => { }, contextPassedToExecute)).Should()
.Throw<BulkheadRejectedException>();
Expand Down
2 changes: 1 addition & 1 deletion test/Polly.Specs/Bulkhead/BulkheadSpecsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Polly.Specs.Bulkhead;

[Collection(Helpers.Constants.ParallelThreadDependentTestCollection)]
[Collection(Constants.ParallelThreadDependentTestCollection)]
public abstract class BulkheadSpecsBase : IDisposable
{
#region Time constraints
Expand Down
4 changes: 2 additions & 2 deletions test/Polly.Specs/Bulkhead/BulkheadTResultAsyncSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public async Task Should_call_onBulkheadRejected_with_passed_context()

using var bulkhead = Policy.BulkheadAsync<int>(1, onRejectedAsync);
TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
using (CancellationTokenSource cancellationSource = new CancellationTokenSource())
using (var cancellationSource = new CancellationTokenSource())
{
_ = Task.Run(() =>
{
Expand All @@ -66,7 +66,7 @@ public async Task Should_call_onBulkheadRejected_with_passed_context()
});
});

Within(CohesionTimeLimit, () => BulkheadSpecsBase.Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));
Within(CohesionTimeLimit, () => Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));

await bulkhead.Awaiting(b => b.ExecuteAsync(_ => Task.FromResult(1), contextPassedToExecute)).Should().ThrowAsync<BulkheadRejectedException>();

Expand Down
4 changes: 2 additions & 2 deletions test/Polly.Specs/Bulkhead/BulkheadTResultSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void Should_call_onBulkheadRejected_with_passed_context()

using BulkheadPolicy<int> bulkhead = Policy.Bulkhead<int>(1, onRejected);
TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
using (CancellationTokenSource cancellationSource = new CancellationTokenSource())
using (var cancellationSource = new CancellationTokenSource())
{
Task.Run(() =>
{
Expand All @@ -66,7 +66,7 @@ public void Should_call_onBulkheadRejected_with_passed_context()
});
});

Within(CohesionTimeLimit, () => BulkheadSpecsBase.Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));
Within(CohesionTimeLimit, () => Expect(0, () => bulkhead.BulkheadAvailableCount, nameof(bulkhead.BulkheadAvailableCount)));

bulkhead.Invoking(b => b.Execute(_ => 1, contextPassedToExecute)).Should().Throw<BulkheadRejectedException>();

Expand Down
16 changes: 8 additions & 8 deletions test/Polly.Specs/CircuitBreaker/AdvancedCircuitBreakerAsyncSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2790,7 +2790,7 @@ public async Task Should_execute_action_when_non_faulting_and_cancellationToken_
AttemptDuringWhichToCancel = null,
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
await breaker.Awaiting(x => x.RaiseExceptionAndOrCancellationAsync<DivideByZeroException>(scenario, cancellationTokenSource, onExecute))
.Should().NotThrowAsync();
Expand All @@ -2816,7 +2816,7 @@ public async Task Should_not_execute_action_when_cancellationToken_cancelled_bef
AttemptDuringWhichToCancel = null, // Cancellation token cancelled manually below - before any scenario execution.
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
cancellationTokenSource.Cancel();
Expand Down Expand Up @@ -2847,7 +2847,7 @@ public async Task Should_report_cancellation_during_otherwise_non_faulting_actio
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -2877,7 +2877,7 @@ public async Task Should_report_cancellation_during_faulting_action_execution_wh
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -2907,7 +2907,7 @@ public async Task Should_report_faulting_from_faulting_action_execution_when_use
ActionObservesCancellation = false
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
await breaker.Awaiting(x => x.RaiseExceptionAndOrCancellationAsync<DivideByZeroException>(scenario, cancellationTokenSource, onExecute))
.Should().ThrowAsync<DivideByZeroException>();
Expand Down Expand Up @@ -2947,7 +2947,7 @@ await breaker.Awaiting(x => x.RaiseExceptionAsync<DivideByZeroException>())
ActionObservesCancellation = false
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
cancellationTokenSource.Cancel();
Expand Down Expand Up @@ -3013,7 +3013,7 @@ public async Task Should_execute_func_returning_value_when_cancellationToken_not
AttemptDuringWhichToCancel = null,
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -3047,7 +3047,7 @@ public async Task Should_honour_and_report_cancellation_during_func_execution()
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down
16 changes: 8 additions & 8 deletions test/Polly.Specs/CircuitBreaker/AdvancedCircuitBreakerSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2785,7 +2785,7 @@ public void Should_execute_action_when_non_faulting_and_cancellationToken_not_ca
AttemptDuringWhichToCancel = null,
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
breaker.Invoking(x => x.RaiseExceptionAndOrCancellation<DivideByZeroException>(scenario, cancellationTokenSource, onExecute))
.Should().NotThrow();
Expand All @@ -2811,7 +2811,7 @@ public void Should_not_execute_action_when_cancellationToken_cancelled_before_ex
AttemptDuringWhichToCancel = null, // Cancellation token cancelled manually below - before any scenario execution.
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
cancellationTokenSource.Cancel();
Expand Down Expand Up @@ -2842,7 +2842,7 @@ public void Should_report_cancellation_during_otherwise_non_faulting_action_exec
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -2872,7 +2872,7 @@ public void Should_report_cancellation_during_faulting_action_execution_when_use
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -2902,7 +2902,7 @@ public void Should_report_faulting_from_faulting_action_execution_when_user_dele
ActionObservesCancellation = false
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
breaker.Invoking(x => x.RaiseExceptionAndOrCancellation<DivideByZeroException>(scenario, cancellationTokenSource, onExecute))
.Should().Throw<DivideByZeroException>();
Expand Down Expand Up @@ -2942,7 +2942,7 @@ public void Should_report_cancellation_when_both_open_circuit_and_cancellation()
ActionObservesCancellation = false
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
cancellationTokenSource.Cancel();
Expand Down Expand Up @@ -3005,7 +3005,7 @@ public void Should_execute_func_returning_value_when_cancellationToken_not_cance
AttemptDuringWhichToCancel = null,
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -3038,7 +3038,7 @@ public void Should_honour_and_report_cancellation_during_func_execution()
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down
16 changes: 8 additions & 8 deletions test/Polly.Specs/CircuitBreaker/CircuitBreakerAsyncSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@ public async Task Should_execute_action_when_non_faulting_and_cancellationToken_
AttemptDuringWhichToCancel = null,
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
await breaker.Awaiting(x => x.RaiseExceptionAndOrCancellationAsync<DivideByZeroException>(scenario, cancellationTokenSource, onExecute))
.Should().NotThrowAsync();
Expand All @@ -1457,7 +1457,7 @@ public async Task Should_not_execute_action_when_cancellationToken_cancelled_bef
AttemptDuringWhichToCancel = null, // Cancellation token cancelled manually below - before any scenario execution.
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
cancellationTokenSource.Cancel();
Expand Down Expand Up @@ -1488,7 +1488,7 @@ public async Task Should_report_cancellation_during_otherwise_non_faulting_actio
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -1518,7 +1518,7 @@ public async Task Should_report_cancellation_during_faulting_action_execution_wh
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down Expand Up @@ -1548,7 +1548,7 @@ public async Task Should_report_faulting_from_faulting_action_execution_when_use
ActionObservesCancellation = false
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
await breaker.Awaiting(x => x.RaiseExceptionAndOrCancellationAsync<DivideByZeroException>(scenario, cancellationTokenSource, onExecute))
.Should().ThrowAsync<DivideByZeroException>();
Expand Down Expand Up @@ -1584,7 +1584,7 @@ await breaker.Awaiting(x => x.RaiseExceptionAsync<DivideByZeroException>())
ActionObservesCancellation = false
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
cancellationTokenSource.Cancel();
Expand Down Expand Up @@ -1649,7 +1649,7 @@ public async Task Should_execute_func_returning_value_when_cancellationToken_not
AttemptDuringWhichToCancel = null,
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;
Func<AsyncCircuitBreakerPolicy, Task> action = async x => result = await x.RaiseExceptionAndOrCancellationAsync<DivideByZeroException, bool>(scenario, cancellationTokenSource, onExecute, true);
Expand Down Expand Up @@ -1681,7 +1681,7 @@ public async Task Should_honour_and_report_cancellation_during_func_execution()
ActionObservesCancellation = true
};

using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
using (var cancellationTokenSource = new CancellationTokenSource())
{
CancellationToken cancellationToken = cancellationTokenSource.Token;

Expand Down
Loading