Skip to content

fix: combine initialize and return for properties #397

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

fix: combine initialize and return for properties #397

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
7000946
fix: combine initialize and return for properties
vbreuss Jan 24, 2026
6674f43
Fix review issue
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
4 changes: 2 additions & 2 deletions Source/Mockolate/Setup/PropertySetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ public class PropertySetup<T>(string name) : PropertySetup,
private readonly List<Callback<Action<int, T>>> _getterCallbacks = [];
private readonly List<Callback<Func<int, T, T>>> _returnCallbacks = [];
private readonly List<Callback<Action<int, T>>> _setterCallbacks = [];
private bool? _skipBaseClass;
private Callback? _currentCallback;
private int _currentGetterCallbacksIndex;
private Callback? _currentReturnCallback;
private int _currentReturnCallbackIndex;
private int _currentSetterCallbacksIndex;
private bool _isInitialized;
private bool? _skipBaseClass;
private T _value = default!;

/// <inheritdoc cref="PropertySetup.Name" />
Expand Down Expand Up @@ -209,7 +209,7 @@ protected override TResult InvokeGetter<TResult>(MockBehavior behavior, Func<TRe
}
}

Comment thread
vbreuss marked this conversation as resolved.
if (!foundCallback && _returnCallbacks.Count > 0)
if (!foundCallback && _returnCallbacks.Count > 0 && !_isInitialized)
{
_value = defaultValueGenerator() is T value ? value : default!;
_isInitialized = true;
Expand Down
42 changes: 33 additions & 9 deletions Tests/Mockolate.Tests/MockProperties/SetupPropertyTests.InitializeWithTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,42 @@
namespace Mockolate.Tests.MockProperties;
using System.Collections.Generic;

namespace Mockolate.Tests.MockProperties;

public sealed partial class SetupPropertyTests
{
public sealed class InitializeWithTests
{
[Fact]
public async Task WhenRead_ShouldReturnInitializedValue()
public async Task Returns_PredicateIsFalse_ShouldUseInitializedDefaultValue()
{
List<int> results = [];
IPropertyService sut = Mock.Create<IPropertyService>();
sut.SetupMock.Property.MyProperty.InitializeWith(42);

int result = sut.MyProperty;
sut.SetupMock.Property.MyProperty
.InitializeWith(2)
.Returns(() => 4).When(i => i > 3);

await That(result).IsEqualTo(42);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
sut.MyProperty = -3;
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);

await That(results).IsEqualTo([2, 2, -3, -3, 4, 4, 4,]);
}

[Fact]
public async Task WithNull_ShouldReturnNull()
public async Task WhenRead_ShouldReturnInitializedValue()
{
IPropertyService sut = Mock.Create<IPropertyService>();
sut.SetupMock.Property.MyStringProperty.InitializeWith(null);
sut.SetupMock.Property.MyProperty.InitializeWith(42);

string? result = sut.MyStringProperty;
int result = sut.MyProperty;

await That(result).IsNull();
await That(result).IsEqualTo(42);
}

[Fact]
Expand All @@ -39,5 +52,16 @@ public async Task WhenSet_ShouldUpdateValue_ShouldReturnInitializedValue()
await That(result1).IsEqualTo(42);
await That(result2).IsEqualTo(100);
}

[Fact]
public async Task WithNull_ShouldReturnNull()
{
IPropertyService sut = Mock.Create<IPropertyService>();
sut.SetupMock.Property.MyStringProperty.InitializeWith(null);

string? result = sut.MyStringProperty;

await That(result).IsNull();
}
}
}
130 changes: 76 additions & 54 deletions Tests/Mockolate.Tests/MockProperties/SetupPropertyTests.ReturnsThrowsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,74 +59,32 @@ public async Task Returns_Callback_ShouldReturnExpectedValue()
}

[Fact]
public async Task Returns_CallbackWithWhen_ShouldReturnDefaultValueWhenPredicateIsFalse()
public async Task Returns_CallbackWithValue_ShouldReturnExpectedValue()
{
IPropertyService sut = Mock.Create<IPropertyService>();

sut.SetupMock.Property.MyProperty
.Returns(() => 4).When(i => i > 0);

int result1 = sut.MyProperty;
int result2 = sut.MyProperty;

await That(result1).IsEqualTo(0);
await That(result2).IsEqualTo(4);
}

[Fact]
public async Task WithoutCallback_IPropertySetupReturnBuilder_ShouldNotThrow()
{
IPropertyService mock = Mock.Create<IPropertyService>();
IPropertySetupReturnBuilder<int> setup =
(IPropertySetupReturnBuilder<int>)mock.SetupMock.Property.MyProperty;

void ActWhen()
{
setup.When(_ => true);
}

void ActFor()
{
setup.For(2);
}

await That(ActWhen).DoesNotThrow();
await That(ActFor).DoesNotThrow();
}

