Centralized setting up default mock behaviors

By moving the set up of the default mock behaviors to
the extension method IMocked.SetBehaviors(MockBehavior),
we can reuse directly from both VB and C# content files
APIs, as well as provide uniformity for custom mocks
created manually that also want to have the default
mock behaviors set up quickly and consistently with
factory-created Mock.Of<T> mocks.

Author: kzu

src/Moq/Moq/MockedExtensions.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel;
+using Moq.Sdk;
+using Stunts;
+
+namespace Moq
+{
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    public static class MockedExtensions
+    {
+        /// <summary>
+        /// Clears any existing behavior (including any setups) and 
+        /// adds the necessary behaviors to the <paramref name="mock"/> so 
+        /// that it behaves as specified by the <paramref name="behavior"/> 
+        /// enumeration.
+        /// </summary>
+        /// <remarks>
+        /// This method can be used by custom mocks to ensure they have the 
+        /// same default behaviors as a mock created using <c>Mock.Of{T}</c>.
+        /// </remarks>
+        public static void SetBehavior(this IMocked mock, MockBehavior behavior)
+        {
+            mock.Mock.Behaviors.Clear();
+
+            mock.Mock.Behaviors.Add(new MockTrackingBehavior());
+            mock.Mock.Behaviors.Add(new EventBehavior());
+            mock.Mock.Behaviors.Add(new PropertyBehavior { SetterRequiresSetup = behavior == MockBehavior.Strict });
+            mock.Mock.Behaviors.Add(new DefaultEqualityBehavior());
+
+            if (behavior == MockBehavior.Strict)
+                mock.Mock.Behaviors.Add(new StrictMockBehavior());
+            else
+                mock.Mock.Behaviors.Add(new DefaultValueBehavior());
+        }
+    }
+}

src/Moq/Moq/contentFiles/cs/netstandard1.3/Mock.Overloads.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Reflection;
-using Moq.Sdk;
-using Stunts;
-
 namespace Moq
 {
     /// <summary>
     /// Instantiates stunts for the specified types.
     /// </summary>
-    internal partial class Mock
+    partial class Mock
     {
         /// <summary>
         /// Creates a mock that inherits or implements the type <typeparamref name="T"/>.

src/Moq/Moq/contentFiles/cs/netstandard1.3/Mock.cs

@@ -1,33 +1,23 @@
 using System;
 using System.Reflection;
 using Moq.Sdk;
-using Stunts;
 
 namespace Moq
 {
     /// <summary>
-    /// Instantiates stunts for the specified types.
+    /// Instantiates mocks for the specified types.
     /// </summary>
-    internal partial class Mock
+    partial class Mock
     {
+        /// <summary>
+        /// Creates the mock instance by using the specified types to 
+        /// lookup the mock type in the assembly defining this class.
+        /// </summary>
         static T Create<T>(MockBehavior behavior, object[] constructorArgs, params Type[] interfaces)
         {
             var mocked = (IMocked)MockFactory.Default.CreateMock(typeof(Mock).GetTypeInfo().Assembly, typeof(T), interfaces, constructorArgs);
 
-            mocked.Mock.Behaviors.Add(new MockTrackingBehavior());
-
-            if (behavior == MockBehavior.Strict)
-            {
-                mocked.Mock.Behaviors.Add(new PropertyBehavior { SetterRequiresSetup = true });
-                mocked.Mock.Behaviors.Add(new StrictMockBehavior());
-            }
-            else
-            {
-                mocked.Mock.Behaviors.Add(new PropertyBehavior());
-                mocked.Mock.Behaviors.Add(new DefaultValueBehavior());
-            }
-
-            mocked.Mock.Behaviors.Add(new DefaultEqualityBehavior());
+            mocked.SetBehavior(behavior);
 
             return (T)mocked;
         }

src/Moq/Moq/contentFiles/vb/netstandard1.3/Mock.vb

@@ -1,6 +1,5 @@
 Imports System.Reflection
 Imports Moq.Sdk
-Imports Stunts
 
 Namespace Global.Moq
 
@@ -9,17 +8,7 @@ Namespace Global.Moq
         Private Shared Function Create(Of T)(ByVal behavior As MockBehavior, ByVal constructorArgs As Object(), ParamArray interfaces As Type()) As T
             Dim mocked = DirectCast(MockFactory.[Default].CreateMock(GetType(Mock).GetTypeInfo().Assembly, GetType(T), interfaces, constructorArgs), IMocked)
 
-            mocked.Mock.Behaviors.Add(New MockTrackingBehavior())
-
-            If behavior = MockBehavior.Strict Then
-                mocked.Mock.Behaviors.Add(New PropertyBehavior() With {.SetterRequiresSetup = True})
-                mocked.Mock.Behaviors.Add(New StrictMockBehavior())
-            Else
-                mocked.Mock.Behaviors.Add(New PropertyBehavior())
-                mocked.Mock.Behaviors.Add(New DefaultValueBehavior())
-            End If
-
-            mocked.Mock.Behaviors.Add(New DefaultEqualityBehavior())
+            mocked.SetBehavior(behavior)
 
             Return DirectCast(mocked, T)
         End Function