Fixing InjectionField and InjectionProperty with Type resolution

Fixed #292
unitycontainer · Nov 23, 2020 · e65799e · e65799e
1 parent 75c3e38
commit e65799e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/package.props b/package.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionBase>5.11.8</VersionBase>
+    <VersionBase>5.11.9</VersionBase>
     <PackageReleaseNotes>This package is compatible with .NET Standard 1.0 and 2.0, .NET Core 1.0 and 2.0, .NET 4.0, 4.5, 4.6, 4.7</PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/Builder/Context/BuilderContext.cs b/src/Builder/Context/BuilderContext.cs
@@ -257,6 +257,10 @@ public object Resolve(PropertyInfo property, object value)
             // Resolve from injectors
             switch (value)
             {
+                case PropertyInfo info when 
+                ReferenceEquals(info, property):
+                    return Resolve(info.PropertyType, null);
+
                 case DependencyAttribute dependencyAttribute:
                     return Resolve(property.PropertyType, dependencyAttribute.Name);
 
@@ -312,6 +316,10 @@ public object Resolve(FieldInfo field, object value)
             // Resolve from injectors
             switch (value)
             {
+                case FieldInfo info when
+                ReferenceEquals(info, field):
+                    return Resolve(info.FieldType, null);
+
                 case DependencyAttribute dependencyAttribute:
                     return Resolve(field.FieldType, dependencyAttribute.Name);
 

diff --git a/tests/Unity.Specification/Parameter.cs b/tests/Unity.Specification/Parameter.cs
@@ -13,7 +13,7 @@ public override IUnityContainer GetContainer()
     }
 
     [TestClass]
-    public class Injected : Unity.Specification.Parameter.Injection.SpecificationTests
+    public class Injected : Unity.Specification.Parameter.Injected.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
@@ -63,7 +63,7 @@ public override IUnityContainer GetContainer()
     }
 
     [TestClass]
-    public class Injected : Unity.Specification.Parameter.Injection.SpecificationTests
+    public class Injected : Unity.Specification.Parameter.Injected.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {

diff --git a/tests/Unity.Tests/Injection/OptionalDependencyFixture.cs b/tests/Unity.Tests/Injection/OptionalDependencyFixture.cs
@@ -10,6 +10,34 @@ namespace Unity.Tests.v5.Injection
     [TestClass]
     public class OptionalDependencyFixture
     {
+
+        public class ObjectWithProperty
+        {
+            public string Property { get; set; }
+        }
+
+
+        [TestMethod]
+        // https://github.com/unitycontainer/container/issues/292
+        public void ByType()
+        {
+            // Setup
+            IUnityContainer Container = new UnityContainer()
+                .RegisterInstance("name");
+
+            Container.RegisterType<ObjectWithProperty>(
+                new InjectionProperty(nameof(ObjectWithProperty.Property), typeof(string)));
+
+            // Act
+            var result = Container.Resolve<ObjectWithProperty>();
+
+            // Verify
+            Assert.IsNotNull(result);
+            Assert.IsNotNull(result.Property);
+            Assert.IsInstanceOfType(result.Property, typeof(string));
+        }
+
+
         [TestMethod]
         public void OptionalParametersSetToNullIfNotRegistered()
         {