Skip to content

refactor: remove redundant check in ReturnMethodSetup #398

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
Jan 24, 2026
Merged

refactor: remove redundant check in ReturnMethodSetup #398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d06df04
refactor: remove redundant check in `ReturnMethodSetup`
vbreuss Jan 24, 2026
7b40c13
Fix review issues
vbreuss Jan 24, 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
20 changes: 0 additions & 20 deletions Source/Mockolate/Setup/ReturnMethodSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
Func<TResult> defaultValueGenerator)
where TResult : default
{
if (_returnCallbacks.Count == 0)
{
return defaultValueGenerator();
}

if (!TryCast(invocation.Parameters[0].Value, out T1 p1, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -709,11 +704,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
Func<TResult> defaultValueGenerator)
where TResult : default
{
if (_returnCallbacks.Count == 0)
{
return defaultValueGenerator();
}

if (!TryCast(invocation.Parameters[0].Value, out T1 p1, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -1013,11 +1003,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
Func<TResult> defaultValueGenerator)
where TResult : default
{
if (_returnCallbacks.Count == 0)
{
return defaultValueGenerator();
}

if (!TryCast(invocation.Parameters[0].Value, out T1 p1, behavior))
{
throw new MockException(
Expand Down Expand Up @@ -1335,11 +1320,6 @@ protected override TResult GetReturnValue<TResult>(MethodInvocation invocation,
Func<TResult> defaultValueGenerator)
where TResult : default
{
if (_returnCallbacks.Count == 0)
{
return defaultValueGenerator();
}

if (!TryCast(invocation.Parameters[0].Value, out T1 p1, behavior))
{
throw new MockException(
Expand Down
73 changes: 73 additions & 0 deletions Tests/Mockolate.Tests/MockMethods/SetupMethodTests.ReturnsThrowsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,18 @@ public async Task SetupWithoutReturn_ShouldUseBaseValue()
await That(result).IsEqualTo("foo");
}

[Fact]
public async Task SetupWithReturn_ShouldUseBaseValue()
Comment thread
vbreuss marked this conversation as resolved.
Outdated
{
ReturnMethodSetupTest sut = Mock.Create<ReturnMethodSetupTest>();
sut.SetupMock.Method.Method0()
.Returns("bar");

string result = sut.Method0();

await That(result).IsEqualTo("bar");
}

[Fact]
public async Task Throws_Callback_ShouldThrowException()
{
Expand Down Expand Up @@ -491,6 +503,18 @@ public async Task SetupWithoutReturn_ShouldUseBaseValue()
await That(result).IsEqualTo("foo-1");
}

[Fact]
public async Task SetupWithReturn_ShouldUseBaseValue()
Comment thread
vbreuss marked this conversation as resolved.
Outdated
{
ReturnMethodSetupTest sut = Mock.Create<ReturnMethodSetupTest>();
sut.SetupMock.Method.Method1(It.IsAny<int>())
.Returns("bar");

string result = sut.Method1(1);

await That(result).IsEqualTo("bar");
}

[Fact]
public async Task Throws_Callback_ShouldThrowException()
{
Expand Down Expand Up @@ -818,6 +842,18 @@ public async Task SetupWithoutReturn_ShouldUseBaseValue()
await That(result).IsEqualTo("foo-1-2");
}

[Fact]
public async Task SetupWithReturn_ShouldUseBaseValue()
Comment thread
vbreuss marked this conversation as resolved.
Outdated
{
ReturnMethodSetupTest sut = Mock.Create<ReturnMethodSetupTest>();
sut.SetupMock.Method.Method2(It.IsAny<int>(), It.IsAny<int>())
.Returns("bar");

string result = sut.Method2(1, 2);

await That(result).IsEqualTo("bar");
}

[Fact]
public async Task Throws_Callback_ShouldThrowException()
{
Expand Down Expand Up @@ -1151,6 +1187,18 @@ public async Task SetupWithoutReturn_ShouldUseBaseValue()
await That(result).IsEqualTo("foo-1-2-3");
}

[Fact]
public async Task SetupWithReturn_ShouldUseBaseValue()
Comment thread
vbreuss marked this conversation as resolved.
Outdated
{
ReturnMethodSetupTest sut = Mock.Create<ReturnMethodSetupTest>();
sut.SetupMock.Method.Method3(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>())
.Returns("bar");

string result = sut.Method3(1, 2, 3);

await That(result).IsEqualTo("bar");
}

[Fact]
public async Task Throws_Callback_ShouldThrowException()
{
Expand Down Expand Up @@ -1486,6 +1534,18 @@ public async Task SetupWithoutReturn_ShouldUseBaseValue()
await That(result).IsEqualTo("foo-1-2-3-4");
}

[Fact]
public async Task SetupWithReturn_ShouldIgnoreBaseValue()
{
ReturnMethodSetupTest sut = Mock.Create<ReturnMethodSetupTest>();
sut.SetupMock.Method.Method4(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>())
.Returns("bar");

string result = sut.Method4(1, 2, 3, 4);

await That(result).IsEqualTo("bar");
}

[Fact]
public async Task Throws_Callback_ShouldThrowException()
{
Expand Down Expand Up @@ -1833,6 +1893,19 @@ public async Task SetupWithoutReturn_ShouldUseBaseValue()
await That(result).IsEqualTo("foo-1-2-3-4-5");
}

[Fact]
public async Task SetupWithReturn_ShouldIgnoreBaseValue()
{
ReturnMethodSetupTest sut = Mock.Create<ReturnMethodSetupTest>();
sut.SetupMock.Method.Method5(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(),
It.IsAny<int>())
.Returns("bar");

string result = sut.Method5(1, 2, 3, 4, 5);

await That(result).IsEqualTo("bar");
}

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