Merge pull request #18 from scott-xu/master

Support additional interfaces when mock

Author: scott-xu

ReleaseNotes.txt

@@ -1,3 +1,7 @@
+Version 3.2.1.0
+---------------
+Added: Support additional interfaces when mock
+
 Version 3.0.0.0
 ---------------
 Removed: No web builds. All builds are have not reference to web anymore

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

@@ -124,6 +124,14 @@ public MethodInfo CreateMethod
                     throw new NotImplementedException();
                 }
             }
+
+            public MethodInfo AddAdditionalInterfaceMethod
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
         }
 #endif
     }

src/Ninject.MockingKernel.Moq/DefaultMockRepositoryProvider.cs

@@ -44,6 +44,11 @@ public class DefaultMockRepositoryProvider : NinjectComponent, IMockRepositoryPr
         /// </summary>
         private MethodInfo createMethod;
 
+        /// <summary>
+        /// Gets the method info of the add additional interface method.
+        /// </summary>
+        private MethodInfo addAdditionalInterfaceMethod;
+
         /// <summary>
         /// Gets the instance of the mock repository.
         /// </summary>
@@ -77,6 +82,23 @@ public MethodInfo CreateMethod
                 return this.createMethod;
             }
         }
+
+        /// <summary>
+        /// Gets the method info of the add additional interface method.
+        /// </summary>
+        /// <value>The method info of the add additional interface method.</value>
+        public MethodInfo AddAdditionalInterfaceMethod
+        {
+            get
+            {
+                if (this.addAdditionalInterfaceMethod == null)
+                {
+                    this.addAdditionalInterfaceMethod = typeof(Mock).GetMethod("As");
+                }
+
+                return this.addAdditionalInterfaceMethod;
+            }
+        }
     }
 }
 #endif

src/Ninject.MockingKernel.Moq/IMockRepositoryProvider.cs

@@ -42,6 +42,12 @@ public interface IMockRepositoryProvider : INinjectComponent
         /// </summary>
         /// <value>The method info of the create method.</value>
         MethodInfo CreateMethod { get; }
+
+        /// <summary>
+        /// Gets the method info of the add additional interface method.
+        /// </summary>
+        /// <value>the method info of the add additional interface method.</value>
+        MethodInfo AddAdditionalInterfaceMethod { get; }
     }
 }
 #endif

src/Ninject.MockingKernel.Moq/MoqMockProvider.cs

@@ -22,6 +22,7 @@
 namespace Ninject.MockingKernel.Moq
 {
     using System;
+    using System.Linq;
     using System.Reflection;
 
     using global::Moq;
@@ -45,6 +46,11 @@ public class MoqMockProvider : NinjectComponent, IProvider, IMockProviderCallbac
         /// </summary>
         private readonly MethodInfo createMethod;
 
+        /// <summary>
+        /// The method info used to add additional interface to mock.
+        /// </summary>
+        private readonly MethodInfo addAdditionalInterfaceMethod;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MoqMockProvider"/> class.
         /// </summary>
@@ -53,6 +59,7 @@ public MoqMockProvider(IMockRepositoryProvider mockRepositoryProvider)
         {
             this.mockRepository = mockRepositoryProvider.Instance;
             this.createMethod = mockRepositoryProvider.CreateMethod;
+            this.addAdditionalInterfaceMethod = mockRepositoryProvider.AddAdditionalInterfaceMethod;
         }
 #endif
 
@@ -87,6 +94,12 @@ public object Create(IContext context)
         {
             var methodInfo = this.createMethod.MakeGenericMethod(context.Request.Service);
             var mock = (Mock)methodInfo.Invoke(this.mockRepository, new object[0]);
+            var additionalInterfaces = context.Parameters.OfType<AdditionalInterfaceParameter>().Select(ai => (Type)ai.GetValue(context, null));
+            foreach (var additionalInterface in additionalInterfaces)
+            {
+                this.addAdditionalInterfaceMethod.MakeGenericMethod(additionalInterface).Invoke(mock, null);
+            }
+
             return mock.Object;
         }
 
@@ -104,6 +117,12 @@ public object Create(IContext context)
             var mockType = typeof(Mock<>).MakeGenericType(context.Request.Service);
             var constructorInfo = mockType.GetConstructor(new[] { typeof(MockBehavior) });
             var mock = (Mock)constructorInfo.Invoke(new object[] { Settings.GetMockBehavior() });
+            var additionalInterfaces = context.Parameters.OfType<AdditionalInterfaceParameter>().Select(ai => (Type)ai.GetValue(context, null));
+            foreach (var additionalInterface in additionalInterfaces)
+            {
+                typeof(Mock).GetMethod("As").MakeGenericMethod(additionalInterface).Invoke(mock, null);
+            }
+
             return mock.Object;
         }
 #endif

