Skip to content

refactor: make HasReturnCalls virtual #327

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 1 commit into from
Dec 16, 2025
Merged

refactor: make HasReturnCalls virtual #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Source/Mockolate/Setup/MethodSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void TriggerCallbacks(object?[] parameters)
/// <summary>
/// Gets a value indicating whether this setup has return calls configured.
/// </summary>
protected abstract bool HasReturnCalls();
protected virtual bool HasReturnCalls() => false;

/// <summary>
/// Sets an <see langword="out" /> parameter with the specified name and returns its generated value of type
Expand Down
25 changes: 0 additions & 25 deletions Source/Mockolate/Setup/ReturnMethodSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
if (returnCallback.Invoke(ref _currentReturnCallbackIndex, (invocationCount, @delegate)
=> @delegate(invocationCount), out TReturn? newValue))
{
if (newValue is null)
{
return default!;
}

if (!TryCast(newValue, out TResult returnValue, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -477,11 +472,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
if (returnCallback.Invoke(ref _currentReturnCallbackIndex, (invocationCount, @delegate)
=> @delegate(invocationCount, p1), out TReturn? newValue))
{
if (newValue is null)
{
return default!;
}

if (!TryCast(newValue, out TResult returnValue, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -799,11 +789,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
if (returnCallback.Invoke(ref _currentReturnCallbackIndex, (invocationCount, @delegate)
=> @delegate(invocationCount, p1, p2), out TReturn? newValue))
{
if (newValue is null)
{
return default!;
}

if (!TryCast(newValue, out TResult returnValue, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -1136,11 +1121,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
if (returnCallback.Invoke(ref _currentReturnCallbackIndex, (invocationCount, @delegate)
=> @delegate(invocationCount, p1, p2, p3), out TReturn? newValue))
{
if (newValue is null)
{
return default!;
}

if (!TryCast(newValue, out TResult returnValue, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -1491,11 +1471,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
if (returnCallback.Invoke(ref _currentReturnCallbackIndex, (invocationCount, @delegate)
=> @delegate(invocationCount, p1, p2, p3, p4), out TReturn? newValue))
{
if (newValue is null)
{
return default!;
}

if (!TryCast(newValue, out TResult returnValue, behavior))
{
throw new MockException(
Expand Down
20 changes: 0 additions & 20 deletions Source/Mockolate/Setup/VoidMethodSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,6 @@ protected override void TriggerParameterCallbacks(object?[] parameters)
protected override bool? GetCallBaseClass()
=> _callBaseClass;

/// <inheritdoc cref="MethodSetup.HasReturnCalls()" />
protected override bool HasReturnCalls()
=> _returnCallbacks.Count > 0;

/// <inheritdoc cref="MethodSetup.SetOutParameter{T}(string, Func{T})" />
protected override T SetOutParameter<T>(string parameterName, Func<T> defaultValueGenerator)
=> defaultValueGenerator();
Expand Down Expand Up @@ -444,10 +440,6 @@ protected override void TriggerParameterCallbacks(object?[] parameters)
protected override bool? GetCallBaseClass()
=> _callBaseClass;

/// <inheritdoc cref="MethodSetup.HasReturnCalls()" />
protected override bool HasReturnCalls()
=> _returnCallbacks.Count > 0;

/// <inheritdoc cref="MethodSetup.SetOutParameter{T}(string, Func{T})" />
protected override T SetOutParameter<T>(string parameterName, Func<T> defaultValueGenerator)
{
Expand Down Expand Up @@ -715,10 +707,6 @@ protected override void TriggerParameterCallbacks(object?[] parameters)
protected override bool? GetCallBaseClass()
=> _callBaseClass;

/// <inheritdoc cref="MethodSetup.HasReturnCalls()" />
protected override bool HasReturnCalls()
=> _returnCallbacks.Count > 0;

/// <inheritdoc cref="MethodSetup.SetOutParameter{T}(string, Func{T})" />
protected override T SetOutParameter<T>(string parameterName, Func<T> defaultValueGenerator)
{
Expand Down Expand Up @@ -995,10 +983,6 @@ protected override void TriggerParameterCallbacks(object?[] parameters)
protected override bool? GetCallBaseClass()
=> _callBaseClass;

/// <inheritdoc cref="MethodSetup.HasReturnCalls()" />
protected override bool HasReturnCalls()
=> _returnCallbacks.Count > 0;

/// <inheritdoc cref="MethodSetup.SetOutParameter{T}(string, Func{T})" />
protected override T SetOutParameter<T>(string parameterName, Func<T> defaultValueGenerator)
{
Expand Down Expand Up @@ -1281,10 +1265,6 @@ protected override void TriggerParameterCallbacks(object?[] parameters)
protected override bool? GetCallBaseClass()
=> _callBaseClass;

/// <inheritdoc cref="MethodSetup.HasReturnCalls()" />
protected override bool HasReturnCalls()
=> _returnCallbacks.Count > 0;

/// <inheritdoc cref="MethodSetup.SetOutParameter{T}(string, Func{T})" />
protected override T SetOutParameter<T>(string parameterName, Func<T> defaultValueGenerator)
{
Expand Down
7 changes: 1 addition & 6 deletions Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@ namespace Mockolate.Setup
protected abstract void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior);
protected abstract bool? GetCallBaseClass();
protected abstract TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator);
protected abstract bool HasReturnCalls();
protected virtual bool HasReturnCalls() { }
protected abstract bool IsMatch(Mockolate.Interactions.MethodInvocation invocation);
protected abstract T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator);
protected abstract T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior);
Expand Down Expand Up @@ -1565,7 +1565,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1588,7 +1587,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1612,7 +1610,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1636,7 +1633,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1660,7 +1656,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand Down
7 changes: 1 addition & 6 deletions Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ namespace Mockolate.Setup
protected abstract void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior);
protected abstract bool? GetCallBaseClass();
protected abstract TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator);
protected abstract bool HasReturnCalls();
protected virtual bool HasReturnCalls() { }
protected abstract bool IsMatch(Mockolate.Interactions.MethodInvocation invocation);
protected abstract T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator);
protected abstract T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior);
Expand Down Expand Up @@ -1564,7 +1564,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1587,7 +1586,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1611,7 +1609,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1635,7 +1632,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1659,7 +1655,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand Down
7 changes: 1 addition & 6 deletions Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ namespace Mockolate.Setup
protected abstract void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior);
protected abstract bool? GetCallBaseClass();
protected abstract TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator);
protected abstract bool HasReturnCalls();
protected virtual bool HasReturnCalls() { }
protected abstract bool IsMatch(Mockolate.Interactions.MethodInvocation invocation);
protected abstract T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator);
protected abstract T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior);
Expand Down Expand Up @@ -1527,7 +1527,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1550,7 +1549,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1574,7 +1572,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1598,7 +1595,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand All @@ -1622,7 +1618,6 @@ namespace Mockolate.Setup
protected override void ExecuteCallback(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior) { }
protected override bool? GetCallBaseClass() { }
protected override TResult GetReturnValue<TResult>(Mockolate.Interactions.MethodInvocation invocation, Mockolate.MockBehavior behavior, System.Func<TResult> defaultValueGenerator) { }
protected override bool HasReturnCalls() { }
protected override bool IsMatch(Mockolate.Interactions.MethodInvocation invocation) { }
protected override T SetOutParameter<T>(string parameterName, System.Func<T> defaultValueGenerator) { }
protected override T SetRefParameter<T>(string parameterName, T value, Mockolate.MockBehavior behavior) { }
Expand Down
Loading
Loading