New Moq behaviour workarounds

- work around devlooped/moq#129 and devlooped/moq#212; Moq creates proxies for all `interface` methods
 - e.g. set up `IDisposable.Dispose()` calls
 - related bug devlooped/moq#212 means we can't use `MockBehavior.Strict` in some cases
  - especially when method returns a value and therefore can't be set up to call base
  - `CallBase = true` is often required in these cases
- work around devlooped/moq#149; `DefaultValue.Mock` restrictions
 - where necessary, explicitly set up members instead
- work around odd failures in `JsonResultTest` using `SetupSet()` on deep properties
 - use `MockBehavior.Strict` in `NullContentIsNotOutput()` to confirm `Write()` is not called
- handle less-predictable proxy type names

Author: dougbu

test/Microsoft.Web.Mvc.Test/Test/AjaxOnlyAttributeTest.cs

@@ -51,7 +51,7 @@ public void IsValidForRequestThrowsIfControllerContextIsNull()
 
         private static ControllerContext GetControllerContext(bool containsHeader)
         {
-            Mock<ControllerContext> mockContext = new Mock<ControllerContext> { DefaultValue = DefaultValue.Mock };
+            Mock<ControllerContext> mockContext = new Mock<ControllerContext>();
 
             NameValueCollection nvc = new NameValueCollection();
             if (containsHeader)

test/System.Web.Http.Owin.Test/HttpMessageHandlerAdapterTest.cs

@@ -22,7 +22,6 @@
 using Microsoft.Owin;
 using Microsoft.TestCommon;
 using Moq;
-using Moq.Protected;
 
 namespace System.Web.Http.Owin
 {
@@ -1705,7 +1704,7 @@ private static IExceptionLogger CreateDummyExceptionLogger()
         private static HttpMessageHandler CreateDummyMessageHandler()
         {
             Mock<HttpMessageHandler> mock = new Mock<HttpMessageHandler>(MockBehavior.Strict);
-            mock.Protected().Setup("Dispose", ItExpr.IsAny<bool>());
+            mock.As<IDisposable>().Setup(c => c.Dispose());
             return mock.Object;
         }
 

test/System.Web.Http.Owin.Test/HttpMessageHandlerOptionsTests.cs

@@ -7,7 +7,6 @@
 using System.Web.Http.Hosting;
 using Microsoft.TestCommon;
 using Moq;
-using Moq.Protected;
 
 namespace System.Web.Http.Owin
 {
@@ -117,7 +116,7 @@ private static IExceptionLogger CreateDummyExceptionLogger()
         private static HttpMessageHandler CreateDummyMessageHandler()
         {
             Mock<HttpMessageHandler> mock = new Mock<HttpMessageHandler>(MockBehavior.Strict);
-            mock.Protected().Setup("Dispose", ItExpr.IsAny<bool>());
+            mock.As<IDisposable>().Setup(c => c.Dispose());
             return mock.Object;
         }
 

test/System.Web.Http.Owin.Test/NonOwnedStreamTests.cs

@@ -29,6 +29,7 @@ public void Read_DelegatesToInnerStream()
             mock.Setup(s => s.Read(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(expectedBytesRead);
             mock.Setup(s => s.Close());
+            mock.As<IDisposable>().Setup(s => s.Dispose());
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -52,6 +53,7 @@ public void Read_IfDisposed_Throws()
             // Arrange
             Mock<Stream> mock = new Mock<Stream>(MockBehavior.Strict);
             mock.Setup(s => s.Close());
+            mock.As<IDisposable>().Setup(s => s.Dispose());
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -77,6 +79,7 @@ public void CanRead_DelegatesToInnerStream(bool expectedCanRead)
             mock.SetupGet(s => s.CanRead)
                 .Returns(expectedCanRead);
             mock.Setup(s => s.Close());
+            mock.As<IDisposable>().Setup(s => s.Dispose());
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -95,6 +98,7 @@ public void CanRead_IfDisposed_ReturnsFalse()
             // Arrange
             Mock<Stream> mock = new Mock<Stream>(MockBehavior.Strict);
             mock.Setup(s => s.Close());
+            mock.As<IDisposable>().Setup(s => s.Dispose());
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -116,7 +120,8 @@ public void Dispose_DoesNotDisposeInnerStream()
             bool innerStreamDisposed = false;
             Mock<Stream> mock = new Mock<Stream>(MockBehavior.Strict);
             mock.Setup(s => s.Close()).Callback(() => innerStreamDisposed = true);
-            mock.Protected().Setup("Dispose", ItExpr.IsAny<bool>()).Callback(() => innerStreamDisposed = true);
+            mock.As<IDisposable>().Setup(s => s.Dispose());
+            mock.Protected().Setup("Dispose", true).Callback(() => innerStreamDisposed = true);
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -134,6 +139,7 @@ public void Dispose_IfCalledTwice_DoesNotThrow()
             // Arrange
             Mock<Stream> mock = new Mock<Stream>(MockBehavior.Strict);
             mock.Setup(s => s.Close());
+            mock.As<IDisposable>().Setup(s => s.Dispose());
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -152,7 +158,8 @@ public void Close_DoesNotDisposeInnerStream()
             bool innerStreamDisposed = false;
             Mock<Stream> mock = new Mock<Stream>(MockBehavior.Strict);
             mock.Setup(s => s.Close()).Callback(() => innerStreamDisposed = true);
-            mock.Protected().Setup("Dispose", ItExpr.IsAny<bool>()).Callback(() => innerStreamDisposed = true);
+            mock.As<IDisposable>().Setup(s => s.Dispose());
+            mock.Protected().Setup("Dispose", true).Callback(() => innerStreamDisposed = true);
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))
@@ -170,6 +177,7 @@ public void Close_DisposesThisObject()
             // Arrange
             Mock<Stream> mock = new Mock<Stream>(MockBehavior.Strict);
             mock.Setup(s => s.Close());
+            mock.As<IDisposable>().Setup(s => s.Dispose());
 
             using (Stream innerStream = mock.Object)
             using (Stream product = CreateProductUnderTest(innerStream))

test/System.Web.Http.SelfHost.Test/SelfHostHttpRequestContextTests.cs

@@ -6,9 +6,6 @@
 using System.Diagnostics.Contracts;
 using System.IdentityModel.Claims;
 using System.IdentityModel.Policy;
-using System.IdentityModel.Selectors;
-using System.IdentityModel.Tokens;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Security.Cryptography.X509Certificates;
@@ -21,7 +18,6 @@
 using System.Web.Http.Routing;
 using Microsoft.TestCommon;
 using Moq;
-using Moq.Protected;
 
 namespace System.Web.Http.SelfHost
 {
@@ -705,7 +701,7 @@ private static SecurityMessageProperty CreateSecurityProperty(X509Certificate2 c
         private static Mock<RequestContext> CreateServiceModelContextMock()
         {
             Mock<RequestContext> mock = new Mock<RequestContext>(MockBehavior.Strict);
-            mock.Protected().Setup("Dispose", true);
+            mock.As<IDisposable>().Setup(c => c.Dispose());
             return mock;
         }
 

test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs

@@ -152,8 +152,10 @@ public void Create_ThrowsForNullDependencyScope()
                 "An error occurred when trying to create a controller of type 'SimpleController'. Make sure that the controller has a parameterless public constructor.",
                 exception.Message);
             Assert.NotNull(exception.InnerException);
-            Assert.Equal(
-                "A dependency resolver of type 'IDependencyResolverProxy' returned an invalid value of null from its BeginScope method. If the container does not have a concept of scope, consider returning a scope that resolves in the root of the container instead.",
+            Assert.Contains("A dependency resolver of type 'ObjectProxy_", exception.InnerException.Message);
+            Assert.Contains(
+                "' returned an invalid value of null from its BeginScope method. If the container does not have a concept " +
+                "of scope, consider returning a scope that resolves in the root of the container instead.",
                 exception.InnerException.Message);
 
             mockResolver.Verify();

test/System.Web.Http.Test/Dispatcher/HttpRoutingDispatcherTest.cs

@@ -109,7 +109,7 @@ public async Task SendAsync_UsesRouteDataFromRequestContext()
         {
             // Arrange
             Mock<HttpMessageHandler> doNotUseDefaultHandlerMock = new Mock<HttpMessageHandler>(MockBehavior.Strict);
-            doNotUseDefaultHandlerMock.Protected().Setup("Dispose", true);
+            doNotUseDefaultHandlerMock.As<IDisposable>().Setup(c => c.Dispose());
 
             using (HttpConfiguration configuration = new HttpConfiguration())
             using (HttpMessageHandler doNoUseDefaultHandler = doNotUseDefaultHandlerMock.Object)
@@ -145,7 +145,7 @@ public async Task SendAsync_IgnoreRoute_UsesRouteDataWithStopRoutingHandlerFromR
         {
             // Arrange
             Mock<HttpMessageHandler> doNotUseDefaultHandlerMock = new Mock<HttpMessageHandler>(MockBehavior.Strict);
-            doNotUseDefaultHandlerMock.Protected().Setup("Dispose", true);
+            doNotUseDefaultHandlerMock.As<IDisposable>().Setup(c => c.Dispose());
 
             using (HttpConfiguration configuration = new HttpConfiguration())
             using (HttpMessageHandler doNoUseDefaultHandler = doNotUseDefaultHandlerMock.Object)

test/System.Web.Http.Test/ExceptionHandling/ExceptionHandlerTests.cs

@@ -14,7 +14,7 @@ public class ExceptionHandlerTests
         public void HandleAsync_IfContextIsNull_Throws()
         {
             // Arrange
-            Mock<ExceptionHandler> mock = new Mock<ExceptionHandler>(MockBehavior.Strict);
+            Mock<ExceptionHandler> mock = new Mock<ExceptionHandler> { CallBase = true };
             IExceptionHandler product = mock.Object;
 
             ExceptionHandlerContext context = null;
@@ -28,7 +28,7 @@ public void HandleAsync_IfContextIsNull_Throws()
         public void HandleAsync_IfShouldHandleReturnsTrue_DelegatesToHandleAsyncCore()
         {
             // Arrange
-            Mock<ExceptionHandler> mock = new Mock<ExceptionHandler>(MockBehavior.Strict);
+            Mock<ExceptionHandler> mock = new Mock<ExceptionHandler> { CallBase = true };
             Task expectedTask = CreateCompletedTask();
             mock.Setup(h => h.ShouldHandle(It.IsAny<ExceptionHandlerContext>())).Returns(true);
             mock

test/System.Web.Http.Test/ExceptionHandling/ExceptionLoggerTests.cs

@@ -16,7 +16,8 @@ public class ExceptionLoggerTests
         public void LogAsync_IfContextIsNull_Throws()
         {
             // Arrange
-            Mock<ExceptionLogger> mock = new Mock<ExceptionLogger>(MockBehavior.Strict);
+            Mock<ExceptionLogger> mock = new Mock<ExceptionLogger> { CallBase = true };
+
             IExceptionLogger product = mock.Object;
 
             ExceptionLoggerContext context = null;
@@ -30,7 +31,7 @@ public void LogAsync_IfContextIsNull_Throws()
         public void LogAsync_IfShouldLogReturnsTrue_DelegatesToLogAsyncCore()
         {
             // Arrange
-            Mock<ExceptionLogger> mock = new Mock<ExceptionLogger>(MockBehavior.Strict);
+            Mock<ExceptionLogger> mock = new Mock<ExceptionLogger> { CallBase = true };
             Task expectedTask = CreateCompletedTask();
             mock.Setup(h => h.ShouldLog(It.IsAny<ExceptionLoggerContext>())).Returns(true);
             mock
@@ -59,7 +60,7 @@ public void LogAsync_IfShouldLogReturnsTrue_DelegatesToLogAsyncCore()
         public void LogAsync_IfShouldLogReturnsFalse_ReturnsCompletedTask()
         {
             // Arrange
-            Mock<ExceptionLogger> mock = new Mock<ExceptionLogger>(MockBehavior.Strict);
+            Mock<ExceptionLogger> mock = new Mock<ExceptionLogger> { CallBase = true };
             mock.Setup(h => h.ShouldLog(It.IsAny<ExceptionLoggerContext>())).Returns(false);
 
             IExceptionLogger product = mock.Object;

test/System.Web.Http.Test/HttpRouteCollectionTest.cs

@@ -6,7 +6,6 @@
 using System.Web.Http.Routing;
 using Microsoft.TestCommon;
 using Moq;
-using Moq.Protected;
 
 namespace System.Web.Http
 {
@@ -19,10 +18,10 @@ public void HttpRouteCollection_Dispose_UniquifiesHandlers()
             var collection = new HttpRouteCollection();
 
             var handler1 = new Mock<HttpMessageHandler>();
-            handler1.Protected().Setup("Dispose", true).Verifiable();
+            handler1.As<IDisposable>().Setup(c => c.Dispose()).Verifiable();
 
             var handler2 = new Mock<HttpMessageHandler>();
-            handler1.Protected().Setup("Dispose", true).Verifiable();
+            handler1.As<IDisposable>().Setup(c => c.Dispose()).Verifiable();
 
             var route1 = new Mock<IHttpRoute>();
             route1.SetupGet(r => r.Handler).Returns(handler1.Object);
@@ -41,8 +40,8 @@ public void HttpRouteCollection_Dispose_UniquifiesHandlers()
             collection.Dispose();
 
             // Assert
-            handler1.Protected().Verify("Dispose", Times.Once(), true);
-            handler2.Protected().Verify("Dispose", Times.Once(), true);
+            handler1.As<IDisposable>().Verify(c => c.Dispose(), Times.Once());
+            handler2.As<IDisposable>().Verify(c => c.Dispose(), Times.Once());
         }
 
         [Fact]

test/System.Web.Http.Test/HttpServerTest.cs

@@ -582,7 +582,7 @@ private static IExceptionLogger CreateDummyExceptionLogger()
         private static HttpMessageHandler CreateDummyMessageHandler()
         {
             Mock<HttpMessageHandler> mock = new Mock<HttpMessageHandler>(MockBehavior.Strict);
-            mock.Protected().Setup("Dispose", ItExpr.IsAny<bool>());
+            mock.As<IDisposable>().Setup(c => c.Dispose());
             return mock.Object;
         }
 

test/System.Web.Http.Test/Routing/DirectRouteProviderContextTests.cs

@@ -40,9 +40,10 @@ public void CreateBuilderWithResolverAndBuild_Throws_WhenConstraintResolverRetur
             Mock<IInlineConstraintResolver> constraintResolver = new Mock<IInlineConstraintResolver>();
             constraintResolver.Setup(r => r.ResolveConstraint("constraint")).Returns<IHttpRouteConstraint>(null);
 
-            Assert.Throws<InvalidOperationException>(
-                () => BuildWithResolver(@"hello/{param:constraint}", constraintResolver: constraintResolver.Object),
-                "The inline constraint resolver of type 'IInlineConstraintResolverProxy' was unable to resolve the following inline constraint: 'constraint'.");
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => BuildWithResolver(@"hello/{param:constraint}", constraintResolver: constraintResolver.Object));
+            Assert.Contains("The inline constraint resolver of type 'ObjectProxy_", ex.Message);
+            Assert.Contains("' was unable to resolve the following inline constraint: 'constraint'.", ex.Message);
         }
 
         [Fact]

test/System.Web.Mvc.Test/Html/Test/RenderPartialExtensionsTest.cs

@@ -98,7 +98,7 @@ public static SpyHtmlHelper Create()
             {
                 ViewDataDictionary viewData = new ViewDataDictionary();
 
-                Mock<ViewContext> mockViewContext = new Mock<ViewContext>() { DefaultValue = DefaultValue.Mock };
+                Mock<ViewContext> mockViewContext = new Mock<ViewContext>();
                 mockViewContext.Setup(c => c.HttpContext.Response.Output).Throws(new Exception("Response.Output should never be called."));
                 mockViewContext.Setup(c => c.ViewData).Returns(viewData);
                 mockViewContext.Setup(c => c.Writer).Returns(new StringWriter());

test/System.Web.Mvc.Test/Test/ControllerActionInvokerTest.cs

@@ -2463,7 +2463,8 @@ private static ControllerContext GetControllerContext(ControllerBase controller,
                 }
             }
 
-            Mock<ControllerContext> mockControllerContext = new Mock<ControllerContext>() { DefaultValue = DefaultValue.Mock };
+            Mock<ControllerContext> mockControllerContext = new Mock<ControllerContext>();
+            mockControllerContext.SetupGet(c => c.RouteData).Returns(new RouteData());
 
             mockControllerContext.Setup(c => c.HttpContext.Request.ValidateInput()).Callback(() =>
             {

test/System.Web.Mvc.Test/Test/HtmlHelperTest.cs

@@ -1171,8 +1171,10 @@ public static TestableHtmlHelper Create()
             {
                 ViewDataDictionary viewData = new ViewDataDictionary();
 
-                Mock<ViewContext> mockViewContext = new Mock<ViewContext>() { DefaultValue = DefaultValue.Mock };
+                Mock<ViewContext> mockViewContext = new Mock<ViewContext>();
                 mockViewContext.Setup(c => c.HttpContext.Response.Output).Throws(new Exception("Response.Output should never be called."));
+                mockViewContext.SetupGet(c => c.TempData).Returns(new TempDataDictionary());
+                mockViewContext.SetupGet(c => c.View).Returns(Mock.Of<IView>());
                 mockViewContext.Setup(c => c.ViewData).Returns(viewData);
                 mockViewContext.Setup(c => c.Writer).Returns(new StringWriter());
 

test/System.Web.Mvc.Test/Test/JsonResultTest.cs

@@ -99,10 +99,15 @@ public void NullContentIsNotOutput()
             Encoding contentEncoding = Encoding.UTF8;
 
             // Arrange expectations
-            Mock<ControllerContext> mockControllerContext = new Mock<ControllerContext>();
+            Mock<ControllerContext> mockControllerContext = new Mock<ControllerContext>(MockBehavior.Strict);
             mockControllerContext.SetupGet(c => c.HttpContext.Request.HttpMethod).Returns("POST").Verifiable();
-            mockControllerContext.SetupSet(c => c.HttpContext.Response.ContentType = contentType).Verifiable();
-            mockControllerContext.SetupSet(c => c.HttpContext.Response.ContentEncoding = contentEncoding).Verifiable();
+
+            // Though most other tests run fine with SetupSet(c => c.HttpContext.Reqsponse.ContentType = ...), this
+            // one does not. Explicitly ensure Response property is not null.
+            var response = new Mock<HttpResponseBase>(MockBehavior.Strict);
+            response.SetupSet(r => r.ContentType = contentType).Verifiable();
+            response.SetupSet(r => r.ContentEncoding = contentEncoding).Verifiable();
+            mockControllerContext.SetupGet(c => c.HttpContext.Response).Returns(response.Object);
 
             JsonResult result = new JsonResult
             {
@@ -115,6 +120,7 @@ public void NullContentIsNotOutput()
 
             // Assert
             mockControllerContext.Verify();
+            response.Verify();
         }
 
         [Fact]
@@ -176,16 +182,21 @@ public void NullMaxJsonLengthDefaultIsUsed()
             // Arrange
             string data = new String('1', 2100000);
 
-            Mock<ControllerContext> mockControllerContext = new Mock<ControllerContext>();
-            mockControllerContext.SetupGet(c => c.HttpContext.Request.HttpMethod).Returns("POST").Verifiable();
-            mockControllerContext.SetupSet(c => c.HttpContext.Response.ContentType = "application/json").Verifiable();
+            Mock<ControllerContext> mockControllerContext = new Mock<ControllerContext>(MockBehavior.Strict);
+            mockControllerContext.SetupGet(c => c.HttpContext.Request.HttpMethod).Returns("POST");
+
+            // Though most other tests run fine with SetupSet(c => c.HttpContext.Reqsponse.ContentType = ...), this
+            // one does not. Explicitly ensure Response property is not null.
+            var response = new Mock<HttpResponseBase>(MockBehavior.Strict);
+            response.SetupSet(r => r.ContentType = "application/json");
+            mockControllerContext.SetupGet(c => c.HttpContext.Response).Returns(response.Object);
 
             JsonResult result = new JsonResult
             {
                 Data = data
             };
 
-            // Act & Assert 
+            // Act & Assert
             Assert.Throws<InvalidOperationException>(
                 () => result.ExecuteResult(mockControllerContext.Object),
                 "Error during serialization or deserialization using the JSON JavaScriptSerializer. The length of the string exceeds the value set on the maxJsonLength property.");

test/System.Web.Mvc.Test/Test/MultiServiceResolverTest.cs

@@ -49,11 +49,14 @@ public void CurrentPropagatesExceptionWhenResolverThrowsNonActivationException()
             Mock<IDependencyResolver> resolver = new Mock<IDependencyResolver>(MockBehavior.Strict);
 
             // Act & Assert
-            Assert.Throws<MockException>(
-                () => MultiServiceResolver.GetCombined<TestProvider>(null, resolver.Object),
-                "IDependencyResolver.GetServices(System.Web.Mvc.Test.MultiServiceResolverTest+TestProvider) invocation failed with mock behavior Strict." + Environment.NewLine
-              + "All invocations on the mock must have a corresponding setup."
-                );
+            var ex = Assert.Throws<MockException>(
+                () => MultiServiceResolver.GetCombined<TestProvider>(null, resolver.Object));
+            Assert.Equal(
+                "IDependencyResolver.GetServices(System.Web.Mvc.Test.MultiServiceResolverTest+TestProvider) invocation failed with mock behavior Strict." +
+                Environment.NewLine +
+                "All invocations on the mock must have a corresponding setup.",
+                ex.Message,
+                ignoreLineEndingDifferences: true);
         }
 
         private class TestProvider