Skip to content
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.

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

Moq Reset should clear all existing calls in the interceptor #277

Merged
merged 1 commit into from
Aug 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Source/Interceptor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ public void AddCall(IProxyCall call, SetupKind kind)
InterceptionContext.AddOrderedCall(call);
}

internal void ClearCalls()
{
calls.Clear();
}

private IEnumerable<IInterceptStrategy> InterceptionStrategies()
{
yield return new HandleDestructor();
Expand Down
1 change: 1 addition & 0 deletions Source/MockExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public static void Reset(this Mock mock)
{
mock.Interceptor.InterceptionContext.ClearOrderedCalls();
mock.Interceptor.InterceptionContext.ClearEventHandlers();
mock.Interceptor.ClearCalls();
mock.ResetCalls();
}
}
Expand Down
50 changes: 50 additions & 0 deletions UnitTests/ExtensionsFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,56 @@ public void SetupDoesNotApplyAfterMockWasReset()
var result = mock.Object.Execute("ping");
Assert.Null(result);
}

[Fact]

public void Loose()
{
var myMock = new Mock<IEnumerable<int>>(MockBehavior.Loose);
myMock
.Setup(a => a.ToString())
.Returns("Hello");
myMock.Reset();
Assert.NotEqual("Hello", myMock.Object.ToString());
myMock.VerifyAll();
}

[Fact]

public void Strict()
{
var myMock = new Mock<IEnumerable<int>>(MockBehavior.Strict);
myMock
.Setup(a => a.ToString())
.Returns("Hello");
myMock.Reset();
Assert.NotEqual("Hello", myMock.Object.ToString());
myMock.VerifyAll();
}

[Fact]

public void LooseNoCall()
{
var myMock = new Mock<IEnumerable<int>>(MockBehavior.Loose);
myMock
.Setup(a => a.ToString())
.Returns("Hello");
myMock.Reset();
myMock.VerifyAll();
}

[Fact]

public void StrictNoCall()
{
var myMock = new Mock<IEnumerable<int>>(MockBehavior.Strict);
myMock
.Setup(a => a.ToString())
.Returns("Hello");
myMock.Reset();
myMock.VerifyAll();
}
#endregion
}

Expand Down