Call original virtual method if the parameters does not match (#135)

* Support for records in ItRec
Support for custom EqualityComparer in ItRec

* Fixed warnings and unnecessary code

* Support record types for argument matching (without matchers)

* Call original virtual method if the parameters does not match

Author: Laurensvanrun

Source/Delphi.Mocks.Interfaces.pas

@@ -115,7 +115,7 @@ interface
     //Verification
     function Verify(var report : string) : boolean;
 
-    function BehaviorDefined: Boolean;
+    function FindBestBehavior(const Args: TArray<TValue>) : IBehavior;
   end;
 
   IVerify = interface

Source/Delphi.Mocks.MethodData.pas

@@ -96,8 +96,6 @@   TMethodData = class(TInterfacedObject,IMethodData)
     procedure After(const AAfterMethodName : string);
 
     function Verify(var report : string) : boolean;
-
-    function BehaviorDefined: Boolean;
   public
     constructor Create(const ATypeName : string; const AMethodName : string; const ASetupParameters: TSetupMethodDataParameters; const AAutoMocker : IAutoMock = nil);
     destructor Destroy;override;
@@ -265,11 +263,6 @@ function TMethodData.FindExpectation(const expectationTypes : TExpectationTypes)
   end;
 end;
 
-function TMethodData.BehaviorDefined: Boolean;
-begin
-  Result := (FBehaviors.Count <> 0);
-end;
-
 procedure TMethodData.MockNoBehaviourRecordHit(const Args: TArray<TValue>; const AExpectationHitCtr : Integer; const returnType: TRttiType; out Result: TValue);
 var
   behavior : IBehavior;

Source/Delphi.Mocks.ObjectProxy.pas

@@ -106,13 +106,6 @@ procedure TObjectProxy<T>.DoBefore(Instance: TObject; Method: TRttiMethod; const
     pInfo := TypeInfo(T);
     methodData := GetMethodData(method.Name,pInfo.NameStr);
 
-    //Call the original (virtual) method if:
-    //-we are not a stub
-    //-we have not defined any behavior (of course we count hits)
-    //-the actual method is not an abstract method
-    //-we are not setting up
-    DoInvoke := not (FIsStubOnly or methodData.BehaviorDefined or Method.IsAbstract or (FSetupMode <> TSetupMode.None));
-
     //Included instance as first argument because TExpectation.Match
     //deduces that the first argument is the object instance.
     l := Length(Args);
@@ -124,6 +117,13 @@ procedure TObjectProxy<T>.DoBefore(Instance: TObject; Method: TRttiMethod; const
       vArgs[i] := Args[i-1];
     end;
 
+    //Call the original (virtual) method if:
+    //-we are not a stub
+    //-we have not defined any behavior (of course we count hits)
+    //-the actual method is not an abstract method
+    //-we are not setting up
+    DoInvoke := not (FIsStubOnly or (methodData.FindBestBehavior(vArgs) <> nil) or Method.IsAbstract or (FSetupMode <> TSetupMode.None));
+
     Self.DoInvoke(Method,vArgs,Result);
 
     for i := 1 to l do

Tests/Delphi.Mocks.Tests.ObjectProxy.pas

@@ -36,7 +36,8 @@   TCommand = class
     procedure Run(value: Integer);virtual;abstract;
     procedure TestVarParam(var msg : string);virtual;abstract;
     procedure TestOutParam(out msg : string);virtual;abstract;
-    function VirtualMethod: Integer; virtual;
+    function VirtualMethod: Integer; overload; virtual;
+    function VirtualMethod(const Arg: String): Integer; overload; virtual;
     function NonVirtualMethod: Integer;
 
     property VirtualMethodCalled: Boolean read FVirtualMethodCalled;
@@ -76,6 +77,12 @@   TTestObjectProxy = class
     procedure WillRaiseMockNonVirtualMethod;
     [Test]
     procedure VirtualMethodNotCalledDuringMockSetup;
+    [Test]
+    procedure VirtualMethodCalledIfNoBehaviorDefined;
+    [Test]
+    procedure VirtualMethodNotCalledIfBehaviorMatches;
+    [Test]
+    procedure VirtualMethodCalledIfBehaviorNotMatches;
   end;
   {$M-}
 
@@ -167,6 +174,27 @@ procedure TTestObjectProxy.TestVarParam;
   Assert.Pass;
 end;
 
+procedure TTestObjectProxy.VirtualMethodCalledIfBehaviorNotMatches;
+var
+  mock : TMock<TCommand>;
+begin
+  mock := TMock<TCommand>.Create;
+  mock.Setup.WillReturn(2).When.VirtualMethod('test');
+
+  Assert.AreEqual(1, mock.Instance.VirtualMethod('test2'));
+  Assert.IsTrue(mock.Instance.VirtualMethodCalled);
+end;
+
+procedure TTestObjectProxy.VirtualMethodCalledIfNoBehaviorDefined;
+var
+  mock : TMock<TCommand>;
+begin
+  mock := TMock<TCommand>.Create;
+
+  Assert.AreEqual(1, mock.Instance.VirtualMethod('test'));
+  Assert.IsTrue(mock.Instance.VirtualMethodCalled);
+end;
+
 procedure TTestObjectProxy.VirtualMethodNotCalledDuringMockSetup;
 var
   mock : TMock<TCommand>;
@@ -179,6 +207,17 @@ procedure TTestObjectProxy.VirtualMethodNotCalledDuringMockSetup;
   Assert.IsFalse(mock.Instance.VirtualMethodCalled);
 end;
 
+procedure TTestObjectProxy.VirtualMethodNotCalledIfBehaviorMatches;
+var
+  mock : TMock<TCommand>;
+begin
+  mock := TMock<TCommand>.Create;
+  mock.Setup.WillReturn(2).When.VirtualMethod('test');
+  Assert.AreEqual(2, mock.Instance.VirtualMethod('test'));
+
+  Assert.IsFalse(mock.Instance.VirtualMethodCalled);
+end;
+
 procedure TTestObjectProxy.MockNoArgProcedureUsingAtLeastOnceWhen;
 var
   mock : TMock<TCommand>;
@@ -324,6 +363,12 @@ function TCommand.NonVirtualMethod: Integer;
   Result := 1;
 end;
 
+function TCommand.VirtualMethod(const Arg: String): Integer;
+begin
+  FVirtualMethodCalled := True;
+  Result := 1;
+end;
+
 function TCommand.VirtualMethod: Integer;
 begin
   FVirtualMethodCalled := True;