Skip to content
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

Fix warning CA1062#NoOpPolicy #2219

Merged
merged 6 commits into from
Jul 21, 2024
Merged

Fix warning CA1062#NoOpPolicy #2219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6221ddc
Fix warning CA1062#NoOpSpecs
Zombach Jul 21, 2024
75b5031
Fix warning CA1062#NoOpPolicy
Zombach Jul 21, 2024
c11cf51
Merge branch 'zombach/remove-warning-ca1062#no-op-policy' of github.c…
Zombach Jul 21, 2024
aebb3ac
Merge branch 'App-vNext:main' into zombach/remove-warning-ca1062#no-o…
Zombach Jul 21, 2024
6b990e5
Split Test
Zombach Jul 21, 2024
d22bf21
fix SA1028
Zombach Jul 21, 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
23 changes: 18 additions & 5 deletions src/Polly/NoOp/NoOpPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ namespace Polly.NoOp;
/// <summary>
/// A no op policy that can be applied to delegates.
/// </summary>
#pragma warning disable CA1062 // Validate arguments of public methods
public class NoOpPolicy : Policy, INoOpPolicy
{
internal NoOpPolicy()
Expand All @@ -13,8 +12,15 @@ internal NoOpPolicy()

/// <inheritdoc/>
[DebuggerStepThrough]
protected override TResult Implementation<TResult>(Func<Context, CancellationToken, TResult> action, Context context, CancellationToken cancellationToken) =>
NoOpEngine.Implementation(action, context, cancellationToken);
protected override TResult Implementation<TResult>(Func<Context, CancellationToken, TResult> action, Context context, CancellationToken cancellationToken)
{
if (action is null)
{
throw new ArgumentNullException(nameof(action));
}

return NoOpEngine.Implementation(action, context, cancellationToken);
}
}

/// <summary>
Expand All @@ -29,6 +35,13 @@ internal NoOpPolicy()

/// <inheritdoc/>
[DebuggerStepThrough]
protected override TResult Implementation(Func<Context, CancellationToken, TResult> action, Context context, CancellationToken cancellationToken) =>
NoOpEngine.Implementation(action, context, cancellationToken);
protected override TResult Implementation(Func<Context, CancellationToken, TResult> action, Context context, CancellationToken cancellationToken)
{
if (action is null)
{
throw new ArgumentNullException(nameof(action));
}

return NoOpEngine.Implementation(action, context, cancellationToken);
}
}
19 changes: 19 additions & 0 deletions test/Polly.Specs/NoOp/NoOpSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

public class NoOpSpecs
{
[Fact]
public void Should_throw_when_action_is_null()
{
var flags = BindingFlags.NonPublic | BindingFlags.Instance;
Func<Context, CancellationToken, EmptyStruct> action = null!;

var instance = Activator.CreateInstance(typeof(NoOpPolicy), true)!;
var instanceType = instance.GetType();
var methods = instanceType.GetMethods(flags);

var methodInfo = methods.First(method => method is { Name: "Implementation", ReturnType.Name: "TResult" });
var generic = methodInfo.MakeGenericMethod(typeof(EmptyStruct));
var func = () => generic.Invoke(instance, [action, new Context(), CancellationToken.None]);

var exceptionAssertions = func.Should().Throw<TargetInvocationException>();
exceptionAssertions.And.Message.Should().Be("Exception has been thrown by the target of an invocation.");
exceptionAssertions.WithInnerException<ArgumentNullException>("action");
}

[Fact]
public void Should_execute_user_delegate()
{
Expand Down
17 changes: 17 additions & 0 deletions test/Polly.Specs/NoOp/NoOpTResultSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

public class NoOpTResultSpecs
{
[Fact]
public void Should_throw_when_action_is_null()
{
var flags = BindingFlags.NonPublic | BindingFlags.Instance;
Func<Context, CancellationToken, EmptyStruct> action = null!;

var instance = Activator.CreateInstance(typeof(NoOpPolicy<EmptyStruct>), true)!;
var instanceType = instance.GetType();
var methods = instanceType.GetMethods(flags);
var methodInfo = methods.First(method => method is { Name: "Implementation", ReturnType.Name: "EmptyStruct" });
var func = () => methodInfo.Invoke(instance, [action, new Context(), CancellationToken.None]);

var exceptionAssertions = func.Should().Throw<TargetInvocationException>();
exceptionAssertions.And.Message.Should().Be("Exception has been thrown by the target of an invocation.");
exceptionAssertions.WithInnerException<ArgumentNullException>("action");
}

[Fact]
public void Should_execute_user_delegate()
{
Expand Down