diff --git a/Directory.Packages.props b/Directory.Packages.props index 6b31f65..140df3f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,7 @@ - + diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index cbdd1cc..d4eb79f 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -22,7 +22,7 @@ latest enable $(NoWarn);1701;1702 - CS1591;NU5104 + CS1591;CS1711;NU5104 true diff --git a/Source/aweXpect.Mockolate/ThatVerificationResult.Between.cs b/Source/aweXpect.Mockolate/ThatVerificationResult.Between.cs index 74b93cf..e2f01a3 100644 --- a/Source/aweXpect.Mockolate/ThatVerificationResult.Between.cs +++ b/Source/aweXpect.Mockolate/ThatVerificationResult.Between.cs @@ -90,7 +90,7 @@ public async Task IsMetBy(VerificationResult actual, } catch (MockVerificationTimeoutException) { - string interactionsText = Formatter.Format(((IVerificationResult)actual).MockInteractions, + string interactionsText = Formatter.Format(((IVerificationResult)actual).Interactions, FormattingOptions.MultipleLines); expectationBuilder.UpdateContexts(contexts => contexts .Remove("Matching Interactions") diff --git a/Source/aweXpect.Mockolate/ThatVerificationResult.Then.cs b/Source/aweXpect.Mockolate/ThatVerificationResult.Then.cs index 7c2256b..160c79c 100644 --- a/Source/aweXpect.Mockolate/ThatVerificationResult.Then.cs +++ b/Source/aweXpect.Mockolate/ThatVerificationResult.Then.cs @@ -42,6 +42,13 @@ public ConstraintResult IsMetBy(VerificationResult actual) bool result = true; T verify = ((IVerificationResult)actual).Object; IVerificationResult verificationResult = actual; + IInteraction[] snapshot = verificationResult.Interactions.ToArray(); + Dictionary positions = new(snapshot.Length); + for (int i = 0; i < snapshot.Length; i++) + { + positions[snapshot[i]] = i; + } + int after = -1; foreach (Func> check in interactions) { @@ -60,7 +67,7 @@ public ConstraintResult IsMetBy(VerificationResult actual) Outcome = result ? Outcome.Success : Outcome.Failure; if (!result) { - string context = Formatter.Format(((IVerificationResult)actual).MockInteractions, + string context = Formatter.Format(((IVerificationResult)actual).Interactions, FormattingOptions.MultipleLines); expectationBuilder.UpdateContexts(contexts => contexts.Add( new ResultContext.SyncCallback("Matching Interactions", () => context))); @@ -72,12 +79,22 @@ public ConstraintResult IsMetBy(VerificationResult actual) bool VerifyInteractions(IInteraction[] filteredInteractions, IVerificationResult currentVerificationResult) { - bool hasInteractionAfter = filteredInteractions.Any(x => x.Index > after); - if (hasInteractionAfter) + int bestPosition = int.MaxValue; + IInteraction? firstInteraction = null; + foreach (IInteraction candidate in filteredInteractions) { - after = filteredInteractions.Where(x => x.Index > after).Min(x => x.Index); + if (positions.TryGetValue(candidate, out int position) && + position > after && + position < bestPosition) + { + bestPosition = position; + firstInteraction = candidate; + } } - else if (_error is null) + + bool hasInteractionAfter = firstInteraction is not null; + after = hasInteractionAfter ? bestPosition : int.MaxValue; + if (!hasInteractionAfter && _error is null) { _error = filteredInteractions.Length > 0 ? $"{currentVerificationResult.Expectation} too early" diff --git a/Source/aweXpect.Mockolate/ThatVerificationResult.Times.cs b/Source/aweXpect.Mockolate/ThatVerificationResult.Times.cs index 1689a25..8e2037d 100644 --- a/Source/aweXpect.Mockolate/ThatVerificationResult.Times.cs +++ b/Source/aweXpect.Mockolate/ThatVerificationResult.Times.cs @@ -90,7 +90,7 @@ public async Task IsMetBy(VerificationResult actual, } catch (MockVerificationTimeoutException) { - string interactionsText = Formatter.Format(((IVerificationResult)actual).MockInteractions, + string interactionsText = Formatter.Format(((IVerificationResult)actual).Interactions, FormattingOptions.MultipleLines); expectationBuilder.UpdateContexts(contexts => contexts .Remove("Matching Interactions") diff --git a/Source/aweXpect.Mockolate/ThatVerificationResult.cs b/Source/aweXpect.Mockolate/ThatVerificationResult.cs index ee8323e..8ec0d59 100644 --- a/Source/aweXpect.Mockolate/ThatVerificationResult.cs +++ b/Source/aweXpect.Mockolate/ThatVerificationResult.cs @@ -34,7 +34,7 @@ private static void AppendAllInteractions(ExpectationBuilder expectationBuilder, return; } - MockInteractions allInteractions = mock.MockRegistry.Interactions; + IMockInteractions allInteractions = mock.MockRegistry.Interactions; string interactionsText = Formatter.Format(allInteractions, FormattingOptions.MultipleLines); expectationBuilder.UpdateContexts(contexts => contexts .Remove("All Interactions") @@ -97,7 +97,7 @@ public async Task IsMetBy(VerificationResult actual, } catch (MockVerificationTimeoutException) { - string interactionsText = Formatter.Format(((IVerificationResult)actual).MockInteractions, + string interactionsText = Formatter.Format(((IVerificationResult)actual).Interactions, FormattingOptions.MultipleLines); expectationBuilder.UpdateContexts(contexts => contexts .Remove("Matching Interactions") @@ -308,7 +308,7 @@ public async Task IsMetBy(VerificationResult actual, } catch (MockVerificationTimeoutException) { - string interactionsText = Formatter.Format(((IVerificationResult)actual).MockInteractions, + string interactionsText = Formatter.Format(((IVerificationResult)actual).Interactions, FormattingOptions.MultipleLines); expectationBuilder.UpdateContexts(contexts => contexts .Remove("Matching Interactions") diff --git a/Source/aweXpect.Mockolate/Web/ItExtensions.HttpContent.IsJsonContent.cs b/Source/aweXpect.Mockolate/Web/ItExtensions.HttpContent.IsJsonContent.cs index a2a8411..b55eef9 100644 --- a/Source/aweXpect.Mockolate/Web/ItExtensions.HttpContent.IsJsonContent.cs +++ b/Source/aweXpect.Mockolate/Web/ItExtensions.HttpContent.IsJsonContent.cs @@ -84,7 +84,7 @@ public IJsonContentBodyParameter IgnoringAdditionalProperties(bool ignoreAdditio return this; } - public IParameter Do(Action callback) + public IParameterWithCallback Do(Action callback) => _parameter.Do(callback); public ItExtensions.IHttpContentHeaderParameter WithHeaders( diff --git a/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net10.0.txt b/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net10.0.txt index 244a4d3..62b9f09 100644 --- a/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net10.0.txt +++ b/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net10.0.txt @@ -4,7 +4,7 @@ namespace Mockolate.Web { public static class AweXpectItExtensions { - public interface IJsonContentBodyParameter : Mockolate.Parameters.IParameter, Mockolate.Web.ItExtensions.IHttpContentParameter, Mockolate.Web.ItExtensions.IHttpHeaderParameter + public interface IJsonContentBodyParameter : Mockolate.Parameters.IParameter, Mockolate.Parameters.IParameterWithCallback, Mockolate.Parameters.IParameter, Mockolate.Web.ItExtensions.IHttpContentParameter, Mockolate.Web.ItExtensions.IHttpHeaderParameter { Mockolate.Web.AweXpectItExtensions.IJsonContentBodyParameter IgnoringAdditionalProperties(bool ignoreAdditionalProperties = true); } diff --git a/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net8.0.txt b/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net8.0.txt index 773442a..ded5ae4 100644 --- a/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net8.0.txt +++ b/Tests/aweXpect.Mockolate.Api.Tests/Expected/aweXpect.Mockolate_net8.0.txt @@ -4,7 +4,7 @@ namespace Mockolate.Web { public static class AweXpectItExtensions { - public interface IJsonContentBodyParameter : Mockolate.Parameters.IParameter, Mockolate.Web.ItExtensions.IHttpContentParameter, Mockolate.Web.ItExtensions.IHttpHeaderParameter + public interface IJsonContentBodyParameter : Mockolate.Parameters.IParameter, Mockolate.Parameters.IParameterWithCallback, Mockolate.Parameters.IParameter, Mockolate.Web.ItExtensions.IHttpContentParameter, Mockolate.Web.ItExtensions.IHttpHeaderParameter { Mockolate.Web.AweXpectItExtensions.IJsonContentBodyParameter IgnoringAdditionalProperties(bool ignoreAdditionalProperties = true); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatMockVerifyIs.AllInteractionsAreVerifiedTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatMockVerifyIs.AllInteractionsAreVerifiedTests.cs index 05cac50..e9b54a6 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatMockVerifyIs.AllInteractionsAreVerifiedTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatMockVerifyIs.AllInteractionsAreVerifiedTests.cs @@ -16,7 +16,7 @@ public async Task Negated_WhenAllAreVerified_ShouldThrow() sut.DoWork(1); sut.DoWork(2); - sut.Mock.Verify.DoWork(It.IsAny()).AtLeastOnce(); + await That(sut.Mock.Verify.DoWork(It.IsAny())).AtLeastOnce(); async Task Act() { @@ -39,7 +39,7 @@ public async Task WhenAllInvocationsWereVerified_ShouldNotThrow() sut.DoWork(1); sut.DoWork(2); - sut.Mock.Verify.DoWork(It.IsAny()).AtLeastOnce(); + await That(sut.Mock.Verify.DoWork(It.IsAny())).AtLeastOnce(); async Task Act() { @@ -58,7 +58,7 @@ public async Task WhenMultipleInvocationIsNotVerified_ShouldThrow() sut.DoWork(2); sut.DoWork(3); - sut.Mock.Verify.DoWork(It.Is(2)).AtLeastOnce(); + await That(sut.Mock.Verify.DoWork(It.Is(2))).AtLeastOnce(); async Task Act() { @@ -70,8 +70,8 @@ await That(Act).Throws() Expected that the aweXpect.Mockolate.Tests.ThatMockVerifyIs.IMyService mock has all interactions verified, but the following 2 interactions were not verified: - - [0] invoke method DoWork(1) - - [2] invoke method DoWork(3) + - invoke method DoWork(1) + - invoke method DoWork(3) """); } @@ -83,7 +83,7 @@ public async Task WhenOneInvocationIsNotVerified_ShouldThrow() sut.DoWork(1); sut.DoWork(2); - sut.Mock.Verify.DoWork(It.Is(1)).AtLeastOnce(); + await That(sut.Mock.Verify.DoWork(It.Is(1))).AtLeastOnce(); async Task Act() { @@ -95,7 +95,7 @@ await That(Act).Throws() Expected that the aweXpect.Mockolate.Tests.ThatMockVerifyIs.IMyService mock has all interactions verified, but the following interaction was not verified: - - [1] invoke method DoWork(2) + - invoke method DoWork(2) """); } } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastOnceTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastOnceTests.cs index cb668f2..22e4381 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastOnceTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastOnceTests.cs @@ -210,8 +210,8 @@ but never found it Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True) ] """); } @@ -253,7 +253,7 @@ but found it once Matching Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] """); } @@ -280,8 +280,8 @@ but found it twice Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTests.cs index e4ec772..e9640dd 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTests.cs @@ -237,9 +237,9 @@ but found it only 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True), - [2] invoke method MyMethod(3, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True), + invoke method MyMethod(3, True) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTwiceTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTwiceTests.cs index 76fe8f7..75f21db 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTwiceTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtLeastTwiceTests.cs @@ -178,12 +178,12 @@ but found it only once Matching Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] """); } @@ -226,9 +226,9 @@ but found it only once Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True), - [2] invoke method MyMethod(3, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True), + invoke method MyMethod(3, True) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostOnceTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostOnceTests.cs index 42deb51..b834c9f 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostOnceTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostOnceTests.cs @@ -29,16 +29,16 @@ but found it 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] """); } @@ -93,15 +93,15 @@ but found it twice Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(2, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(2, False) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostTwiceTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostTwiceTests.cs index 2be5397..6d7304e 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostTwiceTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.AtMostTwiceTests.cs @@ -30,17 +30,17 @@ but found it 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(1, False), - [3] invoke method MyMethod(2, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(2, False) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.BetweenTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.BetweenTests.cs index 49515af..5a85bfd 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.BetweenTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.BetweenTests.cs @@ -257,9 +257,9 @@ but found it only 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True), - [2] invoke method MyMethod(3, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True), + invoke method MyMethod(3, True) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ExactlyTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ExactlyTests.cs index 76b170d..0cf2e81 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ExactlyTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ExactlyTests.cs @@ -250,10 +250,10 @@ but found it 4 times Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True), - [2] invoke method MyMethod(3, True), - [3] invoke method MyMethod(4, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True), + invoke method MyMethod(3, True), + invoke method MyMethod(4, True) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.NeverTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.NeverTests.cs index 12b0e9a..51f1d69 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.NeverTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.NeverTests.cs @@ -30,17 +30,17 @@ but found it 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [3] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(2, False), - [3] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(2, False), + invoke method MyMethod(1, False) ] """); } @@ -78,12 +78,12 @@ but found it once Matching Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] """); } @@ -109,14 +109,14 @@ but found it twice Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.OnceTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.OnceTests.cs index 702260a..e4e65c5 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.OnceTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.OnceTests.cs @@ -135,16 +135,16 @@ but found it 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] """); } @@ -211,15 +211,15 @@ but found it twice Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(2, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(2, False) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ThenTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ThenTests.cs index 8ec1de2..f1079ca 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ThenTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.ThenTests.cs @@ -29,18 +29,18 @@ but it invoked method MyMethod(1) too early Matching Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] All Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] """); await That(sut.Mock.Verify.MyMethod(It.Is(1))) @@ -92,18 +92,18 @@ but it invoked method MyMethod(6) not at all Matching Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] All Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] """); @@ -119,18 +119,18 @@ but it invoked method MyMethod(6) not at all Matching Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] All Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] """); @@ -146,18 +146,18 @@ but it invoked method MyMethod(6) not at all Matching Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] All Interactions: [ - [0] invoke method MyMethod(1), - [1] invoke method MyMethod(2), - [2] invoke method MyMethod(3), - [3] invoke method MyMethod(4) + invoke method MyMethod(1), + invoke method MyMethod(2), + invoke method MyMethod(3), + invoke method MyMethod(4) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TimesTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TimesTests.cs index 9802086..0686ae0 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TimesTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TimesTests.cs @@ -227,10 +227,10 @@ but found it 4 times Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True), - [2] invoke method MyMethod(3, True), - [3] invoke method MyMethod(4, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True), + invoke method MyMethod(3, True), + invoke method MyMethod(4, True) ] """); } @@ -275,8 +275,8 @@ but found it twice Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] """); } diff --git a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TwiceTests.cs b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TwiceTests.cs index cbf8179..2c4846b 100644 --- a/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TwiceTests.cs +++ b/Tests/aweXpect.Mockolate.Tests/ThatVerificationResultIs.TwiceTests.cs @@ -136,17 +136,17 @@ but found it 3 times Matching Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [3] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False), - [1] invoke method MyMethod(1, False), - [2] invoke method MyMethod(2, True), - [3] invoke method MyMethod(1, False) + invoke method MyMethod(1, False), + invoke method MyMethod(1, False), + invoke method MyMethod(2, True), + invoke method MyMethod(1, False) ] """); } @@ -196,12 +196,12 @@ but found it only once Matching Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] All Interactions: [ - [0] invoke method MyMethod(1, False) + invoke method MyMethod(1, False) ] """); } @@ -245,10 +245,10 @@ but found it only once Matching Interactions: [ - [0] invoke method MyMethod(1, True), - [1] invoke method MyMethod(2, True), - [2] invoke method MyMethod(3, True), - [3] invoke method MyMethod(4, True) + invoke method MyMethod(1, True), + invoke method MyMethod(2, True), + invoke method MyMethod(3, True), + invoke method MyMethod(4, True) ] """); }