Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -re7cb11ec540f2b66ee32df78c5aa745252a075c5 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -1803,7 +1803,7 @@ } /// - /// Looks up a localized string similar to Invloedscoëfficienten [-]. + /// Looks up a localized string similar to Invloedscoëfficiënten [-]. /// public static string IllustrationPoint_AlphaValues_DisplayName { get { @@ -1956,7 +1956,7 @@ } /// - /// Looks up a localized string similar to Invloedscoëfficient^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 -re7cb11ec540f2b66ee32df78c5aa745252a075c5 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -1012,7 +1012,7 @@ Berekende invloedscoëfficiënten voor alle beschouwde stochasten. - Invloedscoëfficienten [-] + Invloedscoëfficiënten [-] De keringsituatie waarvoor dit illustratiepunt is berekend. @@ -1120,7 +1120,7 @@ Stochastwaarden - Invloedscoëfficient^2 + Invloedscoëfficiënt^2 D&upliceren Fisheye: Tag 86e28c84061c61cc4c0922c33d0ef74b683ad965 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointValuesProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs =================================================================== diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -89,11 +89,11 @@ [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_IllustrationPointValues_DisplayName))] - public IllustrationPointValuesProperties IllustrationPointValuesProperties + public SubMechanismIllustrationPointValuesProperties SubMechanismIllustrationPointValues { get { - return new IllustrationPointValuesProperties(subMechanismIllustrationPoint); + return new SubMechanismIllustrationPointValuesProperties(subMechanismIllustrationPoint); } } } 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 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -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/TopLevelSubMechanismIllustrationPointProperties.cs =================================================================== diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs (.../TopLevelSubMechanismIllustrationPointProperties.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs (.../TopLevelSubMechanismIllustrationPointProperties.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -162,11 +162,11 @@ [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_IllustrationPointValues_DisplayName))] - public IllustrationPointValuesProperties IllustrationPointValuesProperties + public SubMechanismIllustrationPointValuesProperties SubMechanismIllustrationPointValues { get { - return new IllustrationPointValuesProperties(data.SubMechanismIllustrationPoint); + return new SubMechanismIllustrationPointValuesProperties(data.SubMechanismIllustrationPoint); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -rfd69c584e0201271b6994b2b0d7d5ce07be23ad4 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision fd69c584e0201271b6994b2b0d7d5ce07be23ad4) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -86,7 +86,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs =================================================================== diff -u -re7cb11ec540f2b66ee32df78c5aa745252a075c5 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs (.../FaultTreeIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs (.../FaultTreeIllustrationPointPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -178,7 +178,7 @@ PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Fisheye: Tag 86e28c84061c61cc4c0922c33d0ef74b683ad965 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointValuesPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs =================================================================== diff -u -r98337ba56cc4d4b2217c26812e96e9401a263d56 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs (.../StructuresOutputPropertiesTest.cs) (revision 98337ba56cc4d4b2217c26812e96e9401a263d56) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs (.../StructuresOutputPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -204,7 +204,7 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs =================================================================== diff -u -re7cb11ec540f2b66ee32df78c5aa745252a075c5 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs (.../SubMechanismIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs (.../SubMechanismIllustrationPointPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -96,8 +96,8 @@ CollectionAssert.AreEqual(illustrationPoint.Stochasts, properties.Durations); TestHelper.AssertTypeConverter( - nameof(SubMechanismIllustrationPointProperties.IllustrationPointValuesProperties)); - Assert.AreSame(illustrationPoint, properties.IllustrationPointValuesProperties.Data); + nameof(SubMechanismIllustrationPointProperties.SubMechanismIllustrationPointValues)); + Assert.AreSame(illustrationPoint, properties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -147,7 +147,7 @@ PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", 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 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -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 grootheden", + "Waarden van variabelen in het illustratiepunt.", + true); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs =================================================================== diff -u -re7cb11ec540f2b66ee32df78c5aa745252a075c5 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs (.../TopLevelFaultTreeIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs (.../TopLevelFaultTreeIllustrationPointPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -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,12 +124,12 @@ 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]; @@ -156,7 +156,7 @@ PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex - 1]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); @@ -185,12 +185,12 @@ 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]; @@ -224,7 +224,7 @@ PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphasProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs =================================================================== diff -u -re7cb11ec540f2b66ee32df78c5aa745252a075c5 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs (.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs (.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -184,7 +184,7 @@ CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.Durations); Assert.AreSame(illustrationPoint.SubMechanismIllustrationPoint, - properties.IllustrationPointValuesProperties.Data); + properties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -253,7 +253,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, generalCategory, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); @@ -329,7 +329,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, generalCategory, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -rfd69c584e0201271b6994b2b0d7d5ce07be23ad4 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision fd69c584e0201271b6994b2b0d7d5ce07be23ad4) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -107,7 +107,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs =================================================================== diff -u -r61c17754af7613e0ec935668463fc90066c03380 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision 61c17754af7613e0ec935668463fc90066c03380) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -70,7 +70,7 @@ // Assert var stackChartControl = (StackChartControl) new ControlTester("stackChartControl").TheObject; - Assert.AreEqual("Invloedscoëfficient^2", stackChartControl.VerticalAxisTitle); + Assert.AreEqual("Invloedscoëfficiënt^2", stackChartControl.VerticalAxisTitle); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs =================================================================== diff -u -r98337ba56cc4d4b2217c26812e96e9401a263d56 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs (.../DikeHeightOutputPropertiesTest.cs) (revision 98337ba56cc4d4b2217c26812e96e9401a263d56) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs (.../DikeHeightOutputPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -282,7 +282,7 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs =================================================================== diff -u -r98337ba56cc4d4b2217c26812e96e9401a263d56 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision 98337ba56cc4d4b2217c26812e96e9401a263d56) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -324,7 +324,7 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex - waveHeightNotPresentOffset]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs =================================================================== diff -u -r98337ba56cc4d4b2217c26812e96e9401a263d56 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs (.../OvertoppingRateOutputPropertiesTest.cs) (revision 98337ba56cc4d4b2217c26812e96e9401a263d56) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs (.../OvertoppingRateOutputPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -282,7 +282,7 @@ PropertyDescriptor alphaValuesProperty = dynamicProperties[alphaValuesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategoryName, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs =================================================================== diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -164,7 +164,7 @@ Assert.AreEqual(expectedProbability, topLevelProperties.CalculatedProbability); CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.AlphaValues); CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.Durations); - Assert.AreSame(subMechanismIllustrationPoint, topLevelProperties.IllustrationPointValuesProperties.Data); + Assert.AreSame(subMechanismIllustrationPoint, topLevelProperties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -254,7 +254,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategory, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs =================================================================== diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -r86e28c84061c61cc4c0922c33d0ef74b683ad965 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 86e28c84061c61cc4c0922c33d0ef74b683ad965) @@ -146,7 +146,7 @@ Assert.AreEqual(expectedProbability, topLevelProperties.CalculatedProbability); CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.AlphaValues); CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, topLevelProperties.Durations); - Assert.AreSame(subMechanismIllustrationPoint, topLevelProperties.IllustrationPointValuesProperties.Data); + Assert.AreSame(subMechanismIllustrationPoint, topLevelProperties.SubMechanismIllustrationPointValues.Data); } [Test] @@ -227,7 +227,7 @@ Assert.NotNull(alphaValuesProperty.Attributes[typeof(KeyValueElementAttribute)]); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(alphaValuesProperty, illustrationPointsCategory, - "Invloedscoëfficienten [-]", + "Invloedscoëfficiënten [-]", "Berekende invloedscoëfficiënten voor alle beschouwde stochasten.", true);