Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs
===================================================================
diff -u -rb256a79f2db930bab9714b96f3b803c13327f8cb -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs)	(revision b256a79f2db930bab9714b96f3b803c13327f8cb)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -39,7 +39,7 @@
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties : HydraulicBoundaryLocationsProperties
     {
         /// <summary>
-        /// Creates a new instance of <see cref="GrassCoverErosionOutwardsDesignWaterLevelLocationProperties"/>.
+        /// Creates a new instance of <see cref="GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocationCalculations">The hydraulic boundary location calculations to set as data.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculations"/> is <c>null</c>.</exception>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelCalculationProperties.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelCalculationProperties.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelCalculationProperties.cs	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -0,0 +1,76 @@
+// 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 System.ComponentModel;
+using Core.Common.Base.Data;
+using Core.Common.Gui.Attributes;
+using Core.Common.Util;
+using Core.Common.Util.Attributes;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="HydraulicBoundaryLocationCalculation"/> with <see cref="DesignWaterLevel"/> for properties panel.
+    /// </summary>
+    public class DesignWaterLevelCalculationProperties : HydraulicBoundaryLocationCalculationProperties
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="DesignWaterLevelCalculationProperties"/>.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationCalculation">The hydraulic boundary location calculation.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
+        public DesignWaterLevelCalculationProperties(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+            : base(hydraulicBoundaryLocationCalculation) {}
+
+        [PropertyOrder(4)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_Description))]
+        [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
+        public RoundedDouble DesignWaterLevel
+        {
+            get
+            {
+                return data.Output?.Result ?? RoundedDouble.NaN;
+            }
+        }
+
+        [PropertyOrder(9)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_Convergence_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description))]
+        public string Convergence
+        {
+            get
+            {
+                CalculationConvergence convergence = data.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
+
+                return new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 63ca446f378484b5dc555b2db50b77f8ff94fa7b refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsProperties.cs
===================================================================
diff -u -r35e1698004b87d0434fdf0b65d19b65783da9eea -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsProperties.cs	(.../DesignWaterLevelLocationsProperties.cs)	(revision 35e1698004b87d0434fdf0b65d19b65783da9eea)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsProperties.cs	(.../DesignWaterLevelLocationsProperties.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -38,7 +38,7 @@
     public class DesignWaterLevelLocationsProperties : HydraulicBoundaryLocationsProperties
     {
         /// <summary>
-        /// Creates a new instance of <see cref="DesignWaterLevelLocationProperties"/>.
+        /// Creates a new instance of <see cref="DesignWaterLevelLocationsProperties"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocationCalculations">The list of hydraulic boundary location calculations to set as data.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculations"/> is <c>null</c>.</exception>
@@ -49,11 +49,11 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Locations_DisplayName))]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Locations_Description))]
-        public DesignWaterLevelLocationProperties[] Locations
+        public DesignWaterLevelCalculationProperties[] Locations
         {
             get
             {
-                return data.Select(calculation => new DesignWaterLevelLocationProperties(calculation)).ToArray();
+                return data.Select(calculation => new DesignWaterLevelCalculationProperties(calculation)).ToArray();
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsProperties.cs
===================================================================
diff -u -r35e1698004b87d0434fdf0b65d19b65783da9eea -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsProperties.cs	(.../WaveHeightLocationsProperties.cs)	(revision 35e1698004b87d0434fdf0b65d19b65783da9eea)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsProperties.cs	(.../WaveHeightLocationsProperties.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -38,7 +38,7 @@
     public class WaveHeightLocationsProperties : HydraulicBoundaryLocationsProperties
     {
         /// <summary>
-        /// Creates a new instance of <see cref="WaveHeightLocationProperties"/>.
+        /// Creates a new instance of <see cref="WaveHeightLocationsProperties"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocationCalculations">The list of hydraulic boundary location calculations to set as data.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculations"/> is <c>null</c>.</exception>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r0cea6a39ff67fb3eabb0d9281251908d3b70647b -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 0cea6a39ff67fb3eabb0d9281251908d3b70647b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -41,7 +41,7 @@
     <Compile Include="PropertyClasses\CalculationContextProperties.cs" />
     <Compile Include="PropertyClasses\CalculationGroupContextProperties.cs" />
     <Compile Include="PropertyClasses\DesignWaterLevelLocationsProperties.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelLocationProperties.cs" />
+    <Compile Include="PropertyClasses\DesignWaterLevelCalculationProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismContributionProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\PipingStructureFailureMechanismProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\MacroStabilityOutwardsFailureMechanismProperties.cs" />
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rce561618912064d21fb1d5a1eb004a0a72deceda -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision ce561618912064d21fb1d5a1eb004a0a72deceda)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -337,9 +337,9 @@
                     return new DesignWaterLevelLocationsProperties(hydraulicBoundaryLocationCalculations);
                 }
             };
-            yield return new PropertyInfo<DesignWaterLevelLocationContext, DesignWaterLevelLocationProperties>
+            yield return new PropertyInfo<DesignWaterLevelLocationContext, DesignWaterLevelCalculationProperties>
             {
-                CreateInstance = context => new DesignWaterLevelLocationProperties(context.Calculation)
+                CreateInstance = context => new DesignWaterLevelCalculationProperties(context.Calculation)
             };
             yield return new PropertyInfo<WaveHeightLocationsContext, WaveHeightLocationsProperties>
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -0,0 +1,313 @@
+// 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 System.ComponentModel;
+using Core.Common.Gui.Converters;
+using Core.Common.TestUtil;
+using Core.Common.Util;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Integration.Forms.PropertyClasses;
+
+namespace Ringtoets.Integration.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class DesignWaterLevelCalculationPropertiesTest
+    {
+        private const int idPropertyIndex = 0;
+        private const int namePropertyIndex = 1;
+        private const int coordinatesPropertyIndex = 2;
+        private const int designWaterLevelPropertyIndex = 3;
+        private const int targetProbabilityPropertyIndex = 4;
+        private const int targetReliabilityPropertyIndex = 5;
+        private const int calculatedProbabilityPropertyIndex = 6;
+        private const int calculatedReliabilityPropertyIndex = 7;
+        private const int convergencePropertyIndex = 8;
+        private const int shouldCalculateIllustrationPointsIndex = 9;
+        private const int governingWindDirectionIndex = 10;
+        private const int alphaValuesIndex = 11;
+        private const int durationsIndex = 12;
+        private const int illustrationPointsIndex = 13;
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+
+            // Call
+            var properties = new DesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
+
+            // Assert
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationProperties>(properties);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Data);
+        }
+
+        [Test]
+        public void Constructor_WithoutGeneralIllustrationPointsResult_PropertiesHaveExpectedAttributesValues()
+        {
+            // Setup
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+
+            // Call
+            var properties = new DesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
+
+            // Assert
+            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
+
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+            Assert.AreEqual(10, dynamicProperties.Count);
+
+            const string generalCategory = "Algemeen";
+            const string resultCategory = "Resultaat";
+            const string illustrationPointsCategory = "Illustratiepunten";
+
+            PropertyDescriptor idProperty = dynamicProperties[idPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty,
+                                                                            generalCategory,
+                                                                            "ID",
+                                                                            "ID van de hydraulische randvoorwaardenlocatie in de database.",
+                                                                            true);
+
+            PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
+                                                                            generalCategory,
+                                                                            "Naam",
+                                                                            "Naam van de hydraulische randvoorwaardenlocatie.",
+                                                                            true);
+
+            PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(coordinatesProperty,
+                                                                            generalCategory,
+                                                                            "Coördinaten [m]",
+                                                                            "Coördinaten van de hydraulische randvoorwaardenlocatie.",
+                                                                            true);
+
+            PropertyDescriptor designWaterLevelProperty = dynamicProperties[designWaterLevelPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(designWaterLevelProperty,
+                                                                            resultCategory,
+                                                                            "Toetspeil [m+NAP]",
+                                                                            "Berekend toetspeil.",
+                                                                            true);
+
+            PropertyDescriptor targetProbabilityProperty = dynamicProperties[targetProbabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetProbabilityProperty,
+                                                                            resultCategory,
+                                                                            "Doelkans [1/jaar]",
+                                                                            "De ingevoerde kans waarvoor het resultaat moet worden berekend.",
+                                                                            true);
+
+            PropertyDescriptor targetReliabilityProperty = dynamicProperties[targetReliabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetReliabilityProperty,
+                                                                            resultCategory,
+                                                                            "Betrouwbaarheidsindex doelkans [-]",
+                                                                            "Betrouwbaarheidsindex van de ingevoerde kans waarvoor het resultaat moet worden berekend.",
+                                                                            true);
+
+            PropertyDescriptor calculatedProbabilityProperty = dynamicProperties[calculatedProbabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculatedProbabilityProperty,
+                                                                            resultCategory,
+                                                                            "Berekende kans [1/jaar]",
+                                                                            "De berekende kans van voorkomen van het berekende resultaat.",
+                                                                            true);
+
+            PropertyDescriptor calculatedReliabilityProperty = dynamicProperties[calculatedReliabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculatedReliabilityProperty,
+                                                                            resultCategory,
+                                                                            "Betrouwbaarheidsindex berekende kans [-]",
+                                                                            "Betrouwbaarheidsindex van de berekende kans van voorkomen van het berekende resultaat.",
+                                                                            true);
+
+            PropertyDescriptor convergenceProperty = dynamicProperties[convergencePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty,
+                                                                            resultCategory,
+                                                                            "Convergentie",
+                                                                            "Is convergentie bereikt in de toetspeil berekening?",
+                                                                            true);
+
+            PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculateIllustrationPointsProperty,
+                                                                            illustrationPointsCategory,
+                                                                            "Illustratiepunten inlezen",
+                                                                            "Neem de informatie over de illustratiepunten op in het berekeningsresultaat.");
+        }
+
+        [Test]
+        public void Constructor_WithGeneralIllustrationPointsResult_PropertiesHaveExpectedAttributesValues()
+        {
+            // Setup
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+            {
+                Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint())
+            };
+
+            // Call
+            var properties = new DesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
+
+            // Assert
+            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
+
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+            Assert.AreEqual(14, dynamicProperties.Count);
+
+            const string generalCategory = "Algemeen";
+            const string resultCategory = "Resultaat";
+            const string illustrationPointsCategory = "Illustratiepunten";
+
+            PropertyDescriptor idProperty = dynamicProperties[idPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty,
+                                                                            generalCategory,
+                                                                            "ID",
+                                                                            "ID van de hydraulische randvoorwaardenlocatie in de database.",
+                                                                            true);
+
+            PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
+                                                                            generalCategory,
+                                                                            "Naam",
+                                                                            "Naam van de hydraulische randvoorwaardenlocatie.",
+                                                                            true);
+
+            PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(coordinatesProperty,
+                                                                            generalCategory,
+                                                                            "Coördinaten [m]",
+                                                                            "Coördinaten van de hydraulische randvoorwaardenlocatie.",
+                                                                            true);
+
+            PropertyDescriptor designWaterLevelProperty = dynamicProperties[designWaterLevelPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(designWaterLevelProperty,
+                                                                            resultCategory,
+                                                                            "Toetspeil [m+NAP]",
+                                                                            "Berekend toetspeil.",
+                                                                            true);
+
+            PropertyDescriptor targetProbabilityProperty = dynamicProperties[targetProbabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetProbabilityProperty,
+                                                                            resultCategory,
+                                                                            "Doelkans [1/jaar]",
+                                                                            "De ingevoerde kans waarvoor het resultaat moet worden berekend.",
+                                                                            true);
+
+            PropertyDescriptor targetReliabilityProperty = dynamicProperties[targetReliabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetReliabilityProperty,
+                                                                            resultCategory,
+                                                                            "Betrouwbaarheidsindex doelkans [-]",
+                                                                            "Betrouwbaarheidsindex van de ingevoerde kans waarvoor het resultaat moet worden berekend.",
+                                                                            true);
+
+            PropertyDescriptor calculatedProbabilityProperty = dynamicProperties[calculatedProbabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculatedProbabilityProperty,
+                                                                            resultCategory,
+                                                                            "Berekende kans [1/jaar]",
+                                                                            "De berekende kans van voorkomen van het berekende resultaat.",
+                                                                            true);
+
+            PropertyDescriptor calculatedReliabilityProperty = dynamicProperties[calculatedReliabilityPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculatedReliabilityProperty,
+                                                                            resultCategory,
+                                                                            "Betrouwbaarheidsindex berekende kans [-]",
+                                                                            "Betrouwbaarheidsindex van de berekende kans van voorkomen van het berekende resultaat.",
+                                                                            true);
+
+            PropertyDescriptor convergenceProperty = dynamicProperties[convergencePropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty,
+                                                                            resultCategory,
+                                                                            "Convergentie",
+                                                                            "Is convergentie bereikt in de toetspeil berekening?",
+                                                                            true);
+
+            PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculateIllustrationPointsProperty,
+                                                                            illustrationPointsCategory,
+                                                                            "Illustratiepunten inlezen",
+                                                                            "Neem de informatie over de illustratiepunten op in het berekeningsresultaat.");
+
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[governingWindDirectionIndex],
+                                                                            illustrationPointsCategory,
+                                                                            "Maatgevende windrichting",
+                                                                            "De windrichting waarvoor de berekende betrouwbaarheidsindex het laagst is.",
+                                                                            true);
+
+            TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, KeyValueExpandableArrayConverter>(nameof(HydraulicBoundaryLocationCalculationProperties.AlphaValues));
+            PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesIndex];
+            Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]);
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty,
+                                                                            illustrationPointsCategory,
+                                                                            "Invloedscoëfficiënten [-]",
+                                                                            "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.",
+                                                                            true);
+
+            TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, KeyValueExpandableArrayConverter>(nameof(HydraulicBoundaryLocationCalculationProperties.Durations));
+            PropertyDescriptor durationsProperty = dynamicProperties[durationsIndex];
+            Assert.NotNull(durationsProperty.Attributes[typeof(KeyValueElementAttribute)]);
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty,
+                                                                            illustrationPointsCategory,
+                                                                            "Tijdsduren [uur]",
+                                                                            "Tijdsduren waarop de stochasten betrekking hebben.",
+                                                                            true);
+
+            TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, ExpandableArrayConverter>(nameof(HydraulicBoundaryLocationCalculationProperties.IllustrationPoints));
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[illustrationPointsIndex],
+                                                                            illustrationPointsCategory,
+                                                                            "Illustratiepunten",
+                                                                            "De lijst van illustratiepunten voor de berekening.",
+                                                                            true);
+        }
+
+        [Test]
+        public void GetProperties_Always_ReturnsExpectedValues()
+        {
+            // Setup
+            var random = new Random();
+            double designWaterLevel = random.NextDouble();
+            var convergence = random.NextEnumValue<CalculationConvergence>();
+
+            var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(designWaterLevel,
+                                                                                      random.NextDouble(),
+                                                                                      random.NextDouble(),
+                                                                                      random.NextDouble(),
+                                                                                      random.NextDouble(),
+                                                                                      convergence,
+                                                                                      new TestGeneralResultSubMechanismIllustrationPoint());
+
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
+            {
+                Output = hydraulicBoundaryLocationOutput
+            };
+
+            // Call
+            var properties = new DesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
+
+            // Assert
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.DesignWaterLevel, hydraulicBoundaryLocationCalculation.Output.Result.GetAccuracy());
+
+            string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
+            Assert.AreEqual(convergenceValue, properties.Convergence);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 63ca446f378484b5dc555b2db50b77f8ff94fa7b refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs
===================================================================
diff -u -rdaeae61c2082576170144e77499bc74851171a97 -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs	(.../DesignWaterLevelLocationsPropertiesTest.cs)	(revision daeae61c2082576170144e77499bc74851171a97)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs	(.../DesignWaterLevelLocationsPropertiesTest.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -91,18 +91,18 @@
             });
 
             // Assert
