Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs	(revision c95bf61382d8082993849902356f7177845994d9)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2017. 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.Controls.PresentationObjects;
+using Ringtoets.Common.Data.Hydraulics;
+
+namespace Ringtoets.Common.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocationCalculation"/>.
+    /// </summary>
+    public abstract class HydraulicBoundaryLocationCalculationContext : ObservableWrappedObjectContextBase<HydraulicBoundaryLocationCalculation>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="HydraulicBoundaryLocationCalculationContext"/>.
+        /// </summary>
+        /// <param name="wrappedData">The <see cref="HydraulicBoundaryLocationCalculation"/> which the
+        /// <see cref="HydraulicBoundaryLocationCalculationContext"/> belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedData"/> is <c>null</c>.</exception>
+        protected HydraulicBoundaryLocationCalculationContext(HydraulicBoundaryLocationCalculation wrappedData)
+            : base(wrappedData) {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs	(revision c95bf61382d8082993849902356f7177845994d9)
@@ -0,0 +1,53 @@
+// Copyright (C) Stichting Deltares 2017. 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 Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PresentationObjects;
+
+namespace Ringtoets.Common.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class HydraulicBoundaryLocationCalculationContextTest
+    {
+        [Test]
+        public void Constructor_ValidParameters_ExpectedValues()
+        {
+            // Setup
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+
+            // Call
+            var context = new TestHydraulicBoundaryLocationContext(hydraulicBoundaryLocationCalculation);
+
+            // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<HydraulicBoundaryLocationCalculation>>(context);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, context.WrappedData);
+        }
+
+        private class TestHydraulicBoundaryLocationContext : HydraulicBoundaryLocationCalculationContext
+        {
+            public TestHydraulicBoundaryLocationContext(HydraulicBoundaryLocationCalculation calculation)
+                : base(calculation) {}
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelCalculationContext.cs
===================================================================
diff -u -r144184f501703e05c66062fa44040fa89d99f694 -rc95bf61382d8082993849902356f7177845994d9
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelCalculationContext.cs	(.../DesignWaterLevelCalculationContext.cs)	(revision 144184f501703e05c66062fa44040fa89d99f694)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelCalculationContext.cs	(.../DesignWaterLevelCalculationContext.cs)	(revision c95bf61382d8082993849902356f7177845994d9)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.PresentationObjects
 {
Fisheye: Tag c95bf61382d8082993849902356f7177845994d9 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightCalculationContext.cs
===================================================================
diff -u -r277474bff827855e198867eb1a794ec7f44d54b2 -rc95bf61382d8082993849902356f7177845994d9
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightCalculationContext.cs	(.../WaveHeightCalculationContext.cs)	(revision 277474bff827855e198867eb1a794ec7f44d54b2)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightCalculationContext.cs	(.../WaveHeightCalculationContext.cs)	(revision c95bf61382d8082993849902356f7177845994d9)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.PresentationObjects
 {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelCalculationContextTest.cs
===================================================================
diff -u -r144184f501703e05c66062fa44040fa89d99f694 -rc95bf61382d8082993849902356f7177845994d9
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelCalculationContextTest.cs	(.../DesignWaterLevelCalculationContextTest.cs)	(revision 144184f501703e05c66062fa44040fa89d99f694)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelCalculationContextTest.cs	(.../DesignWaterLevelCalculationContextTest.cs)	(revision c95bf61382d8082993849902356f7177845994d9)
@@ -22,6 +22,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.Test.PresentationObjects
Fisheye: Tag c95bf61382d8082993849902356f7177845994d9 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightCalculationContextTest.cs
===================================================================
diff -u -r277474bff827855e198867eb1a794ec7f44d54b2 -rc95bf61382d8082993849902356f7177845994d9
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightCalculationContextTest.cs	(.../WaveHeightCalculationContextTest.cs)	(revision 277474bff827855e198867eb1a794ec7f44d54b2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightCalculationContextTest.cs	(.../WaveHeightCalculationContextTest.cs)	(revision c95bf61382d8082993849902356f7177845994d9)
@@ -22,6 +22,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.Test.PresentationObjects