[Fact]
public async Task WithoutCallback_IPropertySetupReturnWhenBuilder_ShouldNotThrow()
{
IPropertyService mock = Mock.Create<IPropertyService>();
IPropertySetupReturnWhenBuilder<int> setup =
(IPropertySetupReturnWhenBuilder<int>)mock.SetupMock.Property.MyProperty;

void ActFor()
{
setup.For(2);
}
.InitializeWith(3)
.Returns(x => 4 * x);

void ActOnly()
{
setup.Only(2);
}
int result = sut.MyProperty;

await That(ActFor).DoesNotThrow();
await That(ActOnly).DoesNotThrow();
await That(result).IsEqualTo(12);
}

[Fact]
public async Task Returns_CallbackWithValue_ShouldReturnExpectedValue()
public async Task Returns_CallbackWithWhen_ShouldReturnDefaultValueWhenPredicateIsFalse()
{
IPropertyService sut = Mock.Create<IPropertyService>();

sut.SetupMock.Property.MyProperty
.InitializeWith(3)
.Returns(x => 4 * x);
.Returns(() => 4).When(i => i > 0);

int result = sut.MyProperty;
int result1 = sut.MyProperty;
int result2 = sut.MyProperty;

await That(result).IsEqualTo(12);
await That(result1).IsEqualTo(0);
await That(result2).IsEqualTo(4);
}

[Fact]
Expand All @@ -141,10 +99,11 @@ public async Task Returns_For_ShouldLimitUsage_ToSpecifiedNumber()
List<string?> values = [];
for (int i = 0; i < 10; i++)
{
sut.MyStringProperty = "-";
values.Add(sut.MyStringProperty);
}

await That(values).IsEqualTo(["foo", "foo", "bar", "bar", "bar", "", "", "", "", "",]);
await That(values).IsEqualTo(["foo", "foo", "bar", "bar", "bar", "-", "-", "-", "-", "-",]);
}

[Fact]
Expand All @@ -166,6 +125,27 @@ public async Task Returns_Forever_ShouldUseTheLastValueForever()
await That(result).IsEqualTo([2, 3, 4, 4, 4, 4, 4, 4, 4, 4,]);
}

[Fact]
public async Task Returns_PredicateIsFalse_ShouldUseInitializedDefaultValue()
{
List<int> results = [];
IPropertyService sut = Mock.Create<IPropertyService>();

sut.SetupMock.Property.MyProperty
.Returns(() => 4).When(i => i > 3);

results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
sut.MyProperty = -3;
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);
results.Add(sut.MyProperty);

await That(results).IsEqualTo([0, 0, -3, -3, 4, 4, 4,]);
}

[Fact]
public async Task Returns_ShouldReturnExpectedValue()
{
Expand Down Expand Up @@ -289,5 +269,47 @@ void Act()

await That(Act).ThrowsException().WithMessage("foo");
}

[Fact]
public async Task WithoutCallback_IPropertySetupReturnBuilder_ShouldNotThrow()
{
IPropertyService mock = Mock.Create<IPropertyService>();
IPropertySetupReturnBuilder<int> setup =
(IPropertySetupReturnBuilder<int>)mock.SetupMock.Property.MyProperty;

void ActWhen()
{
setup.When(_ => true);
}

void ActFor()
{
setup.For(2);
}

await That(ActWhen).DoesNotThrow();
await That(ActFor).DoesNotThrow();
}

[Fact]
public async Task WithoutCallback_IPropertySetupReturnWhenBuilder_ShouldNotThrow()
{
IPropertyService mock = Mock.Create<IPropertyService>();
IPropertySetupReturnWhenBuilder<int> setup =
(IPropertySetupReturnWhenBuilder<int>)mock.SetupMock.Property.MyProperty;

void ActFor()
{
setup.For(2);
}

void ActOnly()
{
setup.Only(2);
}

await That(ActFor).DoesNotThrow();
await That(ActOnly).DoesNotThrow();
}
}
}
14 changes: 14 additions & 0 deletions Tests/Mockolate.Tests/MockProperties/SetupPropertyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ namespace Mockolate.Tests.MockProperties;

public sealed partial class SetupPropertyTests
{
[Fact]
public async Task InitializeValue_NotMatchingTypes_ShouldUseDefault()
{
MyPropertySetup<int> setup = new();

setup.MyInitializeValue("f");

int result = setup.InvokeGetter<int>();
await That(result).IsEqualTo(0);
}

[Fact]
public async Task InvokeGetter_InvalidType_ShouldThrowMockException()
{
Expand Down Expand Up @@ -161,5 +172,8 @@ public void InvokeSetter(object? value)

public TResult InvokeGetter<TResult>()
=> InvokeGetter<TResult>(MockBehavior.Default, () => default!);

public void MyInitializeValue(object? value)
=> InitializeValue(value);
Comment thread
vbreuss marked this conversation as resolved.
}
}
2 changes: 2 additions & 0 deletions Tests/Mockolate.Tests/SetupExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public async Task OnlyOnce_ShouldApplySetupOnlyOnce()
int[] values = new int[10];
for (int i = 0; i < 10; i++)
{
sut.MyProperty = 0;
values[i] = sut.MyProperty;
}

Expand All @@ -60,6 +61,7 @@ public async Task OnlyOnce_WithFor_ShouldApplySetupOnlyForTimes()
int[] values = new int[10];
for (int i = 0; i < 10; i++)
{
sut.MyProperty = 0;
values[i] = sut.MyProperty;
}

Expand Down
Loading