Merge pull request autofac#785 from NickRusinov/fix-728

Optional string parameter causing resolution exception when AnyConcreteTypeNotAlreadyRegisteredSource added
cardinals · Sep 13, 2016 · 9ab6ba4 · 9ab6ba4
2 parents 7a3b97a + 31439a1
commit 9ab6ba4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/Autofac/Features/ResolveAnything/AnyConcreteTypeNotAlreadyRegisteredSource.cs b/src/Autofac/Features/ResolveAnything/AnyConcreteTypeNotAlreadyRegisteredSource.cs
@@ -74,6 +74,7 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(
 
             var ts = service as TypedService;
             if (ts == null ||
+                ts.ServiceType == typeof(string) ||
                 !ts.ServiceType.GetTypeInfo().IsClass ||
                 ts.ServiceType.GetTypeInfo().IsSubclassOf(typeof(Delegate)) ||
                 ts.ServiceType.GetTypeInfo().IsAbstract ||

diff --git a/test/Autofac.Test/Features/ResolveAnything/ResolveAnythingTests.cs b/test/Autofac.Test/Features/ResolveAnything/ResolveAnythingTests.cs
@@ -136,6 +136,43 @@ public void LifetimeCanBeSingleInstance()
             }
         }
 
+        public class RegiserTypeWithCtorParam
+        {
+            public RegiserTypeWithCtorParam(string stringParam = "MyString")
+            {
+                StringParam = stringParam;
+            }
+
+            public string StringParam { get; }
+        }
+
+        [Fact]
+        public void AllConcreteTypesSourceResolvesOptionalParams()
+        {
+            var cb = new ContainerBuilder();
+            cb.RegisterSource(new AnyConcreteTypeNotAlreadyRegisteredSource());
+            var container = cb.Build();
+
+            var resolved = container.Resolve<RegiserTypeWithCtorParam>();
+
+            Assert.Equal("MyString", resolved.StringParam);
+        }
+
+        [Fact]
+        public void AllConcreteTypesSourceAlreadyRegisteredResolvesOptionalParams()
+        {
+            var cb = new ContainerBuilder();
+
+            // Concrete type is already registered, but still errors
+            cb.RegisterType<RegiserTypeWithCtorParam>();
+            cb.RegisterSource(new AnyConcreteTypeNotAlreadyRegisteredSource());
+            var container = cb.Build();
+
+            var resolved = container.Resolve<RegiserTypeWithCtorParam>();
+
+            Assert.Equal("MyString", resolved.StringParam);
+        }
+
         private static IContainer CreateResolveAnythingContainer()
         {
             var cb = new ContainerBuilder();