-            CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(DesignWaterLevelLocationProperties));
+            CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(DesignWaterLevelCalculationProperties));
             Assert.AreEqual(1, properties.Locations.Length);
             TestHelper.AssertTypeConverter<DesignWaterLevelLocationsProperties,
                 ExpandableArrayConverter>(nameof(DesignWaterLevelLocationsProperties.Locations));
 
-            DesignWaterLevelLocationProperties designWaterLevelLocationProperties = properties.Locations.First();
-            Assert.AreEqual(hydraulicBoundaryLocation.Name, designWaterLevelLocationProperties.Name);
-            Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelLocationProperties.Id);
-            Assert.AreEqual(hydraulicBoundaryLocation.Location, designWaterLevelLocationProperties.Location);
+            DesignWaterLevelCalculationProperties designWaterLevelCalculationProperties = properties.Locations.First();
+            Assert.AreEqual(hydraulicBoundaryLocation.Name, designWaterLevelCalculationProperties.Name);
+            Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelCalculationProperties.Id);
+            Assert.AreEqual(hydraulicBoundaryLocation.Location, designWaterLevelCalculationProperties.Location);
 
             RoundedDouble designWaterLevel = hydraulicBoundaryLocationCalculation.Output.Result;
-            Assert.AreEqual(designWaterLevel, designWaterLevelLocationProperties.DesignWaterLevel, designWaterLevel.GetAccuracy());
+            Assert.AreEqual(designWaterLevel, designWaterLevelCalculationProperties.DesignWaterLevel, designWaterLevel.GetAccuracy());
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r0cea6a39ff67fb3eabb0d9281251908d3b70647b -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 0cea6a39ff67fb3eabb0d9281251908d3b70647b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -56,7 +56,7 @@
     <Compile Include="PropertyClasses\CalculationGroupContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\CalculationContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\DesignWaterLevelLocationsPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelLocationPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\DesignWaterLevelCalculationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismContributionPropertiesTest.cs" />
     <Compile Include="PropertyClasses\WaveHeightLocationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\RingtoetsProjectPropertiesTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationContextPropertyInfoTest.cs
