Use base container for resolving

SpecFlowOSS · Dec 5, 2018 · bc0bc14 · bc0bc14
1 parent 931dcbc
commit bc0bc14
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/BoDi.Tests/IsRegisteredTests.cs b/BoDi.Tests/IsRegisteredTests.cs
@@ -68,5 +68,24 @@ public void ShouldReturnTrueIfTypeRegistered()
 
             Assert.IsTrue(isRegistered);
         }
+
+        [Test]
+        public void ShouldReturnTrueIfInterfaceRegisteredInBaseContainer()
+        {
+            // given
+
+            var baseContainer = new ObjectContainer();
+            var container = new ObjectContainer(baseContainer);
+
+            // when 
+
+            baseContainer.RegisterTypeAs<VerySimpleClass, IInterface1>();
+
+            // then
+
+            bool isRegistered = container.IsRegistered<IInterface1>();
+
+            Assert.IsTrue(isRegistered);
+        }
     }
 }
diff --git a/BoDi.Tests/ResolveAllTests.cs b/BoDi.Tests/ResolveAllTests.cs
@@ -48,6 +48,23 @@ public void ShouldResolveTheRightTypes()
             Assert.IsTrue(results.Contains(container.Resolve<IFancy>("fancier")));
         }
 
+        [Test]
+        public void ShouldResolveTypesRegisteredInBaseContainer()
+        {
+            // given
+            var baseContainer = new ObjectContainer();
+            var container = new ObjectContainer(baseContainer);
+            baseContainer.RegisterTypeAs<ImFancy, IFancy>("fancy");
+            baseContainer.RegisterTypeAs<ImFancier, IFancy>("fancier");
+
+            // when
+            var results = container.ResolveAll<IFancy>();
+
+            // then
+            Assert.IsTrue(results.Contains(container.Resolve<IFancy>("fancy")));
+            Assert.IsTrue(results.Contains(container.Resolve<IFancy>("fancier")));
+        }
+
     }
 
 }
diff --git a/BoDi/BoDi.cs b/BoDi/BoDi.cs
@@ -611,14 +611,17 @@ public bool IsRegistered<T>(string name)
 
             var keyToResolve = new RegistrationKey(typeToResolve, name);
 
-            return registrations.ContainsKey(keyToResolve);
+            if (registrations.ContainsKey(keyToResolve))
+				return true;
+			return baseContainer != null && baseContainer.IsRegistered<T>(name);
         }
 
         // ReSharper disable once UnusedParameter.Local
         private void AssertNotResolved(RegistrationKey interfaceType)
         {
             if (resolvedObjects.ContainsKey(interfaceType))
                 throw new ObjectContainerException("An object has been resolved for this interface already.", null);
+            baseContainer?.AssertNotResolved(interfaceType);
         }
 
         private void ClearRegistrations(RegistrationKey registrationKey)
@@ -683,7 +686,8 @@ public IEnumerable<T> ResolveAll<T>() where T : class
         {
             return registrations
                 .Where(x => x.Key.Type == typeof(T))
-                .Select(x => Resolve (x.Key.Type, x.Key.Name) as T);
+                .Select(x => Resolve (x.Key.Type, x.Key.Name) as T)
+				.Union(baseContainer != null ? baseContainer.ResolveAll<T>() : new T[0]);
         }
 
         private object Resolve(Type typeToResolve, ResolutionList resolutionPath, string name)