merge #21

Author: scott-xu

src/Ninject.MockingKernel.Moq.Test/DefaultMockRepositoryProviderTest.cs

@@ -36,6 +36,8 @@ public void CreatesMocksWithDefaultBehaviorByDefault()
             var mock = testee.Instance.Create<IDummyService>();
 
             mock.Behavior.Should().Be(MockBehavior.Default);
+            mock.CallBase.Should().Be(false);
+            mock.DefaultValue.Should().Be(DefaultValue.Empty);
         }
 
         [Fact]
@@ -48,6 +50,28 @@ public void CreatesMocksWithTheConfiguredMockBehavior()
             var mock = testee.Instance.Create<IDummyService>();
             mock.Behavior.Should().Be(MockBehavior.Strict);
         }
+
+        [Fact]
+        public void CreatesMocksWithTheConfiguredCallBaseBehavior()
+        {
+            var settings = new NinjectSettings();
+            settings.SetMockCallBase(true);
+            var testee = new DefaultMockRepositoryProvider { Settings = settings };
+
+            var mock = testee.Instance.Create<IDummyService>();
+            mock.CallBase.Should().Be(true);
+        }
+
+        [Fact]
+        public void CreatesMocksWithTheConfiguredDefaultReturnValue()
+        {
+            var settings = new NinjectSettings();
+            settings.SetMockDefaultValue(DefaultValue.Mock);
+            var testee = new DefaultMockRepositoryProvider { Settings = settings };
+
+            var mock = testee.Instance.Create<IDummyService>();
+            mock.DefaultValue.Should().Be(DefaultValue.Mock);
+        }
     }
 }
 #endif

src/Ninject.MockingKernel.Moq/DefaultMockRepositoryProvider.cs

@@ -46,7 +46,11 @@ public MockRepository Instance
             {
                 if (this.instance == null)
                 {
-                    this.instance = new MockRepository(this.Settings.GetMockBehavior());
+                    this.instance = new MockRepository(this.Settings.GetMockBehavior())
+                    {
+                        CallBase = this.Settings.GetMockCallBase(),
+                        DefaultValue = this.Settings.GetMockDefaultValue(),
+                    };
                 }
 
                 return this.instance;

src/Ninject.MockingKernel.Moq/NinjectSettingsExtensions.cs

@@ -20,6 +20,16 @@ public static class NinjectSettingsExtensions
         /// </summary>
         private const string MockBehaviorSettingsKey = "MockBehavior";
 
+        /// <summary>
+        /// The key used to store the mock call base behavior in the ninject settings.
+        /// </summary>
+        private const string MockCallBase = "MockCallBase";
+
+        /// <summary>
+        /// The key used to store the mock default return value in the ninject settings.
+        /// </summary>
+        private const string MockDefaultValue = "MockDefaultValue";
+
         /// <summary>
         /// Sets the mock behavior.
         /// </summary>
@@ -39,5 +49,45 @@ public static MockBehavior GetMockBehavior(this INinjectSettings settings)
         {
             return settings.Get(MockBehaviorSettingsKey, MockBehavior.Default);
         }
+
+        /// <summary>
+        /// Sets the mock call base behavior.
+        /// </summary>
+        /// <param name="settings">The ninject settings.</param>
+        /// <param name="mockCallBase">The mock call base behavior.</param>
+        public static void SetMockCallBase(this INinjectSettings settings, bool mockCallBase)
+        {
+            settings.Set(MockCallBase, mockCallBase);
+        }
+
+        /// <summary>
+        /// Gets the mock call base behavior.
+        /// </summary>
+        /// <param name="settings">The ninject settings.</param>
+        /// <returns>The configured mock call base behavior.</returns>
+        public static bool GetMockCallBase(this INinjectSettings settings)
+        {
+            return settings.Get(MockCallBase, false);
+        }
+
+        /// <summary>
+        /// Sets the mock default return value.
+        /// </summary>
+        /// <param name="settings">The ninject settings.</param>
+        /// <param name="mockDefaultValue">The mock default return value.</param>
+        public static void SetMockDefaultValue(this INinjectSettings settings, DefaultValue mockDefaultValue)
+        {
+            settings.Set(MockDefaultValue, mockDefaultValue);
+        }
+
+        /// <summary>
+        /// Gets the mock default return value.
+        /// </summary>
+        /// <param name="settings">The ninject settings.</param>
+        /// <returns>The configured mock default return value.</returns>
+        public static DefaultValue GetMockDefaultValue(this INinjectSettings settings)
+        {
+            return settings.Get(MockDefaultValue, DefaultValue.Empty);
+        }
     }
 }