Skip to content

Fix CallBase regression with explicitly implemented interface methods #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stakx merged 3 commits into from
Dec 26, 2017
Merged

Fix CallBase regression with explicitly implemented interface methods #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
679bb7a
Add failing unit test
stakx Dec 26, 2017
5c0f3cb
Fix `CallBase` for explicit interface method impls.
stakx Dec 26, 2017
3fbbf0b
Update the changelog
stakx Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).


## Unreleased

#### Fixed

* `CallBase` regression with explicitly implemented interface methods (@stakx, #558)


## 4.8.0 (2017-12-24)

Same as 4.8.0-rc1 (see below), plus some significant speed improvements.
Expand Down
28 changes: 28 additions & 0 deletions Moq.Tests/Regressions/IssueReportsFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1748,6 +1748,34 @@ private static void RegisterInvocations(IMock<ITest> m, System.Collections.Concu

#endregion

#region 557

public sealed class Issue557
{
[Fact]
public void CallBase_works_when_called_on_AsInterface_mock()
{
var mock = new Mock<MyClass>().As<IMyClass>();
mock.CallBase = true;
Assert.NotNull(mock.Object.DoSomething());
}

public interface IMyClass
{
object DoSomething();
}

public class MyClass : IMyClass
{
public object DoSomething()
{
return new object();
}
}
}

#endregion

// Old @ Google Code

#region #47
Expand Down
40 changes: 37 additions & 3 deletions Source/Interception/InterceptionAspects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,45 @@ public override InterceptionAction Handle(Invocation invocation, Mock mock)

var method = invocation.Method;

if (mock.CallBase && !method.IsAbstract)
if (mock.CallBase)
{
invocation.ReturnBase();
var declaringType = method.DeclaringType;
if (declaringType.GetTypeInfo().IsInterface)
{
if (mock.TargetType.GetTypeInfo().IsInterface)
{
// Case 1: Interface method of an interface proxy.
// There is no base method to call, so fall through.
}
else
{
Debug.Assert(mock.TargetType.GetTypeInfo().IsClass);
Debug.Assert(mock.ImplementsInterface(declaringType));

// Case 2: Explicitly implemented interface method of a class proxy.
// Only call base method if it isn't an event accessor.
if (!method.LooksLikeEventAttach() && !method.LooksLikeEventDetach())
{
invocation.ReturnBase();
return InterceptionAction.Stop;
}
}
}
else
{
Debug.Assert(declaringType.GetTypeInfo().IsClass);

// Case 3: Non-interface method of a class proxy.
// Only call base method if it isn't abstract.
if (!method.IsAbstract)
{
invocation.ReturnBase();
return InterceptionAction.Stop;
}
}
}
else if (method.ReturnType == typeof(void))

if (method.ReturnType == typeof(void))
{
invocation.Return();
}
Expand Down