===================================================================
diff -u -r5f6b18a7cf6b3d8b5ca0f90e72b27a0726fc3bd0 -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationContextPropertyInfoTest.cs)	(revision 5f6b18a7cf6b3d8b5ca0f90e72b27a0726fc3bd0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationContextPropertyInfoTest.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -46,7 +46,7 @@
 
                 // Assert
                 Assert.AreEqual(typeof(DesignWaterLevelLocationContext), info.DataType);
-                Assert.AreEqual(typeof(DesignWaterLevelLocationProperties), info.PropertyObjectType);
+                Assert.AreEqual(typeof(DesignWaterLevelCalculationProperties), info.PropertyObjectType);
             }
         }
 
@@ -72,9 +72,9 @@
                 IObjectProperties objectProperties = info.CreateInstance(context);
 
                 // Assert
-                Assert.IsInstanceOf<DesignWaterLevelLocationProperties>(objectProperties);
+                Assert.IsInstanceOf<DesignWaterLevelCalculationProperties>(objectProperties);
                 Assert.AreSame(hydraulicBoundaryLocationCalculation, objectProperties.Data);
-                RoundedDouble actualDesignWaterLevel = ((DesignWaterLevelLocationProperties) objectProperties).DesignWaterLevel;
+                RoundedDouble actualDesignWaterLevel = ((DesignWaterLevelCalculationProperties) objectProperties).DesignWaterLevel;
                 Assert.AreEqual(designWaterLevel, actualDesignWaterLevel, actualDesignWaterLevel.GetAccuracy());
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -re61200e6c946ac66439f9788cb96dd1ca76c1a7d -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision e61200e6c946ac66439f9788cb96dd1ca76c1a7d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationsContextPropertyInfoTest.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -96,7 +96,7 @@
                 // Assert
                 Assert.IsInstanceOf<DesignWaterLevelLocationsProperties>(objectProperties);
                 Assert.AreSame(hydraulicBoundaryLocations, objectProperties.Data);
-                DesignWaterLevelLocationProperties[] locationProperties = ((DesignWaterLevelLocationsProperties) objectProperties).Locations;
+                DesignWaterLevelCalculationProperties[] locationProperties = ((DesignWaterLevelLocationsProperties) objectProperties).Locations;
                 CollectionAssert.AreEqual(hydraulicBoundaryLocations, locationProperties.Select(p => p.Data));
                 CollectionAssert.AreEqual(hydraulicBoundaryLocationCalculations.Select(c => c.Output.Result), locationProperties.Select(p => p.DesignWaterLevel));
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r26ee4ff0515942af0d34790c13a16ac78f67e891 -r63ca446f378484b5dc555b2db50b77f8ff94fa7b
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 26ee4ff0515942af0d34790c13a16ac78f67e891)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
@@ -283,7 +283,7 @@
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DesignWaterLevelLocationContext),
-                    typeof(DesignWaterLevelLocationProperties));
+                    typeof(DesignWaterLevelCalculationProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,