Fix erroneous parameter count mismatch by using HasCompatibleParamete…

…rList method
idigra · Aug 8, 2018 · dac25d6 · dac25d6
1 parent 70be99c
commit dac25d6
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Moq/MethodCallReturn.cs b/src/Moq/MethodCallReturn.cs
@@ -171,15 +171,19 @@ private void ValidateReturnDelegate(Delegate callback)
  {
  var callbackMethod = callback.GetMethodInfo();
 
+ var expectedParams = this.Method.GetParameters();
+ var actualParams = callback.GetMethodInfo().GetParameters();
+ if (callback.HasCompatibleParameterList(expectedParams))
+ {
+ return;
+ }
+
  // validate number of parameters:
 
  var numberOfActualParameters = callbackMethod.GetParameters().Length;
- if (callbackMethod.IsStatic)
+ if (callbackMethod.IsExtensionMethod())
  {
- if (callbackMethod.IsExtensionMethod() || callback.Target != null)
- {
- numberOfActualParameters--;
- }
+ numberOfActualParameters--;
  }
 
  if (numberOfActualParameters > 0)