Skip to content

refactor: simplify Callback class #452

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
vbreuss merged 2 commits into from
Feb 1, 2026
Merged

refactor: simplify Callback class #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8090223
refactor: simplify `Callback` class
vbreuss Feb 1, 2026
090176f
Merge and invert `if` statements
vbreuss Feb 1, 2026
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
136 changes: 59 additions & 77 deletions Source/Mockolate/Setup/Callback.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,48 +108,42 @@ public class Callback<TDelegate>(TDelegate @delegate) : Callback where TDelegate
/// </summary>
public bool Invoke(bool wasInvoked, ref int index, Action<int, TDelegate> callback)
{
if (IsActive(_matchingCount) && CheckInvocations(_invocationCount))
if (!IsActive(_matchingCount) || !CheckInvocations(_invocationCount) || !CheckMatching(_forIterationCount))
{
if (CheckMatching(_forIterationCount))
_invocationCount++;
return false;
}

_invocationCount++;

if (RunInParallel)
{
if (!wasInvoked)
{
_invocationCount++;

if (RunInParallel)
{
if (!wasInvoked)
{
Interlocked.Increment(ref index);
}

_forIterationCount++;
_matchingCount++;
callback(_invocationCount - 1, @delegate);
}
else if (!wasInvoked)
{
if (!HasForSpecified || !CheckMatching(_forIterationCount + 1))
{
Interlocked.Increment(ref index);
_forIterationCount = 0;
}
else
{
_forIterationCount++;
}

_matchingCount++;
callback(_invocationCount - 1, @delegate);
}

return !RunInParallel;
Interlocked.Increment(ref index);
}

_forIterationCount++;
_matchingCount++;
callback(_invocationCount - 1, @delegate);
}
else if (!wasInvoked)
{
if (!HasForSpecified || !CheckMatching(_forIterationCount + 1))
{
Interlocked.Increment(ref index);
_forIterationCount = 0;
}
else
{
_forIterationCount++;
}

_matchingCount++;
callback(_invocationCount - 1, @delegate);
}

_invocationCount++;
return false;
return !RunInParallel;
}
#pragma warning restore S3776 // Cognitive Complexity of methods should not be too high

Expand All @@ -158,33 +152,27 @@ public bool Invoke(bool wasInvoked, ref int index, Action<int, TDelegate> callba
/// </summary>
public bool Invoke(ref int index, Action<int, TDelegate> callback)
{
if (IsActive(_matchingCount) && CheckInvocations(_invocationCount))
if (!IsActive(_matchingCount) || !CheckInvocations(_invocationCount) || !CheckMatching(_forIterationCount))
{
if (CheckMatching(_forIterationCount))
{
if (!HasForSpecified || !CheckMatching(_forIterationCount + 1))
{
Interlocked.Increment(ref index);
_forIterationCount = 0;
}
else
{
_forIterationCount++;
}

_invocationCount++;
_matchingCount++;
callback(_invocationCount - 1, @delegate);
return true;
}
_invocationCount++;
Interlocked.Increment(ref index);
return false;
}

if (!HasForSpecified || !CheckMatching(_forIterationCount + 1))
{
Interlocked.Increment(ref index);
_forIterationCount = 0;
}
else
{
_forIterationCount++;
_matchingCount++;
}

_invocationCount++;
Interlocked.Increment(ref index);
return false;
_matchingCount++;
callback(_invocationCount - 1, @delegate);
return true;
}

/// <summary>
Expand All @@ -193,33 +181,27 @@ public bool Invoke(ref int index, Action<int, TDelegate> callback)
public bool Invoke<TReturn>(ref int index, Func<int, TDelegate, TReturn> callback,
[NotNullWhen(true)] out TReturn? returnValue)
{
if (IsActive(_matchingCount) && CheckInvocations(_invocationCount))
if (!IsActive(_matchingCount) || !CheckInvocations(_invocationCount) || !CheckMatching(_forIterationCount))
{
if (CheckMatching(_forIterationCount))
{
if (!HasForSpecified || !CheckMatching(_forIterationCount + 1))
{
Interlocked.Increment(ref index);
_forIterationCount = 0;
}
else
{
_forIterationCount++;
}

_invocationCount++;
_matchingCount++;
returnValue = callback(_invocationCount - 1, @delegate)!;
return true;
}
_invocationCount++;
returnValue = default;
Interlocked.Increment(ref index);
return false;
}

if (!HasForSpecified || !CheckMatching(_forIterationCount + 1))
{
Interlocked.Increment(ref index);
_forIterationCount = 0;
}
else
{
_forIterationCount++;
_matchingCount++;
}

_invocationCount++;
returnValue = default;
Interlocked.Increment(ref index);
return false;
_matchingCount++;
returnValue = callback(_invocationCount - 1, @delegate)!;
return true;
}
}
40 changes: 40 additions & 0 deletions Tests/Mockolate.Internal.Tests/CallbackTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,46 @@ public async Task ShouldIncrementIndexOnceWhenCallbackIsExhausted(
await That(indexValues).IsEqualTo(expectResult);
}

[Theory]
[InlineData(2, 2, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2)]
[InlineData(2, 3, 0, 1, 1, 2, 2, 3, 3, 3, 3, 3)]
public async Task ShouldIncrementIndexWheneverForIsExhausted(
int @for, int only, params int[] expectResult)
{
bool wasInvoked = false;
List<int> indexValues = [];
Callback<Action> sut = new(() => { });
sut.For(@for);
sut.Only(only);

int index = 0;
for (int iteration = 1; iteration <= 10; iteration++)
{
sut.Invoke(wasInvoked, ref index, (_, _) => { });
indexValues.Add(index);
}

await That(indexValues).IsEqualTo(expectResult);
}

[Fact]
public async Task ShouldLimitExecutionWhenRunningInParallel()
{
bool wasInvoked = false;
List<int> values = [];
Callback<Action> sut = new(() => { });
sut.Only(2);
sut.InParallel();

int index = 0;
for (int i = 0; i < 5; i++)
{
sut.Invoke(wasInvoked, ref index, (v, _) => values.Add(v));
}

await That(values).IsEqualTo([0, 1,]);
Comment thread
vbreuss marked this conversation as resolved.
}

[Fact]
public async Task WhenCheck_ShouldOnlyBeCalledWhenOnlyLimitIsNotReached()
{
Expand Down
Loading