Immutable components of parent kernel

src/Ninject.Extensions.ChildKernel.Test/ChildKernelTest.cs

@@ -31,13 +31,66 @@ namespace Ninject.Extensions.ChildKernel
     using Ninject.Parameters;
     using Ninject.Planning.Bindings;
     using Ninject.Planning.Bindings.Resolvers;
+    using Ninject.Selection;
+    using Ninject.Syntax;
 
     using Xunit;
-
+
+    public class ChildKernelTestWithIResolutionRoot : BaseChildKernelTest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChildKernelTestWithIResolutionRoot"/> class.
+        /// </summary>
+        public ChildKernelTestWithIResolutionRoot()
+        {
+            this.parentKernel = new StandardKernel();
+            this.testee = new ChildKernel((IResolutionRoot)this.parentKernel);
+        }
+    }
+
+    public class ChildKernelTestWithParentAndSettings : BaseChildKernelTest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChildKernelTestWithParentAndSettings"/> class.
+        /// </summary>
+        public ChildKernelTestWithParentAndSettings()
+        {
+            this.parentKernel = new StandardKernel();
+            this.testee = new ChildKernel(this.parentKernel, this.parentKernel.Settings);
+        }
+    }
+
+    public class ChildKernelTestWithComponents : BaseChildKernelTest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChildKernelTestWithComponents"/> class.
+        /// </summary>
+        public ChildKernelTestWithComponents()
+        {
+            this.parentKernel = new StandardKernel();
+            this.testee = new ChildKernel(
+                this.parentKernel,
+                this.parentKernel.Settings,
+                this.parentKernel.Components);
+        }
+    }
+
+    public class ChildKernelTestWithOnlyKernel : BaseChildKernelTest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChildKernelTestWithOnlyKernel"/> class.
+        /// </summary>
+        public ChildKernelTestWithOnlyKernel()
+        {
+            this.parentKernel = new StandardKernel();
+            this.testee = new ChildKernel(this.parentKernel);
+        }
+    }
+
     /// <summary>
     /// Tests the implementation of <see cref="ChildKernel"/>.
     /// </summary>
-    public class ChildKernelTest
+    public abstract class BaseChildKernelTest
     {
         /// <summary>
         /// Name parent's foo.
@@ -62,21 +115,12 @@ public class ChildKernelTest
         /// <summary>
         /// The object under test.
         /// </summary>
-        private readonly IKernel testee;
+        protected IKernel testee;
 
         /// <summary>
         /// The parent kernel.
         /// </summary>
-        private readonly IKernel parentKernel;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChildKernelTest"/> class.
-        /// </summary>
-        public ChildKernelTest()
-        {
-            this.parentKernel = new StandardKernel();
-            this.testee = new ChildKernel(this.parentKernel);
-        }
+        protected IKernel parentKernel;
 
         /// <summary>
         /// All known dependencies the are resolved on child kernel.
@@ -181,6 +225,47 @@ public void SelectCorrectConstructorWhenBindingsAcrossKernels()
             baz.Bar.Should().NotBeNull();
         }
 
+        [Fact]
+        public void ChildKernelCannotAccessParentKernelComponents()
+        {
+			this.testee.Components.Add<IMissingBindingResolver, BarMissingBindingResolver>();
+
+            var nameOfBarMissingBindingResolver = nameof(BarMissingBindingResolver);
+
+            this.parentKernel.Components
+                .GetAll<IMissingBindingResolver>()
+                .Select(i => i.GetType().Name)
+                .FirstOrDefault(i => i.Equals(nameOfBarMissingBindingResolver, StringComparison.InvariantCultureIgnoreCase))
+                .Should().BeNull();
+        }
+
+        [Fact]
+        public void DisposeOfChildKernelDoesNotChangeParentKernelComponents()
+        {
+            this.parentKernel.Components.Add<IMissingBindingResolver, BarMissingBindingResolver>();
+            this.testee.Dispose();
+
+            this.parentKernel.Components.Get<IMissingBindingResolver>().Should().NotBeNull();  
+        }
+
+        [Fact]
+        public void AddImmutableComponent()
+        {
+            Assert.Throws<InvalidOperationException>(() => this.testee.Components.Add<ISelector, Selector>());
+        }
+
+        [Fact]
+        public void RemoveImmutableComponent()
+        {
+            Assert.Throws<InvalidOperationException>(() => this.testee.Components.Remove<ISelector, Selector>());
+        }
+
+        [Fact]
+        public void RemoveAllImmutableComponents()
+        {
+            Assert.Throws<InvalidOperationException>(() => this.testee.Components.RemoveAll(typeof(ISelector)));
+        }
+
         public class BarMissingBindingResolver : NinjectComponent, IMissingBindingResolver
         {
             private readonly IKernel kernel;

src/Ninject.Extensions.ChildKernel.Test/Ninject.Extensions.ChildKernel.Test.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Ninject.Extensions.ChildKernel</RootNamespace>
     <AssemblyName>Ninject.Extensions.ChildKernel.Test</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
@@ -34,7 +34,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,7 +62,7 @@
     </Reference>
     <Reference Include="Ninject, Version=2.1.0.58, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Ninject\net-3.5\Ninject.dll</HintPath>
+      <HintPath>..\..\lib\Ninject\net-4.5\Ninject.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

src/Ninject.Extensions.ChildKernel/ChildActivationCache.cs

@@ -21,6 +21,7 @@ namespace Ninject.Extensions.ChildKernel
 {
     using Ninject.Activation.Caching;
     using Ninject.Components;
+    using System;
 
     /// <summary>
     /// The activation cache of child kernels.
@@ -38,6 +39,11 @@ public class ChildActivationCache : NinjectComponent, IActivationCache
         /// <param name="kernel">The kernel.</param>
         public ChildActivationCache(IKernel kernel)
         {
+            if (kernel == null)
+            {
+                throw new ArgumentNullException(nameof(kernel));
+            }
+
             this.parentCache = ((IChildKernel)kernel).ParentResolutionRoot.Get<IKernel>().Components.Get<IActivationCache>();
         }