Merge pull request autofac#526 from alexandrnikitin/Issue507_AsClosed…

…TypesOf_bug

Fix for autofac#507 AsClosedTypesOf does not register component as non-generic interface

Core/Source/Autofac/Util/TypeExtensions.cs

@@ -58,7 +58,7 @@ public static IEnumerable<Type> GetTypesThatClose(this Type @this, Type openGene
         static IEnumerable<Type> FindAssignableTypesThatClose(Type candidateType, Type openGenericServiceType)
         {
             return TypesAssignableFrom(candidateType)
-                .Where(t => IsGenericTypeDefinedBy(t, openGenericServiceType));
+                .Where(t => t.IsClosedTypeOf(openGenericServiceType));
         }
 
         static IEnumerable<Type> TypesAssignableFrom(Type candidateType)
@@ -75,6 +75,14 @@ public static bool IsGenericTypeDefinedBy(this Type @this, Type openGeneric)
             return !@this.ContainsGenericParameters && @this.IsGenericType && @this.GetGenericTypeDefinition() == openGeneric;
         }
 
+        public static bool IsClosedTypeOf(this Type @this, Type openGeneric)
+        {
+            if (@this == null) throw new ArgumentNullException("this");
+            if (openGeneric == null) throw new ArgumentNullException("openGeneric");
+
+            return TypesAssignableFrom(@this).Any(t => t.IsGenericType && !@this.ContainsGenericParameters && t.GetGenericTypeDefinition() == openGeneric);
+        }
+
         public static bool IsDelegate(this Type type)
         {
             if (type == null) throw new ArgumentNullException("type");

Core/Tests/Autofac.Tests.Scenarios.ScannedAssembly/Autofac.Tests.Scenarios.ScannedAssembly.csproj

@@ -47,12 +47,14 @@
     <Compile Include="BComponent.cs" />
     <Compile Include="A2Component.cs" />
     <Compile Include="BModule.cs" />
+    <Compile Include="CloseCommand.cs" />
     <Compile Include="CommandBase.cs" />
     <Compile Include="DeleteCommand.cs" />
     <Compile Include="DeleteCommandData.cs" />
     <Compile Include="HasNestedFactoryDelegate.cs" />
     <Compile Include="IAService.cs" />
     <Compile Include="IBService.cs" />
+    <Compile Include="ICloseCommand.cs" />
     <Compile Include="ICommand.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MetadataAttributeScanningScenario.cs" />

Core/Tests/Autofac.Tests.Scenarios.ScannedAssembly/CloseCommand.cs

@@ -0,0 +1,9 @@
+namespace Autofac.Tests.Scenarios.ScannedAssembly
+{
+    public class CloseCommand : ICloseCommand
+    {
+        public void Execute(object data)
+        {
+        }
+    }
+}

Core/Tests/Autofac.Tests.Scenarios.ScannedAssembly/ICloseCommand.cs

@@ -0,0 +1,6 @@
+namespace Autofac.Tests.Scenarios.ScannedAssembly
+{
+    public interface ICloseCommand : ICommand<object>
+    {
+    }
+}

Core/Tests/Autofac.Tests/Features/Scanning/ScanningRegistrationTests.cs

@@ -195,6 +195,17 @@ public void AsClosedTypesOfOpenGenericAbstractClassTypeProvidedClosingGenericTyp
             Assert.That(c.Resolve<Message<string>>(), Is.TypeOf<StringMessage>());
         }
 
+        [Test]
+        public void AsClosedTypesOfClosingInterfaceTypeRegistered()
+        {
+            var cb = new ContainerBuilder();
+            cb.RegisterAssemblyTypes(typeof(ICloseCommand).Assembly)
+                .AsClosedTypesOf(typeof(ICommand<>));
+            var c = cb.Build();
+
+            Assert.That(c.Resolve<ICloseCommand>(), Is.TypeOf<CloseCommand>());
+        }
+
         [Test]
         public void AsSelfExposesConcreteTypeAsService()
         {