Fixed #95, #96

Author: ENikS

src/Strategies/ArrayResolveStrategy.cs

@@ -3,6 +3,7 @@
 using System.Reflection;
 using Unity.Builder;
 using Unity.Builder.Strategy;
+using Unity.Injection;
 using Unity.ObjectBuilder.BuildPlan.DynamicMethod;
 using Unity.Policy;
 using Unity.Registration;
@@ -72,6 +73,13 @@ public override void PreBuildUp(IBuilderContext context)
 
         public override bool RequiredToBuildType(IUnityContainer container, INamedType namedType, params InjectionMember[] injectionMembers)
         {
+            if (namedType is ContainerRegistration containerRegistration)
+            {
+                if (containerRegistration.RegisteredType != containerRegistration.MappedToType ||
+                    null != injectionMembers && injectionMembers.Any(i => i is IInjectionFactory))
+                    return false;
+            }
+
             return  namedType is InternalRegistration registration && 
                     registration.Type.IsArray && registration.Type.GetArrayRank() == 1
                 ? true : false;

src/Strategies/EnumerableResolveStrategy.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using Unity.Builder;
 using Unity.Builder.Strategy;
+using Unity.Injection;
 using Unity.ObjectBuilder.BuildPlan.DynamicMethod;
 using Unity.Policy;
 using Unity.Registration;
@@ -72,6 +73,13 @@ public override void PreBuildUp(IBuilderContext context)
 
         public override bool RequiredToBuildType(IUnityContainer container, INamedType namedType, params InjectionMember[] injectionMembers)
         {
+            if (namedType is ContainerRegistration containerRegistration)
+            {
+                if (containerRegistration.RegisteredType != containerRegistration.MappedToType ||
+                    null != injectionMembers && injectionMembers.Any(i => i is IInjectionFactory))
+                    return false;
+            }
+
              return namedType is InternalRegistration registration &&
                     registration.Type.GetTypeInfo().IsGenericType && 
                     typeof(IEnumerable<>) == registration.Type.GetGenericTypeDefinition();

tests/Unity.Tests/CollectionSupport/CollectionSupportFixture.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.Practices.Unity;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Unity.Injection;
 using Unity.Lifetime;
 
 
@@ -10,12 +11,58 @@ namespace Unity.Tests.CollectionSupport
     [TestClass]
     public class CollectionSupportFixture
     {
+        [TestMethod]
+        public void ResolvingEnumTypeSucceedsIfItWasNotRegistered()
+        {
+            IUnityContainer container = new UnityContainer();
+
+            Assert.IsNotNull(container.Resolve<IEnumerable<TestClass>>());
+        }
+
+
         [TestMethod]
         public void ResolvingAnArrayTypeSucceedsIfItWasNotRegistered()
         {
             IUnityContainer container = new UnityContainer();
 
-            TestClass[] resolved = container.Resolve<TestClass[]>();
+            Assert.IsNotNull(container.Resolve<TestClass[]>());
+        }
+
+        [TestMethod]
+        public void ResolvingAnArrayWithFactory()
+        {
+            var name = "test";
+            var data = new [] { new TestClass(), new TestClass() };
+
+            var container = new UnityContainer()
+                .RegisterType<TestClass[]>(new InjectionFactory(c => data))
+                .RegisterType<TestClass[]>(name, new InjectionFactory(c => data));
+
+            Assert.AreSame(data, container.Resolve<TestClass[]>());
+            Assert.AreSame(data, container.Resolve<TestClass[]>(name));
+        }
+
+        [TestMethod]
+        public void ResolvingEnumWithFactory()
+        {
+            var name = "test";
+            var data = new [] { new TestClass(), new TestClass() };
+
+            var container = new UnityContainer()
+                .RegisterType<IEnumerable<TestClass>>(new InjectionFactory(c => data))
+                .RegisterType<IEnumerable<TestClass>>(name, new InjectionFactory(c => data));
+
+            Assert.AreSame(data, container.Resolve<IEnumerable<TestClass>>());
+            Assert.AreSame(data, container.Resolve<IEnumerable<TestClass>>(name));
+        }
+
+        [TestMethod]
+        public void ResolvingEnumWithMap()
+        {
+            var container = new UnityContainer()
+                .RegisterType<IEnumerable<TestClass>, List<TestClass>>(new InjectionConstructor());
+
+            Assert.IsInstanceOfType(container.Resolve<IEnumerable<TestClass>>(), typeof(List<TestClass>));
         }
 
         [TestMethod]

tests/Unity.Tests/Container/ContainerBasicFixture.cs

@@ -148,15 +148,6 @@ public void ResolveListAtest()
             AssertHelper.ThrowsException<ResolutionFailedException>(() => uc1.Resolve<List<ATest>>("List"));
         }
 
-        [TestMethod]
-        public void ResolveArrayOfAtest()
-        {
-            UnityContainer uc1 = new UnityContainer();
-
-            uc1.RegisterType<ATest[]>("Array");
-            ATest[] arr = (ATest[])uc1.Resolve<ATest[]>("Array");
-        }
-
         #region Basic Parameterized Constructor
 
         [TestMethod]

tests/Unity.Tests/Lifetime/LifetimeFixture.cs

@@ -295,8 +295,9 @@ public void SetSingletonDefaultNameRegisterInstance()
             IUnityContainer uc = new UnityContainer();
 
             var aInstance = new EmailService();
-            uc.RegisterType(null, typeof(EmailService), null,  new ContainerControlledLifetimeManager(), null);
-            uc.RegisterType<EmailService>("SetA", new ContainerControlledLifetimeManager());
+
+            uc.RegisterType(null, typeof(EmailService), null, new ContainerControlledLifetimeManager(), null);
+            uc.RegisterType(null, typeof(EmailService), "SetA", new ContainerControlledLifetimeManager(), null);
             uc.RegisterInstance(aInstance);
             uc.RegisterInstance("hello", aInstance);
             uc.RegisterInstance("hello", aInstance, new ExternallyControlledLifetimeManager());

tests/Unity.Tests/ResolvingArraysFixture.cs

@@ -33,6 +33,15 @@ public void ContainerCanResolveListOfT()
             Assert.IsNotNull(result);
         }
 
+        [TestMethod]
+        public void ResolveArrayOfAtest()
+        {
+            UnityContainer uc1 = new UnityContainer();
+
+            uc1.RegisterType<EmptyClass[]>("Array");
+            Assert.IsNotNull(uc1.Resolve<EmptyClass[]>("Array"));
+        }
+
         [TestMethod]
         public void ContainerReturnsEmptyArrayIfNoObjectsRegistered()
         {