Handle open generics for SkipTypeMockHandler (#58)

Author: twsouthwick

AutofacContrib.NSubstitute.Tests/TypesToSkipForMockingFixture.cs

@@ -51,6 +51,19 @@ public void ManuallyCheckTypeToSkip()
             Assert.Throws<ComponentNotRegisteredException>(() => mock.Resolve<IDependency>());
         }
 
+        [Test]
+        public void ManuallyCheckTypeToSkipOpenGeneric()
+        {
+            var mock = AutoSubstitute.Configure()
+                .ConfigureOptions(options =>
+                {
+                    options.MockHandlers.Add(SkipTypeMockHandler.Create(typeof(IDependency<>)));
+                })
+                .Build();
+
+            Assert.Throws<ComponentNotRegisteredException>(() => mock.Resolve<IDependency<object>>());
+        }
+
         [Test]
         public void RegisteredTypesAreNotMocked()
         {
@@ -68,6 +81,10 @@ public interface IDependency
         {
         }
 
+        public interface IDependency<T>
+        {
+        }
+
         public class Impl1 : IDependency
         {
         }

AutofacContrib.NSubstitute/MockHandlers/SkipTypeMockHandler.cs

@@ -6,9 +6,9 @@
 namespace AutofacContrib.NSubstitute.MockHandlers
 {
     /// <summary>
-    /// An implementation of a <see cref="MockHandler"/> that will skip creation of mocks of type <typeparamref name="T"/>.
+    /// An implementation of a <see cref="MockHandler"/> that will skip creation of mocks for given types.
     /// </summary>
-    public class SkipTypeMockHandler : MockHandler
+    public sealed class SkipTypeMockHandler : MockHandler
     {
         private readonly IEnumerable<Type> _types;
 
@@ -34,17 +34,18 @@ public class SkipTypeMockHandler : MockHandler
 
         private SkipTypeMockHandler(IEnumerable<Type> types)
         {
-            _types = types;
+            _types = types ?? throw new ArgumentNullException(nameof(types));
         }
 
-        protected internal sealed override void OnMockCreated(object instance, Type type, IComponentContext context, ISubstitutionContext substitutionContext) 
-            => base.OnMockCreated(instance, type, context, substitutionContext);
-
         protected internal override void OnMockCreating(MockCreatingContext context)
         {
             foreach (var type in _types)
             {
-                if (type == context.Type)
+                if (type.IsGenericType && type == type.GetGenericTypeDefinition())
+                {
+                    context.DoNotCreate();
+                }
+                else if (type == context.Type)
                 {
                     context.DoNotCreate();
                 }