Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs
===================================================================
diff -u -r0153023b4f33722b801edf55eba942048c261779 -r8587508c66a1bc0938465e97cf365cc1ef254f53
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -31,7 +31,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order to be able to create configurable closing structures calculations.
     /// </summary>
-    public class ClosingStructuresCalculationGroupContext : ClosingStructuresContext<CalculationGroup>, ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresCalculationGroupContext : ClosingStructuresContextBase<CalculationGroup>, ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresCalculationGroupContext"/>.
Fisheye: Tag 8587508c66a1bc0938465e97cf365cc1ef254f53 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs	(revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -0,0 +1,79 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.Properties;
+using Ringtoets.Common.Data.AssessmentSection;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object representing all required closing structures input knowledge to configure and create
+    /// related objects. It will delegate observable behaviour to the wrapped data object.
+    /// </summary>
+    public abstract class ClosingStructuresContextBase<T> : ObservableWrappedObjectContextBase<T> where T : IObservable
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ClosingStructuresContextBase{T}"/>.
+        /// </summary>
+        /// <param name="wrappedData">The concrete data instance wrapped by the context object.</param>
+        /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
+        /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c>.</exception>
+        protected ClosingStructuresContextBase(T wrappedData,
+                                               ClosingStructuresFailureMechanism failureMechanism,
+                                               IAssessmentSection assessmentSection)
+            : base(wrappedData)
+        {
+            if (failureMechanism == null)
+            {
+                string message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
+                                               Resources.ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism);
+                throw new ArgumentNullException("failureMechanism", message);
+            }
+
+            if (assessmentSection == null)
+            {
+                string message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
+                                               RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
+
+                throw new ArgumentNullException("assessmentSection", message);
+            }
+
+            FailureMechanism = failureMechanism;
+            AssessmentSection = assessmentSection;
+        }
+
+        /// <summary>
+        /// Gets the assessment section for this instance.
+        /// </summary>
+        public IAssessmentSection AssessmentSection { get; private set; }
+
+        /// <summary>
+        /// Gets the failure mechanism for this instance.
+        /// </summary>
+        public ClosingStructuresFailureMechanism FailureMechanism { get; private set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r8587508c66a1bc0938465e97cf365cc1ef254f53
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -84,9 +84,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Het sluitings kunstwerk toetsspoor.
         /// </summary>
-        public static string ClosingStructuresContext_DataDescription_ClosingStructuresFailureMechanism {
+        public static string ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism {
             get {
-                return ResourceManager.GetString("ClosingStructuresContext_DataDescription_ClosingStructuresFailureMechanism", resourceCulture);
+                return ResourceManager.GetString("ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism", resourceCulture);
             }
         }
     }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r8587508c66a1bc0938465e97cf365cc1ef254f53
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ClosingStructuresContext_DataDescription_ClosingStructuresFailureMechanism" xml:space="preserve">
+  <data name="ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism" xml:space="preserve">
     <value>Het sluitings kunstwerk toetsspoor</value>
   </data>
 </root>
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj
===================================================================
diff -u -r0153023b4f33722b801edf55eba942048c261779 -r8587508c66a1bc0938465e97cf365cc1ef254f53
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision 0153023b4f33722b801edf55eba942048c261779)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -42,7 +42,7 @@
     </Compile>
     <Compile Include="PresentationObjects\ClosingStructureContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationGroupContext.cs" />
-    <Compile Include="PresentationObjects\ClosingStructuresContext.cs" />
+    <Compile Include="PresentationObjects\ClosingStructuresContextBase.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresFailureMechanismContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -101,6 +101,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -rf02ecc2ee4949596335f3c9792dd77d4120a14bd -r8587508c66a1bc0938465e97cf365cc1ef254f53
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision f02ecc2ee4949596335f3c9792dd77d4120a14bd)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -47,7 +47,7 @@
             var groupContext = new ClosingStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<ClosingStructuresContext<CalculationGroup>>(groupContext);
+            Assert.IsInstanceOf<ClosingStructuresContextBase<CalculationGroup>>(groupContext);
             Assert.IsInstanceOf<ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>>(groupContext);
             Assert.AreSame(calculationGroup, groupContext.WrappedData);
             Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs	(revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -0,0 +1,101 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.PresentationObjects;
+using Ringtoets.Common.Data.AssessmentSection;
+
+namespace Ringtoets.ClosingStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class ClosingStructuresContextBaseTest
+    {
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var target = mockRepository.Stub<IObservable>();
+            mockRepository.ReplayAll();
+
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+
+            // Call
+            var context = new SimpleClosingStructuresContext<IObservable>(target, failureMechanism, assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IObservable>>(context);
+            Assert.AreSame(target, context.WrappedData);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_FailureMechanismIsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var observableObject = mockRepository.Stub<IObservable>();
+            mockRepository.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, null, assessmentSectionMock);
+
+            // Assert
+            const string expectedMessage = "Het sluitings kunstwerk toetsspoor mag niet 'null' zijn.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_AssessmentSectionIsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var observableObject = mockRepository.Stub<IObservable>();
+            mockRepository.ReplayAll();
+
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+
+            // Call
+            TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, failureMechanism, null);
+
+            // Assert
+            const string expectedMessage = "Het traject mag niet 'null' zijn.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+        }
+
+        private class SimpleClosingStructuresContext<T> : ClosingStructuresContextBase<T> where T : IObservable
+        {
+            public SimpleClosingStructuresContext(T target, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+                : base(target, failureMechanism, assessmentSection) { }
+        }
+    }
+}
Fisheye: Tag 8587508c66a1bc0938465e97cf365cc1ef254f53 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -rf994b1077b45f107c38c87b94ddeb5e91e1f95fe -r8587508c66a1bc0938465e97cf365cc1ef254f53
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision f994b1077b45f107c38c87b94ddeb5e91e1f95fe)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
@@ -59,7 +59,7 @@
     </Compile>
     <Compile Include="PresentationObjects\ClosingStructureContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationGroupContextTest.cs" />
-    <Compile Include="PresentationObjects\ClosingStructuresContextTest.cs" />
+    <Compile Include="PresentationObjects\ClosingStructuresContextBaseTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresFailureMechanismContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TreeNodeInfos\ClosingStructureContextTreeNodeInfoTest.cs" />