src/Ninject.MockingKernel.NSubstitute/NSubstituteMockProvider.cs

@@ -22,6 +22,7 @@
 namespace Ninject.MockingKernel.NSubstitute
 {
     using System;
+    using System.Linq;
     using Activation;
     using Components;
     using global::NSubstitute;
@@ -61,7 +62,9 @@ public Func<IContext, IProvider> GetCreationCallback()
         /// </returns>
         public object Create(IContext context)
         {
-            return Substitute.For(new[] { context.Request.Service }, null);
+            var additionalInterfaces = context.Parameters.OfType<AdditionalInterfaceParameter>().Select(ai => (Type)ai.GetValue(context, null));
+
+            return Substitute.For(new[] { context.Request.Service }.Concat(additionalInterfaces).ToArray(), null);
         }
     }
 }

src/Ninject.MockingKernel.RhinoMock/RhinoMocksMockProvider.cs

@@ -35,21 +35,6 @@ namespace Ninject.MockingKernel.RhinoMock
     /// </summary>
     public class RhinoMocksMockProvider : NinjectComponent, IProvider, IMockProviderCallbackProvider
     {
-#if SILVERLIGHT
-        /// <summary>
-        /// The method info for creation mocks.
-        /// </summary>
-        private readonly MethodInfo generateMockMethodInfo;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RhinoMocksMockProvider"/> class.
-        /// </summary>
-        public RhinoMocksMockProvider()
-        {
-            this.generateMockMethodInfo = typeof(MockRepository).GetMethod("GenerateMock");
-        }
-#endif
-
         /// <summary>
         /// Gets the type (or prototype) of instances the provider creates.
         /// </summary>
@@ -68,11 +53,9 @@ public Type Type
         /// <returns>The created instance.</returns>
         public object Create(IContext context)
         {
-#if !SILVERLIGHT
-            return MockRepository.GenerateMock(context.Request.Service, new Type[0], new object[0]);
-#else
-            return this.generateMockMethodInfo.MakeGenericMethod(context.Request.Service).Invoke(null, new[] { new object[0] });
-#endif
+            var additionalInterfaces = context.Parameters.OfType<AdditionalInterfaceParameter>().Select(ai => (Type)ai.GetValue(context, null)).ToArray();
+
+            return MockRepository.GenerateMock(context.Request.Service, additionalInterfaces, new object[0]);
         }
 
         /// <summary>

src/Ninject.MockingKernel.Test/IDummyService2.cs

@@ -0,0 +1,34 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IDummyService2.cs" company="bbv Software Services AG">
+//   Copyright (c) 2010 bbv Software Services AG
+//   Author: Remo Gloor [email protected]
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//
+//   Also licenced under Microsoft Public License (Ms-PL).
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace Ninject.MockingKernel
+{
+    /// <summary>
+    /// A dummy interface
+    /// </summary>
+    public interface IDummyService2
+    {
+        /// <summary>
+        /// A dummy method.
+        /// </summary>
+        void Do2();
+    }
+}

src/Ninject.MockingKernel.Test/IntegrationTest.cs

@@ -62,6 +62,22 @@ public void ToMockCanBeUsedToConfigureMocks()
             }
         }
 
+        /// <summary>
+        /// The ToMock extension can be used to add additional interfaces.
+        /// </summary>
+        [Fact]
+        public void ToMockCanBeUsedToAddAdditionalInterfaces()
+        {
+            using (var kernel = this.CreateKernel())
+            {
+                kernel.Bind<IDummyService>().ToMock(typeof(IDummyService2));
+
+                var mock = kernel.Get<IDummyService>();
+
+                mock.Should().BeAssignableTo<IDummyService2>();
+            }
+        }
+
         /// <summary>
         /// Reals the objects are created for auto bindable types.
         /// </summary>

src/Ninject.MockingKernel.Test/Ninject.MockingKernel.Test.csproj

@@ -71,6 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IDummyService.cs" />
+    <Compile Include="IDummyService2.cs" />
     <Compile Include="IntegrationTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>