Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs
===================================================================
diff -u -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7 -r55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs	(.../DesignWaterLevelLocationContext.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs	(.../DesignWaterLevelLocationContext.cs)	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -28,7 +28,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocationCalculation"/>
     /// with a design water level calculation result.
     /// </summary>
-    public class DesignWaterLevelLocationContext : HydraulicBoundaryLocationContext
+    public class DesignWaterLevelLocationContext : HydraulicBoundaryLocationCalculationContext
     {
         /// <summary>
         /// Creates a new instance of <see cref="DesignWaterLevelLocationContext"/>.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationContext.cs	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -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.Integration.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
Fisheye: Tag 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs
===================================================================
diff -u -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7 -r55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs	(.../WaveHeightLocationContext.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs	(.../WaveHeightLocationContext.cs)	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -28,7 +28,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocationCalculation"/>
     /// with a wave height calculation result.
     /// </summary>
-    public class WaveHeightLocationContext : HydraulicBoundaryLocationContext
+    public class WaveHeightLocationContext : HydraulicBoundaryLocationCalculationContext
     {
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightLocationContext"/>.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -ra64d9feaca1f48e4549264af463c89ca6979f5d9 -r55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision a64d9feaca1f48e4549264af463c89ca6979f5d9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -31,7 +31,7 @@
     <Compile Include="PresentationObjects\DesignWaterLevelLocationsGroupContext.cs" />
     <Compile Include="PresentationObjects\DesignWaterLevelLocationsContext.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryDatabaseContext.cs" />
-    <Compile Include="PresentationObjects\HydraulicBoundaryLocationContext.cs" />
+    <Compile Include="PresentationObjects\HydraulicBoundaryLocationCalculationContext.cs" />
     <Compile Include="PresentationObjects\StandAlone\MacroStabilityOutwardsFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\StandAlone\PipingStructureFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\WaveHeightLocationContext.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs
===================================================================
diff -u -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7 -r55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs	(.../DesignWaterLevelLocationContextTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs	(.../DesignWaterLevelLocationContextTest.cs)	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -36,11 +36,11 @@
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             // Call
-            var presentationObject = new DesignWaterLevelLocationContext(hydraulicBoundaryLocationCalculation);
+            var context = new DesignWaterLevelLocationContext(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<HydraulicBoundaryLocationContext>(presentationObject);
-            Assert.AreSame(hydraulicBoundaryLocationCalculation, presentationObject.WrappedData);
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationContext>(context);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, context.WrappedData);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationCalculationContextTest.cs	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -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.Integration.Forms.PresentationObjects;
+
+namespace Ringtoets.Integration.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
Fisheye: Tag 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs
===================================================================
diff -u -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7 -r55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs	(.../WaveHeightLocationContextTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs	(.../WaveHeightLocationContextTest.cs)	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -36,11 +36,11 @@
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             // Call
-            var presentationObject = new WaveHeightLocationContext(hydraulicBoundaryLocationCalculation);
+            var context = new WaveHeightLocationContext(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<HydraulicBoundaryLocationContext>(presentationObject);
-            Assert.AreSame(hydraulicBoundaryLocationCalculation, presentationObject.WrappedData);
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationContext>(context);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, context.WrappedData);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -ra64d9feaca1f48e4549264af463c89ca6979f5d9 -r55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision a64d9feaca1f48e4549264af463c89ca6979f5d9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 55311d5ec9f5dbe89c93bdcd7ae51b7931dbef94)
@@ -50,7 +50,7 @@
     <Compile Include="PresentationObjects\DesignWaterLevelLocationsContextTest.cs" />
     <Compile Include="PresentationObjects\ForeshoreProfilesContextTest.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryDatabaseContextTest.cs" />
-    <Compile Include="PresentationObjects\HydraulicBoundaryLocationContextTest.cs" />
+    <Compile Include="PresentationObjects\HydraulicBoundaryLocationCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\WaveHeightLocationContextTest.cs" />
     <Compile Include="PresentationObjects\WaveHeightLocationsContextTest.cs" />
     <Compile Include="PropertyClasses\CalculationGroupContextPropertiesTest.cs" />