diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs index d7de36724a..6dfca7f57a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs @@ -218,7 +218,7 @@ namespace Microsoft.AspNet.Mvc var bindingProvider = new Mock(MockBehavior.Strict); bindingProvider .Setup(bp => bp.GetActionBindingContextAsync(It.IsAny())) - .Returns(() => Task.FromResult(null)); + .Returns(Task.FromResult(null)); return new DefaultActionSelector(actionProvider.Object, bindingProvider.Object, loggerFactory); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs index cbf434b64a..fe213fe1b9 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs @@ -71,7 +71,11 @@ namespace Microsoft.AspNet.Mvc.Test mock.As() .Setup(f => f.OnActionExecuting(It.IsAny())) - .Callback(c => c.Result = new NoOpResult()); + .Callback(c => + { + mock.ToString(); + c.Result = new NoOpResult(); + }); mock.As() .Setup(f => f.OnActionExecuted(It.IsAny())) @@ -154,7 +158,11 @@ namespace Microsoft.AspNet.Mvc.Test mock.As() .Setup(f => f.OnResultExecuting(It.IsAny())) - .Callback(c => c.Result = new NoOpResult()); + .Callback(c => + { + mock.ToString(); + c.Result = new NoOpResult(); + }); mock.As() .Setup(f => f.OnResultExecuted(It.IsAny())) @@ -188,7 +196,11 @@ namespace Microsoft.AspNet.Mvc.Test mock.As() .Setup(f => f.OnResultExecuting(It.IsAny())) - .Callback(c => c.Cancel = true); + .Callback(c => + { + mock.ToString(); + c.Cancel = true; + }); mock.As() .Setup(f => f.OnResultExecuted(It.IsAny())) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs index cc9a477b5d..a1dcec7e7c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs @@ -146,6 +146,7 @@ namespace Microsoft.AspNet.Mvc .Setup(f => f.OnException(It.IsAny())) .Callback(context => { + filter2.ToString(); context.Exception = null; }) .Verifiable(); @@ -172,6 +173,7 @@ namespace Microsoft.AspNet.Mvc .Setup(f => f.OnExceptionAsync(It.IsAny())) .Callback(context => { + filter2.ToString(); context.Exception = null; }) .Returns((context) => Task.FromResult(null)) @@ -860,7 +862,11 @@ namespace Microsoft.AspNet.Mvc var filter2 = new Mock(MockBehavior.Strict); filter2 .Setup(f => f.OnResultExecuting(It.IsAny())) - .Callback(c => c.Cancel = true) + .Callback(c => + { + filter2.ToString(); + c.Cancel = true; + }) .Verifiable(); var filter3 = new Mock(MockBehavior.Strict); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs index 187be78337..a787cc760a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs @@ -145,6 +145,7 @@ namespace Microsoft.AspNet.Mvc.Core .Setup(v => v.RenderAsync(It.IsAny())) .Callback(async (ViewContext v) => { + view.ToString(); await v.Writer.WriteAsync(FormatOutput(v.ViewData.ModelMetadata)); }) .Returns(Task.FromResult(0)); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs index 74d936ae83..4ef81dac0e 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs @@ -540,7 +540,11 @@ namespace Microsoft.AspNet.Mvc.Core.Test var target = new Mock(MockBehavior.Strict); target .Setup(e => e.GetVirtualPath(It.IsAny())) - .Callback(c => c.IsBound = true) + .Callback(c => + { + rt.ToString(); + c.IsBound = true; + }) .Returns(rc => null); rt.DefaultHandler = target.Object; var serviceProviderMock = new Mock(); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ViewResultTest.cs index 1d08d8a588..4c0489c459 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ViewResultTest.cs @@ -28,6 +28,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test view.Setup(v => v.RenderAsync(It.IsAny())) .Callback((ViewContext v) => { + view.ToString(); v.Writer.Write("abcd"); }) .Returns(Task.FromResult(0)); @@ -78,6 +79,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test view.Setup(v => v.RenderAsync(It.IsAny())) .Callback((ViewContext v) => { + view.ToString(); v.Writer.Write("abcd"); }) .Returns(Task.FromResult(0)); @@ -139,6 +141,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test view.Setup(v => v.RenderAsync(It.IsAny())) .Callback((ViewContext v) => { + view.ToString(); v.Writer.Write(longString); throw new Exception(); }); diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs index 3defb68ea1..db0648a789 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding var provider = new Mock { CallBase = true }; provider.Setup(p => p.AbstractGetValidators(metadata, It.IsAny>())) .Callback>((m, attributes) => callbackAttributes = attributes) - .Returns(() => null) + .Returns((IEnumerable)null) .Verifiable(); // Act @@ -44,7 +44,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding Mock provider = new Mock { CallBase = true }; provider.Setup(p => p.AbstractGetValidators(metadata, It.IsAny>())) .Callback>((m, attributes) => callbackAttributes = attributes) - .Returns(() => null) + .Returns((IEnumerable)null) .Verifiable(); // Act @@ -64,7 +64,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding Mock provider = new Mock { CallBase = true }; provider.Setup(p => p.AbstractGetValidators(metadata, It.IsAny>())) .Callback>((m, attributes) => callbackAttributes = attributes) - .Returns(() => null) + .Returns((IEnumerable)null) .Verifiable(); // Act