fixed issue of not properly clearing arg matcher stack which lead to errors in subsequent calls

Author: sglienke

Source/Core/Mocking/Spring.Mocking.Interceptor.pas

@@ -305,7 +305,9 @@ procedure TMockInterceptor.InterceptArrange(const invocation: IInvocation);
 begin
   try
     if not Assigned(fMatch) then
-      fMatch := TMatcherFactory.CreateMatchers(invocation.Arguments, invocation.Method.GetParameters);
+      fMatch := TMatcherFactory.CreateMatchers(invocation.Arguments, invocation.Method.GetParameters)
+    else
+      TMatcherFactory.ClearConditionStack;
     if not Assigned(fMatch) then
       fMatch := CreateArgMatch(invocation.Arguments, invocation.Method.GetParameters);
     fExpectedCalls.AddRange(invocation.Method, CreateMethodCalls);
@@ -322,7 +324,9 @@ procedure TMockInterceptor.InterceptAssert(const invocation: IInvocation);
 begin
   try
     if not Assigned(fMatch) then
-      fMatch := TMatcherFactory.CreateMatchers(invocation.Arguments, invocation.Method.GetParameters);
+      fMatch := TMatcherFactory.CreateMatchers(invocation.Arguments, invocation.Method.GetParameters)
+    else
+      TMatcherFactory.ClearConditionStack;
     if fReceivedCalls.TryGetValues(invocation.Method, arguments) then
     begin
       if not Assigned(fMatch) then

Source/Core/Mocking/Spring.Mocking.Matching.pas

@@ -65,6 +65,8 @@   TMatcherFactory = record
     /// </summary>
     class function CreateMatchers(const indizes: TArray<TValue>;
       const parameters: TArray<TRttiParameter>): Predicate<TArray<TValue>>; static;
+
+    class procedure ClearConditionStack; static;
   end;
 
   RefArgs = record
@@ -349,6 +351,11 @@ class function TMatcherFactory.CreateMatcher<T>(
   Result := WrapIndex<T>(index);
 end;
 
+class procedure TMatcherFactory.ClearConditionStack;
+begin
+  conditionStack := nil;
+end;
+
 class function TMatcherFactory.AddMatcher(
   const condition: Predicate<TValue>): Integer;
 begin

Tests/Source/Core/Spring.Tests.Mocking.pas

@@ -221,6 +221,9 @@ procedure TParameterMatchingTests.ArgsStackProperlyCleaned;
   mock.Instance.Test2('', 0, False);
   mock.Received(Times.Once).Test2(Arg.IsAny<string>, Arg.IsAny<Integer>, Arg.IsAny<Boolean>);
 
+  mock.Setup.Executes.When(Args.Any).Test1(Arg.IsAny<Integer>, Arg.IsAny<string>);
+  mock.Setup.Executes.When.Test1(Arg.IsAny<Integer>, Arg.IsAny<string>);
+
   Pass;
 end;