Must mark setups resulting from DefaultValue.Mock as matched

devlooped · Jun 18, 2020 · 4d6c7bd · 4d6c7bd
1 parent 8eb2999
commit 4d6c7bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Moq/Interception/InterceptionAspects.cs b/src/Moq/Interception/InterceptionAspects.cs
@@ -264,9 +264,13 @@ public static void Handle(Invocation invocation, Mock mock)
 				var returnValue = mock.GetDefaultValue(method, out var innerMock);
 				if (innerMock != null && invocation.MatchingSetup == null)
 				{
-					mock.AddInnerMockSetup(invocation, returnValue);
+					var setup = mock.AddInnerMockSetup(invocation, returnValue);
+					setup.Execute(invocation);
+				}
+				else
+				{
+					invocation.Return(returnValue);
 				}
-				invocation.Return(returnValue);
 			}
 		}
 	}

diff --git a/src/Moq/Mock.cs b/src/Moq/Mock.cs
@@ -790,7 +790,7 @@ internal object GetDefaultValue(MethodInfo method, out Mock candidateInnerMock,
 
 		#region Inner mocks
 
-		internal void AddInnerMockSetup(Invocation invocation, object returnValue)
+		internal InnerMockSetup AddInnerMockSetup(Invocation invocation, object returnValue)
 		{
 			var method = invocation.Method;
 
@@ -819,7 +819,9 @@ internal void AddInnerMockSetup(Invocation invocation, object returnValue)
 				Debug.Assert(property.CanRead(out var getter) && invocation.Method == getter);
 			}
 
-			this.MutableSetups.Add(new InnerMockSetup(originalExpression: null, this, new InvocationShape(expression, invocation.Method, arguments, exactGenericTypeArguments: true), returnValue));
+			var setup = new InnerMockSetup(originalExpression: null, this, new InvocationShape(expression, invocation.Method, arguments, exactGenericTypeArguments: true), returnValue);
+			this.MutableSetups.Add(setup);
+			return setup;
 		}
 
 		#endregion