Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -555,7 +555,7 @@ } /// - /// Looks up a localized string similar to Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting.. + /// Looks up a localized string similar to Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting.. /// public static string GeneralResult_ValidateTopLevelIllustrationPoints_ClosingSituation_or_windDirection_not_unique { get { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -385,7 +385,7 @@ Een of meerdere stochasten hebben dezelfde naam. - Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. + Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting. Een of meerdere uitvoer variabelen hebben dezelfde naam. Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rc20bf4d294bbee92c96364ee32dc9f7e242646d5 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c20bf4d294bbee92c96364ee32dc9f7e242646d5) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -1803,7 +1803,7 @@ } /// - /// Looks up a localized string similar to Alfa's [-]. + /// Looks up a localized string similar to Invloedscoëfficiënten [-]. /// public static string IllustrationPoint_AlphaValues_DisplayName { get { @@ -1812,16 +1812,25 @@ } /// - /// Looks up a localized string similar to Het sluitscenario waarvoor dit illustratiepunt is berekend.. + /// Looks up a localized string similar to Berekende kans [-]. /// + public static string IllustrationPoint_CalculatedProbability_DisplayName { + get { + return ResourceManager.GetString("IllustrationPoint_CalculatedProbability_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De keringsituatie waarvoor dit illustratiepunt is berekend.. + /// public static string IllustrationPoint_ClosingSituation_Description { get { return ResourceManager.GetString("IllustrationPoint_ClosingSituation_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Sluitscenario. + /// Looks up a localized string similar to Keringsituatie. /// public static string IllustrationPoint_ClosingSituation_DisplayName { get { @@ -1839,7 +1848,7 @@ } /// - /// Looks up a localized string similar to Tijdsduren [min]. + /// Looks up a localized string similar to Tijdsduren [uur]. /// public static string IllustrationPoint_Durations_DisplayName { get { @@ -1866,6 +1875,15 @@ } /// + /// Looks up a localized string similar to Waarden in het illustratiepunt. + /// + public static string IllustrationPoint_IllustrationPointValues_DisplayName { + get { + return ResourceManager.GetString("IllustrationPoint_IllustrationPointValues_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Realisaties van de stochasten in het illustratiepunt.. /// public static string IllustrationPoint_Realization_Description { @@ -1875,7 +1893,7 @@ } /// - /// Looks up a localized string similar to Realisaties in het illustratiepunt. + /// Looks up a localized string similar to Stochastwaarden. /// public static string IllustrationPoint_Realization_DisplayName { get { @@ -1884,7 +1902,7 @@ } /// - /// Looks up a localized string similar to Waarden van variabelen in het illustratiepunt.. + /// Looks up a localized string similar to Waarden van afgeleide variabelen in het illustratiepunt.. /// public static string IllustrationPoint_Result_Description { get { @@ -1893,7 +1911,7 @@ } /// - /// Looks up a localized string similar to Waarden in het illustratiepunt. + /// Looks up a localized string similar to Afgeleide variabelen. /// public static string IllustrationPoint_Result_DisplayName { get { @@ -1938,7 +1956,7 @@ } /// - /// Looks up a localized string similar to Alfa^2. + /// Looks up a localized string similar to Invloedscoëfficiënt^2. /// public static string IllustrationPointsChartControl_StackChartControl_VerticalAxisTitle { get { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rc20bf4d294bbee92c96364ee32dc9f7e242646d5 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision c20bf4d294bbee92c96364ee32dc9f7e242646d5) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -1000,7 +1000,7 @@ Tijdsduren waarop de stochasten betrekking hebben. - Tijdsduren [min] + Tijdsduren [uur] De windrichting waarvoor de berekende betrouwbaarheidsindex het laagst is. @@ -1012,13 +1012,13 @@ Berekende invloedscoëfficiënten voor alle beschouwde stochasten. - Alfa's [-] + Invloedscoëfficiënten [-] - Het sluitscenario waarvoor dit illustratiepunt is berekend. + De keringsituatie waarvoor dit illustratiepunt is berekend. - Sluitscenario + Keringsituatie De windrichting waarvoor dit illlustratiepunt is berekend. @@ -1117,10 +1117,10 @@ Realisaties van de stochasten in het illustratiepunt. - Realisaties in het illustratiepunt + Stochastwaarden - Alfa^2 + Invloedscoëfficiënt^2 D&upliceren @@ -1207,10 +1207,10 @@ 2D profiel - Waarden van variabelen in het illustratiepunt. + Waarden van afgeleide variabelen in het illustratiepunt. - Waarden in het illustratiepunt + Afgeleide variabelen @@ -1241,4 +1241,10 @@ {0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2}, Verschuiving = {3}) + + Berekende kans [-] + + + Waarden in het illustratiepunt + \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs =================================================================== diff -u -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -68,7 +68,7 @@ [PropertyOrder(1)] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_CalculatedProbability_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_Description))] public double CalculatedProbability { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs =================================================================== diff -u -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -86,35 +86,15 @@ } [PropertyOrder(7)] + [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_Description))] - [TypeConverter(typeof(KeyValueExpandableArrayConverter))] - [KeyValueAsRoundedDoubleWithoutTrailingZeroesElement( - nameof(SubMechanismIllustrationPointStochast.Name), - nameof(SubMechanismIllustrationPointStochast.Realization))] - public SubMechanismIllustrationPointStochast[] Realizations + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_IllustrationPointValues_DisplayName))] + public SubMechanismIllustrationPointValuesProperties SubMechanismIllustrationPointValues { get { - return subMechanismIllustrationPoint.Stochasts.ToArray(); + return new SubMechanismIllustrationPointValuesProperties(subMechanismIllustrationPoint); } } - - [PropertyOrder(8)] - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Result_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Result_Description))] - [TypeConverter(typeof(KeyValueExpandableArrayConverter))] - [KeyValueAsRoundedDoubleWithoutTrailingZeroesElement( - nameof(IllustrationPointResult.Description), - nameof(IllustrationPointResult.Value))] - public IllustrationPointResult[] Results - { - get - { - return subMechanismIllustrationPoint.IllustrationPointResults.ToArray(); - } - } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointValuesProperties.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointValuesProperties.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointValuesProperties.cs (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -0,0 +1,93 @@ +// 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 . +// +// 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 System.Linq; +using Core.Common.Gui.Attributes; +using Core.Common.Gui.Converters; +using Core.Common.Gui.PropertyBag; +using Core.Common.Utils.Attributes; +using Ringtoets.Common.Data.IllustrationPoints; +using Ringtoets.Common.Forms.Properties; + +namespace Ringtoets.Common.Forms.PropertyClasses +{ + /// + /// Properties of the values in the sub mechanism illustration point. + /// + [TypeConverter(typeof(ExpandableObjectConverter))] + public class SubMechanismIllustrationPointValuesProperties : ObjectProperties + { + /// + /// Creates a new instance of the . + /// + /// The sub mechanism illustration point + /// to create the properties for. + /// Thrown when + /// is null. + public SubMechanismIllustrationPointValuesProperties(SubMechanismIllustrationPoint illustrationPoint) + { + if (illustrationPoint == null) + { + throw new ArgumentNullException(nameof(illustrationPoint)); + } + Data = illustrationPoint; + } + + [PropertyOrder(1)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_Description))] + [TypeConverter(typeof(KeyValueExpandableArrayConverter))] + [KeyValueAsRoundedDoubleWithoutTrailingZeroesElement( + nameof(SubMechanismIllustrationPointStochast.Name), + nameof(SubMechanismIllustrationPointStochast.Realization))] + public SubMechanismIllustrationPointStochast[] Realizations + { + get + { + return data.Stochasts.ToArray(); + } + } + + [PropertyOrder(2)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Result_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Result_Description))] + [TypeConverter(typeof(KeyValueExpandableArrayConverter))] + [KeyValueAsRoundedDoubleWithoutTrailingZeroesElement( + nameof(IllustrationPointResult.Description), + nameof(IllustrationPointResult.Value))] + public IllustrationPointResult[] Results + { + get + { + return data.IllustrationPointResults.ToArray(); + } + } + + public override string ToString() + { + return string.Empty; + } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs =================================================================== diff -u -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs (.../TopLevelFaultTreeIllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs (.../TopLevelFaultTreeIllustrationPointProperties.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -62,7 +62,7 @@ } [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_CalculatedProbability_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_Description))] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double CalculatedProbability Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs =================================================================== diff -u -rf4c546fe3a63712c1af8f8350cc2c4529dc4cec9 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs (.../TopLevelSubMechanismIllustrationPointProperties.cs) (revision f4c546fe3a63712c1af8f8350cc2c4529dc4cec9) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs (.../TopLevelSubMechanismIllustrationPointProperties.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -81,7 +81,7 @@ [PropertyOrder(2)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_CalculatedProbability_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_Description))] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double CalculatedProbability @@ -159,33 +159,17 @@ } [PropertyOrder(8)] + [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_Description))] - [TypeConverter(typeof(KeyValueExpandableArrayConverter))] - [KeyValueElement(nameof(SubMechanismIllustrationPointStochast.Name), nameof(SubMechanismIllustrationPointStochast.Realization))] - public SubMechanismIllustrationPointStochast[] Realizations + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_IllustrationPointValues_DisplayName))] + public SubMechanismIllustrationPointValuesProperties SubMechanismIllustrationPointValues { get { - return data.SubMechanismIllustrationPoint.Stochasts.ToArray(); + return new SubMechanismIllustrationPointValuesProperties(data.SubMechanismIllustrationPoint); } } - [PropertyOrder(9)] - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Result_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Result_Description))] - [TypeConverter(typeof(KeyValueExpandableArrayConverter))] - [KeyValueElement(nameof(IllustrationPointResult.Description), nameof(IllustrationPointResult.Value))] - public IllustrationPointResult[] Results - { - get - { - return data.SubMechanismIllustrationPoint.IllustrationPointResults.ToArray(); - } - } - [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -86,6 +86,7 @@ + Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.Designer.cs =================================================================== diff -u -r9d6009f11b5c63518c693e3d3be199ca9279015d -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.Designer.cs (.../IllustrationPointsChartControl.Designer.cs) (revision 9d6009f11b5c63518c693e3d3be199ca9279015d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.Designer.cs (.../IllustrationPointsChartControl.Designer.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -73,7 +73,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.AutoScrollMinSize = new System.Drawing.Size(400, 300); + this.AutoScrollMinSize = new System.Drawing.Size(400, 320); this.Controls.Add(this.stackChartControl); this.Name = "IllustrationPointsChartControl"; this.ResumeLayout(false); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsTableControl.cs =================================================================== diff -u -ra163c5f082694baf5cd491ea36baf6fb040fe868 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsTableControl.cs (.../IllustrationPointsTableControl.cs) (revision a163c5f082694baf5cd491ea36baf6fb040fe868) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsTableControl.cs (.../IllustrationPointsTableControl.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -113,7 +113,7 @@ Resources.IllustrationPoint_ClosingSituation_DisplayName, true); illustrationPointsDataGridViewControl.AddTextBoxColumn(nameof(IllustrationPointRow.Probability), - Resources.CalculationOutput_CalculatedProbability_DisplayName, + Resources.IllustrationPoint_CalculatedProbability_DisplayName, true); illustrationPointsDataGridViewControl.AddTextBoxColumn(nameof(IllustrationPointRow.Reliability), Resources.CalculationOutput_CalculatedReliability_DisplayName, Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultTest.cs =================================================================== diff -u -r831379390ac72116a2f1c3a014063bbd60ab928d -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision 831379390ac72116a2f1c3a014063bbd60ab928d) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -149,7 +149,7 @@ topLevelIllustrationPoints); // Assert - const string expectedMessage = "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting."; + const string expectedMessage = "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs =================================================================== diff -u -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs (.../FaultTreeIllustrationPointPropertiesTest.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs (.../FaultTreeIllustrationPointPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -44,8 +44,6 @@ private const int durationsPropertyIndex = 5; private const int illustrationPointPropertyIndex = 6; - private const string illustrationPointsCategoryName = "Illustratiepunten"; - [Test] public void Constructor_ChildNodesNull_ThrowsArgumentNullException() { @@ -148,10 +146,11 @@ PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Assert.AreEqual(7, dynamicProperties.Count); + const string illustrationPointsCategoryName = "Illustratiepunten"; PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty, illustrationPointsCategoryName, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -172,21 +171,21 @@ PropertyDescriptor closingScenarioProperty = dynamicProperties[closingScenarioPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingScenarioProperty, illustrationPointsCategoryName, - "Sluitscenario", - "Het sluitscenario waarvoor dit illustratiepunt is berekend.", + "Keringsituatie", + "De keringsituatie waarvoor dit illustratiepunt is berekend.", true); PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointPropertiesTest.cs =================================================================== diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointPropertiesTest.cs (.../IllustrationPointPropertiesTest.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointPropertiesTest.cs (.../IllustrationPointPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -127,7 +127,7 @@ PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty, illustrationPointCategoryName, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -148,8 +148,8 @@ PropertyDescriptor closingScenarioProperty = dynamicProperties[closingScenarioPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingScenarioProperty, illustrationPointCategoryName, - "Sluitscenario", - "Het sluitscenario waarvoor dit illustratiepunt is berekend.", + "Keringsituatie", + "De keringsituatie waarvoor dit illustratiepunt is berekend.", true); } @@ -169,7 +169,7 @@ PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty, illustrationPointCategoryName, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs =================================================================== diff -u -r2eab6260ad63e806b10647d64792294139dc2157 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs (.../StructuresOutputPropertiesTest.cs) (revision 2eab6260ad63e806b10647d64792294139dc2157) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs (.../StructuresOutputPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -204,14 +204,14 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs =================================================================== diff -u -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs (.../SubMechanismIllustrationPointPropertiesTest.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs (.../SubMechanismIllustrationPointPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -41,11 +41,8 @@ private const int closingScenarioPropertyIndex = 3; private const int alphasPropertyIndex = 4; private const int durationsPropertyIndex = 5; - private const int realizationsPropertyIndex = 6; - private const int resultsPropertyIndex = 7; + private const int illustrationPointValuesPropertyIndex = 6; - private const string illustrationPointsCategoryName = "Illustratiepunten"; - [Test] public void Constructor_ExpectedValues() { @@ -78,12 +75,6 @@ PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; Assert.NotNull(durationsProperty.Attributes[typeof(KeyValueElementAttribute)]); - PropertyDescriptor realizationsProperty = dynamicProperties[realizationsPropertyIndex]; - Assert.NotNull(realizationsProperty.Attributes[typeof(KeyValueAsRoundedDoubleWithoutTrailingZeroesElementAttribute)]); - - PropertyDescriptor resultsProperty = dynamicProperties[resultsPropertyIndex]; - Assert.NotNull(resultsProperty.Attributes[typeof(KeyValueAsRoundedDoubleWithoutTrailingZeroesElementAttribute)]); - Assert.AreEqual(windDirection, properties.WindDirection); TestHelper.AssertTypeConverter( @@ -104,13 +95,9 @@ nameof(SubMechanismIllustrationPointProperties.Durations)); CollectionAssert.AreEqual(illustrationPoint.Stochasts, properties.Durations); - TestHelper.AssertTypeConverter( - nameof(SubMechanismIllustrationPointProperties.Realizations)); - CollectionAssert.AreEqual(illustrationPoint.Stochasts, properties.Realizations); - - TestHelper.AssertTypeConverter( - nameof(SubMechanismIllustrationPointProperties.Results)); - CollectionAssert.AreEqual(illustrationPoint.IllustrationPointResults, properties.Results); + TestHelper.AssertTypeConverter( + nameof(SubMechanismIllustrationPointProperties.SubMechanismIllustrationPointValues)); + Assert.AreSame(illustrationPoint, properties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -126,12 +113,13 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(subMechanismProperties); - Assert.AreEqual(8, dynamicProperties.Count); + Assert.AreEqual(7, dynamicProperties.Count); + const string illustrationPointsCategoryName = "Illustratiepunten"; PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty, illustrationPointsCategoryName, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -152,36 +140,29 @@ PropertyDescriptor closingScenarioProperty = dynamicProperties[closingScenarioPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingScenarioProperty, illustrationPointsCategoryName, - "Sluitscenario", - "Het sluitscenario waarvoor dit illustratiepunt is berekend.", + "Keringsituatie", + "De keringsituatie waarvoor dit illustratiepunt is berekend.", true); PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); - PropertyDescriptor realizationsProperty = dynamicProperties[realizationsPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(realizationsProperty, + PropertyDescriptor illustrationPointValuesProperties = dynamicProperties[illustrationPointValuesPropertyIndex]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointValuesProperties, illustrationPointsCategoryName, - "Realisaties in het illustratiepunt", - "Realisaties van de stochasten in het illustratiepunt.", - true); - - PropertyDescriptor resultsProperty = dynamicProperties[resultsPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(resultsProperty, - illustrationPointsCategoryName, "Waarden in het illustratiepunt", - "Waarden van variabelen in het illustratiepunt.", + "", true); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointValuesPropertiesTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointValuesPropertiesTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointValuesPropertiesTest.cs (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -0,0 +1,157 @@ +// 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 . +// +// 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 System.Linq; +using Core.Common.Gui.Converters; +using Core.Common.Gui.PropertyBag; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.IllustrationPoints; +using Ringtoets.Common.Forms.PropertyClasses; + +namespace Ringtoets.Common.Forms.Test.PropertyClasses +{ + [TestFixture] + public class SubMechanismIllustrationPointValuesPropertiesTest + { + private const int realizationsPropertyIndex = 0; + private const int resultsPropertyIndex = 1; + + [Test] + public void Constructor_SubMechanismIllustrationPointNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new SubMechanismIllustrationPointValuesProperties(null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("illustrationPoint", exception.ParamName); + } + + [Test] + public void Constructor_WithValidArgument_ReturnsExpectedProperties() + { + // Setup + var random = new Random(21); + var illustrationPoint = new SubMechanismIllustrationPoint(string.Empty, + random.NextDouble(), + Enumerable.Empty(), + Enumerable.Empty()); + + // Call + var properties = new SubMechanismIllustrationPointValuesProperties(illustrationPoint); + + // Assert + Assert.IsInstanceOf>(properties); + Assert.AreSame(illustrationPoint, properties.Data); + + TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true); + Assert.IsInstanceOf(classTypeConverter); + + TestHelper.AssertTypeConverter(nameof(SubMechanismIllustrationPointValuesProperties.Realizations)); + TestHelper.AssertTypeConverter(nameof(SubMechanismIllustrationPointValuesProperties.Results)); + } + + [Test] + public void GetProperties_WithValidData_ReturnsExpectedValues() + { + // Setup + var random = new Random(21); + var stochasts = new[] + { + new SubMechanismIllustrationPointStochast("some name", random.NextDouble(), random.NextDouble(), random.NextDouble()) + }; + var illustrationPointResults = new[] + { + new IllustrationPointResult("some description", random.NextDouble()) + }; + + var illustrationPoint = new SubMechanismIllustrationPoint("name", + random.NextDouble(), + stochasts, + illustrationPointResults); + + // Call + var properties = new SubMechanismIllustrationPointValuesProperties(illustrationPoint); + + // Assert + CollectionAssert.AreEqual(illustrationPoint.Stochasts, properties.Realizations); + CollectionAssert.AreEqual(illustrationPoint.IllustrationPointResults, properties.Results); + } + + [Test] + public void ToString_WithValidData_ReturnsEmptyString() + { + // Setup + var random = new Random(21); + var illustrationPoint = new SubMechanismIllustrationPoint("Not an empty string", + random.NextDouble(), + Enumerable.Empty(), + Enumerable.Empty()); + + var properties = new SubMechanismIllustrationPointValuesProperties(illustrationPoint); + + // Call + string toStringValue = properties.ToString(); + + // Assert + Assert.IsEmpty(toStringValue); + } + + [Test] + public void GetProperties_WithValidData_ReturnsExpectedAttributeValues() + { + // Setup + var random = new Random(21); + var illustrationPoint = new SubMechanismIllustrationPoint("name", + random.NextDouble(), + Enumerable.Empty(), + Enumerable.Empty()); + + // Call + var properties = new SubMechanismIllustrationPointValuesProperties(illustrationPoint); + + // Assert + PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); + Assert.AreEqual(2, dynamicProperties.Count); + + const string category = "Illustratiepunten"; + + PropertyDescriptor realizationsProperty = dynamicProperties[realizationsPropertyIndex]; + Assert.NotNull(realizationsProperty.Attributes[typeof(KeyValueElementAttribute)]); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(realizationsProperty, + category, + "Stochastwaarden", + "Realisaties van de stochasten in het illustratiepunt.", + true); + + PropertyDescriptor resultsProperty = dynamicProperties[resultsPropertyIndex]; + Assert.NotNull(resultsProperty.Attributes[typeof(KeyValueElementAttribute)]); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(resultsProperty, + category, + "Afgeleide variabelen", + "Waarden van afgeleide variabelen in het illustratiepunt.", + true); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs =================================================================== diff -u -rb2db9fb09d24ef2b0c09ec1d90014c86b4f6ebcb -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs (.../TopLevelFaultTreeIllustrationPointPropertiesTest.cs) (revision b2db9fb09d24ef2b0c09ec1d90014c86b4f6ebcb) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs (.../TopLevelFaultTreeIllustrationPointPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -80,38 +80,38 @@ }); // Call - var faultTree = new TopLevelFaultTreeIllustrationPointProperties(topLevel, random.NextBoolean()); + var properties = new TopLevelFaultTreeIllustrationPointProperties(topLevel, random.NextBoolean()); // Assert - Assert.AreEqual("N", faultTree.WindDirection); + Assert.AreEqual(topLevel.WindDirection.Name, properties.WindDirection); TestHelper.AssertTypeConverter( nameof(TopLevelFaultTreeIllustrationPointProperties.Reliability)); - Assert.AreEqual(3.14, faultTree.Reliability.Value); - Assert.AreEqual(5, faultTree.Reliability.NumberOfDecimalPlaces); + Assert.AreEqual(3.14, properties.Reliability.Value); + Assert.AreEqual(5, properties.Reliability.NumberOfDecimalPlaces); TestHelper.AssertTypeConverter( nameof(TopLevelFaultTreeIllustrationPointProperties.CalculatedProbability)); - Assert.AreEqual(StatisticsConverter.ReliabilityToProbability(3.14), faultTree.CalculatedProbability); + Assert.AreEqual(StatisticsConverter.ReliabilityToProbability(3.14), properties.CalculatedProbability); - Assert.AreEqual("closing situation", faultTree.ClosingSituation); + Assert.AreEqual(topLevel.ClosingSituation, properties.ClosingSituation); TestHelper.AssertTypeConverter( nameof(TopLevelFaultTreeIllustrationPointProperties.AlphaValues)); - Assert.IsNotNull(faultTree.AlphaValues); - Assert.AreEqual(1, faultTree.AlphaValues.Length); - Assert.AreEqual(5.5, faultTree.AlphaValues[0].Alpha); + Assert.IsNotNull(properties.AlphaValues); + Assert.AreEqual(1, properties.AlphaValues.Length); + Assert.AreEqual(5.5, properties.AlphaValues[0].Alpha); TestHelper.AssertTypeConverter( nameof(TopLevelFaultTreeIllustrationPointProperties.Durations)); - Assert.IsNotNull(faultTree.Durations); - Assert.AreEqual(1, faultTree.Durations.Length); - Assert.AreEqual(2.5, faultTree.Durations[0].Duration); + Assert.IsNotNull(properties.Durations); + Assert.AreEqual(1, properties.Durations.Length); + Assert.AreEqual(2.5, properties.Durations[0].Duration); TestHelper.AssertTypeConverter( nameof(TopLevelFaultTreeIllustrationPointProperties.IllustrationPoints)); - Assert.IsNotNull(faultTree.IllustrationPoints); - Assert.AreEqual(2, faultTree.IllustrationPoints.Length); + Assert.IsNotNull(properties.IllustrationPoints); + Assert.AreEqual(2, properties.IllustrationPoints.Length); } [Test] @@ -124,18 +124,18 @@ new IllustrationPointNode(new TestFaultTreeIllustrationPoint())); // Call - var topLevelFaultTree = new TopLevelFaultTreeIllustrationPointProperties(topLevel, true); + var properties = new TopLevelFaultTreeIllustrationPointProperties(topLevel, true); // Assert const string illustrationPointsCategoryName = "Illustratiepunten"; - PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(topLevelFaultTree); + PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Assert.AreEqual(6, dynamicProperties.Count); PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty, illustrationPointsCategoryName, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -156,14 +156,14 @@ PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex - 1]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex - 1]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); @@ -185,18 +185,18 @@ new IllustrationPointNode(new TestFaultTreeIllustrationPoint())); // Call - var topLevelFaultTree = new TopLevelFaultTreeIllustrationPointProperties(topLevel, false); + var properties = new TopLevelFaultTreeIllustrationPointProperties(topLevel, false); // Assert const string illustrationPointsCategoryName = "Illustratiepunten"; - PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(topLevelFaultTree); + PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Assert.AreEqual(7, dynamicProperties.Count); PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty, illustrationPointsCategoryName, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -217,21 +217,21 @@ PropertyDescriptor closingSituationProperty = dynamicProperties[closingSituationPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingSituationProperty, illustrationPointsCategoryName, - "Sluitscenario", - "Het sluitscenario waarvoor dit illustratiepunt is berekend.", + "Keringsituatie", + "De keringsituatie waarvoor dit illustratiepunt is berekend.", true); PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs =================================================================== diff -u -rf4c546fe3a63712c1af8f8350cc2c4529dc4cec9 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs (.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs) (revision f4c546fe3a63712c1af8f8350cc2c4529dc4cec9) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs (.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -41,8 +41,7 @@ private const int windDirectionNamePropertyIndex = 3; private const int alphaValuesPropertyIndex = 4; private const int durationsPropertyIndex = 5; - private const int illustrationPointRealizationsPropertyIndex = 6; - private const int illustrationPointResultsPropertyIndex = 7; + private const int illustrationPointValuesPropertyIndex = 6; [Test] public void Constructor_DataNull_ThrowsArgumentNullException() @@ -170,21 +169,22 @@ const string closingSituation = "closingSituation"; const string windDirectionName = "windDirection"; - var context = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(windDirectionName), - closingSituation, - submechanismIllustrationPoint); + var illustrationPoint = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(windDirectionName), + closingSituation, + submechanismIllustrationPoint); // Call - var properties = new TopLevelSubMechanismIllustrationPointProperties(context, Enumerable.Empty()); + var properties = new TopLevelSubMechanismIllustrationPointProperties(illustrationPoint, Enumerable.Empty()); // Assert Assert.AreEqual(illustrationPointName, properties.Name); Assert.AreEqual(windDirectionName, properties.WindDirection); Assert.AreEqual(closingSituation, properties.ClosingSituation); CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.AlphaValues); CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.Durations); - CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.Realizations); - CollectionAssert.AreEqual(submechanismIllustrationPoint.IllustrationPointResults, properties.Results); + + Assert.AreSame(illustrationPoint.SubMechanismIllustrationPoint, + properties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -215,7 +215,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(9, dynamicProperties.Count); + Assert.AreEqual(8, dynamicProperties.Count); const string generalCategory = "Algemeen"; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[namePropertyIndex], @@ -226,7 +226,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[calculatedProbabilityPropertyIndex], generalCategory, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -244,16 +244,16 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[4], generalCategory, - "Sluitscenario", - "Het sluitscenario waarvoor dit illustratiepunt is berekend.", + "Keringsituatie", + "De keringsituatie waarvoor dit illustratiepunt is berekend.", true); TestHelper.AssertTypeConverter(nameof(TopLevelSubMechanismIllustrationPointProperties.AlphaValues)); PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex + 1]; Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, generalCategory, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); @@ -262,26 +262,15 @@ Assert.NotNull(durationsProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, generalCategory, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); - TestHelper.AssertTypeConverter(nameof(TopLevelSubMechanismIllustrationPointProperties.Realizations)); - PropertyDescriptor illustrationPointRealizationsProperty = dynamicProperties[illustrationPointRealizationsPropertyIndex + 1]; - Assert.NotNull(illustrationPointRealizationsProperty.Attributes[typeof(KeyValueElementAttribute)]); - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointRealizationsProperty, + PropertyDescriptor illustrationPointValuesProperties = dynamicProperties[illustrationPointValuesPropertyIndex + 1]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointValuesProperties, generalCategory, - "Realisaties in het illustratiepunt", - "Realisaties van de stochasten in het illustratiepunt.", - true); - - TestHelper.AssertTypeConverter(nameof(TopLevelSubMechanismIllustrationPointProperties.Results)); - PropertyDescriptor illustrationPointResultsProperty = dynamicProperties[illustrationPointResultsPropertyIndex + 1]; - Assert.NotNull(illustrationPointResultsProperty.Attributes[typeof(KeyValueElementAttribute)]); - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointResultsProperty, - generalCategory, "Waarden in het illustratiepunt", - "Waarden van variabelen in het illustratiepunt.", + "", true); } @@ -308,9 +297,9 @@ Assert.IsInstanceOf(classTypeConverter); PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(8, dynamicProperties.Count); - const string generalCategory = "Algemeen"; + Assert.AreEqual(7, dynamicProperties.Count); + const string generalCategory = "Algemeen"; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[namePropertyIndex], generalCategory, "Naam", @@ -319,7 +308,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[calculatedProbabilityPropertyIndex], generalCategory, - "Berekende kans [1/jaar]", + "Berekende kans [-]", "De berekende kans van voorkomen van het berekende resultaat.", true); @@ -340,7 +329,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, generalCategory, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); @@ -349,26 +338,15 @@ Assert.NotNull(durationsProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, generalCategory, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); - TestHelper.AssertTypeConverter(nameof(TopLevelSubMechanismIllustrationPointProperties.Realizations)); - PropertyDescriptor illustrationPointRealizationsProperty = dynamicProperties[illustrationPointRealizationsPropertyIndex]; - Assert.NotNull(illustrationPointRealizationsProperty.Attributes[typeof(KeyValueElementAttribute)]); - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointRealizationsProperty, + PropertyDescriptor illustrationPointValuesProperties = dynamicProperties[illustrationPointValuesPropertyIndex]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointValuesProperties, generalCategory, - "Realisaties in het illustratiepunt", - "Realisaties van de stochasten in het illustratiepunt.", - true); - - TestHelper.AssertTypeConverter(nameof(TopLevelSubMechanismIllustrationPointProperties.Results)); - PropertyDescriptor illustrationPointResultsProperty = dynamicProperties[illustrationPointResultsPropertyIndex]; - Assert.NotNull(illustrationPointResultsProperty.Attributes[typeof(KeyValueElementAttribute)]); - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(illustrationPointResultsProperty, - generalCategory, "Waarden in het illustratiepunt", - "Waarden van variabelen in het illustratiepunt.", + "", true); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -107,6 +107,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs =================================================================== diff -u -re10ab95ca82a0fd744b59df5d0e8063a2be631a6 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision e10ab95ca82a0fd744b59df5d0e8063a2be631a6) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -53,7 +53,7 @@ Assert.IsInstanceOf(chartControl.Controls[0]); Assert.AreEqual(400, chartControl.AutoScrollMinSize.Width); - Assert.AreEqual(300, chartControl.AutoScrollMinSize.Height); + Assert.AreEqual(320, chartControl.AutoScrollMinSize.Height); } [Test] @@ -70,7 +70,7 @@ // Assert var stackChartControl = (StackChartControl) new ControlTester("stackChartControl").TheObject; - Assert.AreEqual("Alfa^2", stackChartControl.VerticalAxisTitle); + Assert.AreEqual("Invloedscoëfficiënt^2", stackChartControl.VerticalAxisTitle); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs =================================================================== diff -u -rda57945a7b1346cbd6cedb57477e4329d75b02c8 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs (.../IllustrationPointsTableControlTest.cs) (revision da57945a7b1346cbd6cedb57477e4329d75b02c8) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs (.../IllustrationPointsTableControlTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -84,12 +84,12 @@ Assert.IsTrue(windDirectionColumn.ReadOnly); DataGridViewColumn closingSituationColumn = dataGridView.Columns[closingScenarioColumnIndex]; - Assert.AreEqual("Sluitscenario", closingSituationColumn.HeaderText); + Assert.AreEqual("Keringsituatie", closingSituationColumn.HeaderText); Assert.IsTrue(closingSituationColumn.ReadOnly); Assert.IsFalse(closingSituationColumn.Visible); DataGridViewColumn calculatedProbabilityColumn = dataGridView.Columns[calculatedProbabilityColumnIndex]; - Assert.AreEqual("Berekende kans [1/jaar]", calculatedProbabilityColumn.HeaderText); + Assert.AreEqual("Berekende kans [-]", calculatedProbabilityColumn.HeaderText); Assert.IsTrue(calculatedProbabilityColumn.ReadOnly); DataGridViewColumn calculatedReliabilityColumn = dataGridView.Columns[calculatedReliabilityColumnIndex]; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs =================================================================== diff -u -r2eab6260ad63e806b10647d64792294139dc2157 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs (.../DikeHeightOutputPropertiesTest.cs) (revision 2eab6260ad63e806b10647d64792294139dc2157) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs (.../DikeHeightOutputPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -282,14 +282,14 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs =================================================================== diff -u -r2eab6260ad63e806b10647d64792294139dc2157 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision 2eab6260ad63e806b10647d64792294139dc2157) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -324,14 +324,14 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex - waveHeightNotPresentOffset]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex - waveHeightNotPresentOffset]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs =================================================================== diff -u -r2eab6260ad63e806b10647d64792294139dc2157 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs (.../OvertoppingRateOutputPropertiesTest.cs) (revision 2eab6260ad63e806b10647d64792294139dc2157) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs (.../OvertoppingRateOutputPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -282,14 +282,14 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); PropertyDescriptor durationsProperty = dynamicProperties[durationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategoryName, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil.Test/GrassCoverErosionInwardsCalculationServiceTestHelperTest.cs =================================================================== diff -u -r2e944cbf52d124fd501ed4ed8e991aa50299cc69 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil.Test/GrassCoverErosionInwardsCalculationServiceTestHelperTest.cs (.../GrassCoverErosionInwardsCalculationServiceTestHelperTest.cs) (revision 2e944cbf52d124fd501ed4ed8e991aa50299cc69) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil.Test/GrassCoverErosionInwardsCalculationServiceTestHelperTest.cs (.../GrassCoverErosionInwardsCalculationServiceTestHelperTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -234,7 +234,7 @@ description, name, $"Fout bij het uitlezen van de illustratiepunten voor berekening {name} ({description}): " + - "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. " + + "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting. " + "Het uitlezen van illustratiepunten wordt overgeslagen."); // Assert @@ -243,10 +243,10 @@ [Test] [TestCase("out bij het uitlezen van de illustratiepunten voor berekening ( ): " + - "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. " + + "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting. " + "Het uitlezen van illustratiepunten wordt overgeslagen.")] [TestCase("out bij het uitlezen van de illustratiepunten voor berekening ( ): " + - "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. " + + "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting. " + "Het uitlezen van illustratiepunten wordt overgeslage")] [TestCase("")] [TestCase(null)] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/GrassCoverErosionInwardsCalculationServiceTestHelper.cs =================================================================== diff -u -r2e944cbf52d124fd501ed4ed8e991aa50299cc69 -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/GrassCoverErosionInwardsCalculationServiceTestHelper.cs (.../GrassCoverErosionInwardsCalculationServiceTestHelper.cs) (revision 2e944cbf52d124fd501ed4ed8e991aa50299cc69) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/GrassCoverErosionInwardsCalculationServiceTestHelper.cs (.../GrassCoverErosionInwardsCalculationServiceTestHelper.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -64,7 +64,7 @@ public static void AssertGeneralResultWithDuplicateIllustrationPoints(string calculationDescription, string calculationName, string actual) { Assert.AreEqual($"Fout bij het uitlezen van de illustratiepunten voor berekening {calculationName} ({calculationDescription}): " + - "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. Het uitlezen van illustratiepunten wordt overgeslagen.", actual); + "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting. Het uitlezen van illustratiepunten wordt overgeslagen.", actual); } public static void AssertGeneralResultWithDuplicateIllustrationPointResults(string calculationDescription, string calculationName, string actual) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs =================================================================== diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs) (revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -154,17 +154,17 @@ TopLevelSubMechanismIllustrationPointProperties topLevelProperties = locationProperties.IllustrationPoints.Single(); - Assert.AreEqual(topLevelIllustrationPoint.SubMechanismIllustrationPoint.Name, topLevelProperties.Name); + SubMechanismIllustrationPoint subMechanismIllustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint; + Assert.AreEqual(subMechanismIllustrationPoint.Name, topLevelProperties.Name); Assert.AreEqual(topLevelIllustrationPoint.WindDirection.Name, topLevelProperties.WindDirection); Assert.AreEqual(topLevelIllustrationPoint.ClosingSituation, topLevelProperties.ClosingSituation); - Assert.AreEqual(topLevelIllustrationPoint.SubMechanismIllustrationPoint.Beta, topLevelProperties.CalculatedReliability); + Assert.AreEqual(subMechanismIllustrationPoint.Beta, topLevelProperties.CalculatedReliability); double expectedProbability = StatisticsConverter.ReliabilityToProbability( - topLevelIllustrationPoint.SubMechanismIllustrationPoint.Beta); + subMechanismIllustrationPoint.Beta); Assert.AreEqual(expectedProbability, topLevelProperties.CalculatedProbability); - CollectionAssert.IsEmpty(topLevelProperties.AlphaValues); - CollectionAssert.IsEmpty(topLevelProperties.Durations); - CollectionAssert.IsEmpty(topLevelProperties.Results); - CollectionAssert.IsEmpty(topLevelProperties.Realizations); + CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.AlphaValues); + CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.Durations); + Assert.AreSame(subMechanismIllustrationPoint, topLevelProperties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -254,7 +254,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategory, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); @@ -264,7 +264,7 @@ Assert.NotNull(durationsProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategory, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs =================================================================== diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rbc0354a180a956cb8a3c03eb57492e1c4f2b395e --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision bc0354a180a956cb8a3c03eb57492e1c4f2b395e) @@ -136,17 +136,17 @@ TopLevelSubMechanismIllustrationPointProperties topLevelProperties = locationProperties.IllustrationPoints.Single(); - Assert.AreEqual(topLevelIllustrationPoint.SubMechanismIllustrationPoint.Name, topLevelProperties.Name); + SubMechanismIllustrationPoint subMechanismIllustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint; + Assert.AreEqual(subMechanismIllustrationPoint.Name, topLevelProperties.Name); Assert.AreEqual(topLevelIllustrationPoint.WindDirection.Name, topLevelProperties.WindDirection); Assert.AreEqual(topLevelIllustrationPoint.ClosingSituation, topLevelProperties.ClosingSituation); - Assert.AreEqual(topLevelIllustrationPoint.SubMechanismIllustrationPoint.Beta, topLevelProperties.CalculatedReliability); + Assert.AreEqual(subMechanismIllustrationPoint.Beta, topLevelProperties.CalculatedReliability); double expectedProbability = StatisticsConverter.ReliabilityToProbability( - topLevelIllustrationPoint.SubMechanismIllustrationPoint.Beta); + subMechanismIllustrationPoint.Beta); Assert.AreEqual(expectedProbability, topLevelProperties.CalculatedProbability); - CollectionAssert.IsEmpty(topLevelProperties.AlphaValues); - CollectionAssert.IsEmpty(topLevelProperties.Durations); - CollectionAssert.IsEmpty(topLevelProperties.Results); - CollectionAssert.IsEmpty(topLevelProperties.Realizations); + CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.AlphaValues); + CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.Durations); + Assert.AreSame(subMechanismIllustrationPoint, topLevelProperties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -227,7 +227,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategory, - "Alfa's [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); @@ -236,7 +236,7 @@ Assert.NotNull(durationsProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(durationsProperty, illustrationPointsCategory, - "Tijdsduren [min]", + "Tijdsduren [uur]", "Tijdsduren waarop de stochasten betrekking hebben.", true);