From 33cf1df57491e45120e77f0f1b7a5ef48045cc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Breu=C3=9F=20Valentin?= Date: Tue, 16 Dec 2025 08:10:55 +0100 Subject: [PATCH 1/2] fix: string representation of `Match.*` --- Source/Mockolate/Match.AnyParameters.cs | 2 +- Source/Mockolate/Match.Parameters.cs | 2 +- .../Mockolate/Match.WithDefaultParameters.cs | 2 +- .../MatchTests.AnyParametersTests.cs | 2 +- .../MatchTests.ParametersTests.cs | 2 +- .../MatchTests.WithDefaultParametersTests.cs | 2 +- .../MockMethods/SetupMethodTests.cs | 36 ++++++++++++++----- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Source/Mockolate/Match.AnyParameters.cs b/Source/Mockolate/Match.AnyParameters.cs index df36c9b3..87576866 100644 --- a/Source/Mockolate/Match.AnyParameters.cs +++ b/Source/Mockolate/Match.AnyParameters.cs @@ -18,7 +18,7 @@ public bool Matches(object?[] values) => true; /// - public override string ToString() => "AnyParameters()"; + public override string ToString() => "Match.AnyParameters()"; } } #pragma warning restore S3453 // This class can't be instantiated; make its constructor 'public'. diff --git a/Source/Mockolate/Match.Parameters.cs b/Source/Mockolate/Match.Parameters.cs index 2b58ca25..79d24cf7 100644 --- a/Source/Mockolate/Match.Parameters.cs +++ b/Source/Mockolate/Match.Parameters.cs @@ -21,7 +21,7 @@ public bool Matches(object?[] values) => predicate(values); /// - public override string ToString() => $"Parameters({predicateExpression})"; + public override string ToString() => $"Match.Parameters({predicateExpression})"; } } #pragma warning restore S3453 // This class can't be instantiated; make its constructor 'public'. diff --git a/Source/Mockolate/Match.WithDefaultParameters.cs b/Source/Mockolate/Match.WithDefaultParameters.cs index 360c030b..445af1e9 100644 --- a/Source/Mockolate/Match.WithDefaultParameters.cs +++ b/Source/Mockolate/Match.WithDefaultParameters.cs @@ -14,7 +14,7 @@ public static IDefaultEventParameters WithDefaultParameters() private sealed class DefaultEventParameters : IDefaultEventParameters { /// - public override string ToString() => "WithDefaultParameters()"; + public override string ToString() => "Match.WithDefaultParameters()"; } } #pragma warning restore S3453 // This class can't be instantiated; make its constructor 'public'. diff --git a/Tests/Mockolate.Tests/MatchTests.AnyParametersTests.cs b/Tests/Mockolate.Tests/MatchTests.AnyParametersTests.cs index 0574ef67..97450be1 100644 --- a/Tests/Mockolate.Tests/MatchTests.AnyParametersTests.cs +++ b/Tests/Mockolate.Tests/MatchTests.AnyParametersTests.cs @@ -23,7 +23,7 @@ public async Task ShouldAlwaysMatch(params object?[] values) public async Task ToString_ShouldReturnExpectedValue() { IParameters sut = Match.AnyParameters(); - string expectedValue = "AnyParameters()"; + string expectedValue = "Match.AnyParameters()"; string? result = sut.ToString(); diff --git a/Tests/Mockolate.Tests/MatchTests.ParametersTests.cs b/Tests/Mockolate.Tests/MatchTests.ParametersTests.cs index 7c0941ee..709ecd5c 100644 --- a/Tests/Mockolate.Tests/MatchTests.ParametersTests.cs +++ b/Tests/Mockolate.Tests/MatchTests.ParametersTests.cs @@ -26,7 +26,7 @@ public async Task ShouldMatchWhenPredicateReturnsTrue(bool expectedResult, param public async Task ToString_ShouldReturnExpectedValue() { IParameters sut = Match.Parameters(_ => true); - string expectedValue = "Parameters(_ => true)"; + string expectedValue = "Match.Parameters(_ => true)"; string? result = sut.ToString(); diff --git a/Tests/Mockolate.Tests/MatchTests.WithDefaultParametersTests.cs b/Tests/Mockolate.Tests/MatchTests.WithDefaultParametersTests.cs index 83c441c4..d0e6ec17 100644 --- a/Tests/Mockolate.Tests/MatchTests.WithDefaultParametersTests.cs +++ b/Tests/Mockolate.Tests/MatchTests.WithDefaultParametersTests.cs @@ -10,7 +10,7 @@ public sealed class WithDefaultParametersTests public async Task ToString_ShouldReturnExpectedValue() { IDefaultEventParameters sut = Match.WithDefaultParameters(); - string expectedValue = "WithDefaultParameters()"; + string expectedValue = "Match.WithDefaultParameters()"; string? result = sut.ToString(); diff --git a/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs b/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs index e522e5e5..888c081e 100644 --- a/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs +++ b/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs @@ -585,6 +585,16 @@ public async Task WhenSetupWithNull_ShouldReturnDefaultValue() public class ReturnMethodWith1Parameters { + [Fact] + public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + { + ReturnMethodSetup setup = new("Foo", Match.AnyParameters()); + + string result = setup.ToString(); + + await That(result).IsEqualTo("int Foo(Match.AnyParameters())"); + } + [Fact] public async Task ToString_ShouldReturnMethodSignature() { @@ -622,7 +632,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("int Foo(AnyParameters())"); + await That(result).IsEqualTo("int Foo(Match.AnyParameters())"); } [Fact] @@ -663,7 +673,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("int Foo(AnyParameters())"); + await That(result).IsEqualTo("int Foo(Match.AnyParameters())"); } [Fact] @@ -705,7 +715,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("int Foo(AnyParameters())"); + await That(result).IsEqualTo("int Foo(Match.AnyParameters())"); } [Fact] @@ -750,7 +760,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("int Foo(AnyParameters())"); + await That(result).IsEqualTo("int Foo(Match.AnyParameters())"); } [Fact] @@ -803,6 +813,16 @@ public async Task ToString_ShouldReturnMethodSignature() public class VoidMethodWith1Parameters { + [Fact] + public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + { + VoidMethodSetup setup = new("Foo", Match.AnyParameters()); + + string result = setup.ToString(); + + await That(result).IsEqualTo("void Foo(Match.AnyParameters())"); + } + [Fact] public async Task ToString_ShouldReturnMethodSignature() { @@ -824,7 +844,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("void Foo(AnyParameters())"); + await That(result).IsEqualTo("void Foo(Match.AnyParameters())"); } [Fact] @@ -849,7 +869,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("void Foo(AnyParameters())"); + await That(result).IsEqualTo("void Foo(Match.AnyParameters())"); } [Fact] @@ -875,7 +895,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("void Foo(AnyParameters())"); + await That(result).IsEqualTo("void Foo(Match.AnyParameters())"); } [Fact] @@ -904,7 +924,7 @@ public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() string result = setup.ToString(); - await That(result).IsEqualTo("void Foo(AnyParameters())"); + await That(result).IsEqualTo("void Foo(Match.AnyParameters())"); } [Fact] From 917029de9a756a25670da5643744d174c6e6a883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Breu=C3=9F=20Valentin?= Date: Tue, 16 Dec 2025 08:14:31 +0100 Subject: [PATCH 2/2] Fix review issues --- .../SetupMethodTests.OutRefParameterTests.cs | 50 ------------------- .../MockMethods/SetupMethodTests.cs | 20 ++++---- 2 files changed, 10 insertions(+), 60 deletions(-) diff --git a/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.OutRefParameterTests.cs b/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.OutRefParameterTests.cs index 5bd5774b..48e264c4 100644 --- a/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.OutRefParameterTests.cs +++ b/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.OutRefParameterTests.cs @@ -224,16 +224,6 @@ public T SetRefParameter(string parameterName, T value) public T GetReturnValue(MethodInvocation invocation) => base.GetReturnValue(invocation, MockBehavior.Default, () => default!); } - - private class MyReturnMethodSetupAnyParameterCombination(string name) - : ReturnMethodSetup(name, Match.AnyParameters()) - { - public TValue HiddenSetOutParameter(string parameterName, Func defaultValueGenerator) - => SetOutParameter(parameterName, defaultValueGenerator); - - public TValue HiddenSetRefParameter(string parameterName, TValue value, MockBehavior behavior) - => SetRefParameter(parameterName, value, behavior); - } } public class ReturnMethodWith2Parameters @@ -432,16 +422,6 @@ public T SetRefParameter(string parameterName, T value) public T GetReturnValue(MethodInvocation invocation) => base.GetReturnValue(invocation, MockBehavior.Default, () => default!); } - - private class MyReturnMethodSetupAnyParameterCombination(string name) - : ReturnMethodSetup(name, Match.AnyParameters()) - { - public TValue HiddenSetOutParameter(string parameterName, Func defaultValueGenerator) - => SetOutParameter(parameterName, defaultValueGenerator); - - public TValue HiddenSetRefParameter(string parameterName, TValue value, MockBehavior behavior) - => SetRefParameter(parameterName, value, behavior); - } } public class ReturnMethodWith3Parameters @@ -678,16 +658,6 @@ public T SetRefParameter(string parameterName, T value) public T GetReturnValue(MethodInvocation invocation) => base.GetReturnValue(invocation, MockBehavior.Default, () => default!); } - - private class MyReturnMethodSetupAnyParameterCombination(string name) - : ReturnMethodSetup(name, Match.AnyParameters()) - { - public TValue HiddenSetOutParameter(string parameterName, Func defaultValueGenerator) - => SetOutParameter(parameterName, defaultValueGenerator); - - public TValue HiddenSetRefParameter(string parameterName, TValue value, MockBehavior behavior) - => SetRefParameter(parameterName, value, behavior); - } } public class ReturnMethodWith4Parameters @@ -962,16 +932,6 @@ public T SetRefParameter(string parameterName, T value) public T GetReturnValue(MethodInvocation invocation) => base.GetReturnValue(invocation, MockBehavior.Default, () => default!); } - - private class MyReturnMethodSetupAnyParameterCombination(string name) - : ReturnMethodSetup(name, Match.AnyParameters()) - { - public TValue HiddenSetOutParameter(string parameterName, Func defaultValueGenerator) - => SetOutParameter(parameterName, defaultValueGenerator); - - public TValue HiddenSetRefParameter(string parameterName, TValue value, MockBehavior behavior) - => SetRefParameter(parameterName, value, behavior); - } } public class ReturnMethodWith5Parameters @@ -1285,16 +1245,6 @@ public T SetRefParameter(string parameterName, T value) public T GetReturnValue(MethodInvocation invocation) => base.GetReturnValue(invocation, MockBehavior.Default, () => default!); } - - private class MyReturnMethodSetupAnyParameterCombination(string name) - : ReturnMethodSetup(name, Match.AnyParameters()) - { - public TValue HiddenSetOutParameter(string parameterName, Func defaultValueGenerator) - => SetOutParameter(parameterName, defaultValueGenerator); - - public TValue HiddenSetRefParameter(string parameterName, TValue value, MockBehavior behavior) - => SetRefParameter(parameterName, value, behavior); - } } public class VoidMethodWith0Parameters diff --git a/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs b/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs index 888c081e..40405359 100644 --- a/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs +++ b/Tests/Mockolate.Tests/MockMethods/SetupMethodTests.cs @@ -586,7 +586,7 @@ public async Task WhenSetupWithNull_ShouldReturnDefaultValue() public class ReturnMethodWith1Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { ReturnMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -626,7 +626,7 @@ public async Task WhenSetupWithNull_ShouldReturnDefaultValue() public class ReturnMethodWith2Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { ReturnMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -667,7 +667,7 @@ public async Task WhenSetupWithNull_ShouldReturnDefaultValue() public class ReturnMethodWith3Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { ReturnMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -709,7 +709,7 @@ public async Task WhenSetupWithNull_ShouldReturnDefaultValue() public class ReturnMethodWith4Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { ReturnMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -754,7 +754,7 @@ public async Task WhenSetupWithNull_ShouldReturnDefaultValue() public class ReturnMethodWith5Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { ReturnMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -814,7 +814,7 @@ public async Task ToString_ShouldReturnMethodSignature() public class VoidMethodWith1Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { VoidMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -838,7 +838,7 @@ public async Task ToString_ShouldReturnMethodSignature() public class VoidMethodWith2Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { VoidMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -863,7 +863,7 @@ public async Task ToString_ShouldReturnMethodSignature() public class VoidMethodWith3Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { VoidMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -889,7 +889,7 @@ public async Task ToString_ShouldReturnMethodSignature() public class VoidMethodWith4Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { VoidMethodSetup setup = new("Foo", Match.AnyParameters()); @@ -918,7 +918,7 @@ await That(result) public class VoidMethodWith5Parameters { [Fact] - public async Task ToString_AnyParameterCombination_ShouldReturnMethodSignature() + public async Task ToString_AnyParameters_ShouldReturnMethodSignature() { VoidMethodSetup setup = new("Foo", Match.AnyParameters());