Fisheye: Tag bc298d659aee58c83cabc8094b0404e08dca5aca refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/IllustrationPoint.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubmechanismIllustrationPoint.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubmechanismIllustrationPoint.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubmechanismIllustrationPoint.cs (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -0,0 +1,92 @@ +// 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.Collections.Generic; +using Core.Common.Base.Data; + +namespace Ringtoets.Common.Data.Hydraulics.IllustrationPoints +{ + /// + /// Illustration point which contains the results. + /// + public class SubmechanismIllustrationPoint + { + /// + /// Creates a new instance of . + /// + /// The name of the illustration point result + /// The stochasts for the sub mechanism illustration point. + /// The output variables. + /// The beta value that was realized. + /// Thrown when any of: + /// + /// + /// + /// + /// + /// is null. + public SubmechanismIllustrationPoint(string name, + IEnumerable stochasts, + IEnumerable illustrationPointResults, + double beta) + { + if (name == null) + { + throw new ArgumentNullException(nameof(name)); + } + if (stochasts == null) + { + throw new ArgumentNullException(nameof(stochasts)); + } + if (illustrationPointResults == null) + { + throw new ArgumentNullException(nameof(illustrationPointResults)); + } + + Name = name; + Beta = new RoundedDouble(5, beta); + + Stochasts = stochasts; + IllustrationPointResults = illustrationPointResults; + } + + /// + /// Gets the name of the illustration point. + /// + public string Name { get; } + + /// + /// Gets the beta value that was realized. + /// + public RoundedDouble Beta { get; } + + /// + /// Gets the stochasts that belong to this submechanism illustration point. + /// + public IEnumerable Stochasts { get; } + + /// + /// Gets the output variables. + /// + public IEnumerable IllustrationPointResults { get; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/WindDirectionClosingSituationIllustrationPoint.cs =================================================================== diff -u -r661fb9659decda2fdfc933e3af4a7d75b12c1478 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/WindDirectionClosingSituationIllustrationPoint.cs (.../WindDirectionClosingSituationIllustrationPoint.cs) (revision 661fb9659decda2fdfc933e3af4a7d75b12c1478) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/WindDirectionClosingSituationIllustrationPoint.cs (.../WindDirectionClosingSituationIllustrationPoint.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -25,7 +25,7 @@ { /// /// Combination of , closing situation and - /// . + /// . /// public class WindDirectionClosingSituationIllustrationPoint { @@ -34,11 +34,11 @@ /// /// The wind direction. /// The closing situation. - /// The illustrationPoint. + /// The illustrationPoint. /// Thrown when any input parameter is null. public WindDirectionClosingSituationIllustrationPoint(WindDirection windDirection, string closingSituation, - IllustrationPoint illustrationPoint) + SubmechanismIllustrationPoint submechanismIllustrationPoint) { if (windDirection == null) { @@ -48,14 +48,14 @@ { throw new ArgumentNullException(nameof(closingSituation)); } - if (illustrationPoint == null) + if (submechanismIllustrationPoint == null) { - throw new ArgumentNullException(nameof(illustrationPoint)); + throw new ArgumentNullException(nameof(submechanismIllustrationPoint)); } WindDirection = windDirection; ClosingSituation = closingSituation; - IllustrationPoint = illustrationPoint; + SubmechanismIllustrationPoint = submechanismIllustrationPoint; } /// @@ -69,8 +69,8 @@ public WindDirection WindDirection { get; } /// - /// Gets the illustration point. + /// Gets the submechanism illustration point. /// - public IllustrationPoint IllustrationPoint { get; } + public SubmechanismIllustrationPoint SubmechanismIllustrationPoint { get; } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -69,7 +69,7 @@ - + Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsStackChartDataFactory.cs =================================================================== diff -u -r2ebd17fdb16aa832ad65ef7401dc4968bcba2899 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsStackChartDataFactory.cs (.../RingtoetsStackChartDataFactory.cs) (revision 2ebd17fdb16aa832ad65ef7401dc4968bcba2899) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsStackChartDataFactory.cs (.../RingtoetsStackChartDataFactory.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -104,7 +104,7 @@ foreach (WindDirectionClosingSituationIllustrationPoint illustrationPoint in generalResult.WindDirectionClosingSituationIllustrationPoints) { - stochastValues.AddRange(illustrationPoint.IllustrationPoint.Stochasts + stochastValues.AddRange(illustrationPoint.SubmechanismIllustrationPoint.Stochasts .Select(illustrationPointStochast => new Tuple(illustrationPointStochast.Name, Math.Pow(illustrationPointStochast.Alpha, 2)))); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs (.../WindDirectionClosingSituationIllustrationPointProperties.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs (.../WindDirectionClosingSituationIllustrationPointProperties.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -47,7 +47,7 @@ { get { - return StatisticsConverter.ReliabilityToProbability(data.IllustrationPoint.Beta); + return StatisticsConverter.ReliabilityToProbability(data.SubmechanismIllustrationPoint.Beta); } } @@ -60,7 +60,7 @@ { get { - return data.IllustrationPoint.Beta; + return data.SubmechanismIllustrationPoint.Beta; } } @@ -95,7 +95,7 @@ { get { - return data.IllustrationPoint.Stochasts.ToArray(); + return data.SubmechanismIllustrationPoint.Stochasts.ToArray(); } } @@ -108,7 +108,7 @@ { get { - return data.IllustrationPoint.Stochasts.ToArray(); + return data.SubmechanismIllustrationPoint.Stochasts.ToArray(); } } @@ -121,13 +121,13 @@ { get { - return data.IllustrationPoint.IllustrationPointResults.ToArray(); + return data.SubmechanismIllustrationPoint.IllustrationPointResults.ToArray(); } } public override string ToString() { - return $"{data.IllustrationPoint.Name}"; + return $"{data.SubmechanismIllustrationPoint.Name}"; } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs =================================================================== diff -u -r66a40e718fdf95596f8897d81af4a1a0144cfae4 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs (.../GeneralResultConverter.cs) (revision 66a40e718fdf95596f8897d81af4a1a0144cfae4) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs (.../GeneralResultConverter.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -25,9 +25,9 @@ using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; using HydraWindDirectionClosingSituation = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirectionClosingSituation; using HydraIllustrationPointTreeNode = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointTreeNode; -using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint; using HydraGeneralResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.GeneralResult; using IHydraRingIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IIllustrationPoint; +using SubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint; namespace Ringtoets.Common.Service.IllustrationPoints { @@ -72,7 +72,7 @@ IHydraRingIllustrationPoint hydraIllustrationPoint = illustrationPointTreeNode.Value.Data; HydraWindDirectionClosingSituation hydraWindDirectionClosingSituation = illustrationPointTreeNode.Key; - var subMechanismIllustrationPoint = hydraIllustrationPoint as HydraSubMechanismIllustrationPoint; + var subMechanismIllustrationPoint = hydraIllustrationPoint as SubmechanismIllustrationPoint; if (subMechanismIllustrationPoint != null) { combinations.Add(WindDirectionClosingSituationIllustrationPointConverter.CreateWindDirectionClosingScenarioIllustrationPoint( Fisheye: Tag bc298d659aee58c83cabc8094b0404e08dca5aca refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointConverter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubmechanismIllustrationPointConverter.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubmechanismIllustrationPointConverter.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubmechanismIllustrationPointConverter.cs (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -0,0 +1,64 @@ +// 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.Collections.Generic; +using System.Linq; +using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints; +using HydraSubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint; +using IllustrationPointResult = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.IllustrationPointResult; +using SubmechanismIllustrationPoint = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubmechanismIllustrationPoint; +using SubmechanismIllustrationPointStochast = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubmechanismIllustrationPointStochast; + +namespace Ringtoets.Common.Service.IllustrationPoints +{ + /// + /// The converter that converts data into data. + /// + public static class SubmechanismIllustrationPointConverter + { + /// + /// Creates a new instance of based on the information of . + /// + /// The to base the + /// to create on. + /// The newly created . + /// Thrown when + /// is null. + public static SubmechanismIllustrationPoint CreateSubmechanismIllustrationPoint(HydraSubmechanismIllustrationPoint submechanismIllustrationPoint) + { + if (submechanismIllustrationPoint == null) + { + throw new ArgumentNullException(nameof(submechanismIllustrationPoint)); + } + + IEnumerable stochasts = submechanismIllustrationPoint + .Stochasts.Select(StochastConverter.CreateSubmechanismIllustrationStochast); + IEnumerable illustrationPointResults = submechanismIllustrationPoint + .Results.Select(IllustrationPointResultConverter.CreateIllustrationPointResult); + + return new SubmechanismIllustrationPoint(submechanismIllustrationPoint.Name, + stochasts, + illustrationPointResults, + submechanismIllustrationPoint.Beta); + } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverter.cs =================================================================== diff -u -r5f1c70d7eea83fca2ef6305a87a8098820ded1d9 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverter.cs (.../WindDirectionClosingSituationIllustrationPointConverter.cs) (revision 5f1c70d7eea83fca2ef6305a87a8098820ded1d9) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverter.cs (.../WindDirectionClosingSituationIllustrationPointConverter.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -22,47 +22,50 @@ using System; using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints; +using HydraSubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint; +using SubmechanismIllustrationPoint = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubmechanismIllustrationPoint; using WindDirection = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.WindDirection; namespace Ringtoets.Common.Service.IllustrationPoints { /// /// Converter for and - /// related to creating a + /// related to creating a /// . /// public static class WindDirectionClosingSituationIllustrationPointConverter { /// /// Creates a new instance of /// based on the information of - /// and . + /// and . /// /// The /// to base the on. - /// The + /// The /// to base the on. /// A . /// Thrown when any parameter is null. public static WindDirectionClosingSituationIllustrationPoint CreateWindDirectionClosingScenarioIllustrationPoint( WindDirectionClosingSituation hydraWindDirectionClosingSituation, - SubMechanismIllustrationPoint hydraSubMechanismIllustrationPoint) + HydraSubmechanismIllustrationPoint hydraSubmechanismIllustrationPoint) { if (hydraWindDirectionClosingSituation == null) { throw new ArgumentNullException(nameof(hydraWindDirectionClosingSituation)); } - if (hydraSubMechanismIllustrationPoint == null) + if (hydraSubmechanismIllustrationPoint == null) { - throw new ArgumentNullException(nameof(hydraSubMechanismIllustrationPoint)); + throw new ArgumentNullException(nameof(hydraSubmechanismIllustrationPoint)); } WindDirection windDirection = WindDirectionConverter.CreateWindDirection(hydraWindDirectionClosingSituation.WindDirection); - IllustrationPoint illustrationPoint = IllustrationPointConverter.CreateIllustrationPoint(hydraSubMechanismIllustrationPoint); + SubmechanismIllustrationPoint submechanismIllustrationPoint = + SubmechanismIllustrationPointConverter.CreateSubmechanismIllustrationPoint(hydraSubmechanismIllustrationPoint); return new WindDirectionClosingSituationIllustrationPoint(windDirection, hydraWindDirectionClosingSituation.ClosingSituation, - illustrationPoint); + submechanismIllustrationPoint); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -49,7 +49,7 @@ - + Fisheye: Tag bc298d659aee58c83cabc8094b0404e08dca5aca refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointTest.cs (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -0,0 +1,113 @@ +// 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.Collections.Generic; +using System.Linq; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; + +namespace Ringtoets.Common.Data.Test.Hydraulics.IllustrationPoints +{ + [TestFixture] + public class SubmechanismIllustrationPointTest + { + [Test] + public void Constructor_NameNull_ThrowsArgumentNullException() + { + // Setup + var random = new Random(21); + double beta = random.NextDouble(); + + // Call + TestDelegate call = () => new SubmechanismIllustrationPoint(null, + Enumerable.Empty(), + Enumerable.Empty(), + beta); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("name", exception.ParamName); + } + + [Test] + public void Constructor_StochastsNull_ThrowsArgumentNullException() + { + // Setup + var random = new Random(21); + double beta = random.NextDouble(); + + // Call + TestDelegate call = () => new SubmechanismIllustrationPoint("Illustration Point", + null, + Enumerable.Empty(), + beta); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("stochasts", exception.ParamName); + } + + [Test] + public void Constructor_IlustrationPointResultsNull_ThrowsArgumentNullException() + { + // Setup + var random = new Random(21); + double beta = random.NextDouble(); + + // Call + TestDelegate call = () => new SubmechanismIllustrationPoint("Illustration Point", + Enumerable.Empty(), + null, + beta); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("illustrationPointResults", exception.ParamName); + } + + [Test] + public void Constructor_ValidArguments_ReturnsExpectedValues() + { + // Setup + const string name = "Illustration Point"; + var random = new Random(21); + double beta = random.NextDouble(); + + var stochasts = new List(); + var illustrationPointResults = new List(); + + // Call + var illustrationPoint = new SubmechanismIllustrationPoint(name, + stochasts, + illustrationPointResults, + beta); + + // Assert + Assert.AreEqual(name, illustrationPoint.Name); + Assert.AreEqual(beta, illustrationPoint.Beta, illustrationPoint.Beta.GetAccuracy()); + Assert.AreEqual(5, illustrationPoint.Beta.NumberOfDecimalPlaces); + Assert.AreSame(stochasts, illustrationPoint.Stochasts); + Assert.AreSame(illustrationPointResults, illustrationPoint.IllustrationPointResults); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/WindDirectionClosingSituationIllustrationPointTest.cs =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/WindDirectionClosingSituationIllustrationPointTest.cs (.../WindDirectionClosingSituationIllustrationPointTest.cs) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/WindDirectionClosingSituationIllustrationPointTest.cs (.../WindDirectionClosingSituationIllustrationPointTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -33,11 +33,11 @@ public void Constructor_WindDirectionNull_ThrowsArgumentNullException() { // Setup - var illustrationPoint = new TestIllustrationPoint(); + var submechanismIllustrationPoint = new TestSubmechanismIllustrationPoint(); // Call TestDelegate call = () => - new WindDirectionClosingSituationIllustrationPoint(null, "closing situation", illustrationPoint); + new WindDirectionClosingSituationIllustrationPoint(null, "closing situation", submechanismIllustrationPoint); // Assert var exception = Assert.Throws(call); @@ -49,19 +49,19 @@ { // Setup var windDirection = new TestWindDirection(); - var illustrationPoint = new TestIllustrationPoint(); + var submechanismIllustrationPoint = new TestSubmechanismIllustrationPoint(); // Call TestDelegate call = () => - new WindDirectionClosingSituationIllustrationPoint(windDirection, null, illustrationPoint); + new WindDirectionClosingSituationIllustrationPoint(windDirection, null, submechanismIllustrationPoint); // Assert var exception = Assert.Throws(call); Assert.AreEqual("closingSituation", exception.ParamName); } [Test] - public void Constructor_IllustationPointNull_ThrowsArgumentNullException() + public void Constructor_SubmechanismIllustationPointNull_ThrowsArgumentNullException() { // Setup var windDirection = new TestWindDirection(); @@ -72,7 +72,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("illustrationPoint", exception.ParamName); + Assert.AreEqual("submechanismIllustrationPoint", exception.ParamName); } [Test] @@ -81,16 +81,16 @@ // Setup const string closingScenario = "closing scenario"; var windDirection = new TestWindDirection(); - var illustrationPoint = new TestIllustrationPoint(); + var submechanismIllustrationPoint = new TestSubmechanismIllustrationPoint(); // Call var windDirectionClosingScenarioIllustrationPoint = - new WindDirectionClosingSituationIllustrationPoint(windDirection, closingScenario, illustrationPoint); + new WindDirectionClosingSituationIllustrationPoint(windDirection, closingScenario, submechanismIllustrationPoint); // Assert Assert.AreEqual(closingScenario, windDirectionClosingScenarioIllustrationPoint.ClosingSituation); Assert.AreSame(windDirection, windDirectionClosingScenarioIllustrationPoint.WindDirection); - Assert.AreSame(illustrationPoint, windDirectionClosingScenarioIllustrationPoint.IllustrationPoint); + Assert.AreSame(submechanismIllustrationPoint, windDirectionClosingScenarioIllustrationPoint.SubmechanismIllustrationPoint); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -81,7 +81,7 @@ - + Fisheye: Tag bc298d659aee58c83cabc8094b0404e08dca5aca refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestIllustrationPointTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestSubmechanismIllustrationPointTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestSubmechanismIllustrationPointTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestSubmechanismIllustrationPointTest.cs (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -0,0 +1,46 @@ +// 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 NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil.IllustrationPoints; + +namespace Ringtoets.Common.Data.TestUtil.Test.IllustrationPoints +{ + [TestFixture] + public class TestSubmechanismIllustrationPointTest + { + [Test] + public void DefaultConstructor_Test() + { + // Call + var illustrationPoint = new TestSubmechanismIllustrationPoint(); + + // Assert + Assert.IsInstanceOf(illustrationPoint); + + Assert.AreEqual("Illustration Point", illustrationPoint.Name); + CollectionAssert.IsEmpty(illustrationPoint.Stochasts); + CollectionAssert.IsEmpty(illustrationPoint.IllustrationPointResults); + Assert.AreEqual(3.14, illustrationPoint.Beta, illustrationPoint.Beta.GetAccuracy()); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj =================================================================== diff -u -r058a203e9a00750ce6abf49ece52af3cb88caa36 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 058a203e9a00750ce6abf49ece52af3cb88caa36) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -70,7 +70,7 @@ - + Fisheye: Tag bc298d659aee58c83cabc8094b0404e08dca5aca refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestIllustrationPoint.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestSubmechanismIllustrationPoint.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestSubmechanismIllustrationPoint.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestSubmechanismIllustrationPoint.cs (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -0,0 +1,38 @@ +// 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.Linq; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; + +namespace Ringtoets.Common.Data.TestUtil.IllustrationPoints +{ + /// + /// A simple submechanism illustration point which can be used for testing. + /// + public class TestSubmechanismIllustrationPoint : SubmechanismIllustrationPoint + { + /// + /// Creates a . + /// + public TestSubmechanismIllustrationPoint() + : base("Illustration Point", Enumerable.Empty(), Enumerable.Empty(), 3.14) {} + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj =================================================================== diff -u -r7b361b577c778a137cbdb78603822412e189b93e -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision 7b361b577c778a137cbdb78603822412e189b93e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -58,7 +58,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs (.../RingtoetsStackChartDataFactoryTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs (.../RingtoetsStackChartDataFactoryTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -79,13 +79,13 @@ { new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new TestIllustrationPoint()), + new TestSubmechanismIllustrationPoint()), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new TestIllustrationPoint()), + new TestSubmechanismIllustrationPoint()), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new TestIllustrationPoint()) + new TestSubmechanismIllustrationPoint()) }); // Call @@ -110,13 +110,13 @@ { new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new TestIllustrationPoint()), + new TestSubmechanismIllustrationPoint()), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Closed", - new TestIllustrationPoint()), + new TestSubmechanismIllustrationPoint()), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Open", - new TestIllustrationPoint()) + new TestSubmechanismIllustrationPoint()) }); // Call @@ -163,7 +163,7 @@ { new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 1", + new SubmechanismIllustrationPoint("Punt 1", new[] { new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.9, 3), @@ -175,7 +175,7 @@ Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 2", + new SubmechanismIllustrationPoint("Punt 2", new[] { new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), @@ -187,7 +187,7 @@ Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 3", + new SubmechanismIllustrationPoint("Punt 3", new[] { new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs (.../WindDirectionClosingSituationIllustrationPointPropertiesTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs (.../WindDirectionClosingSituationIllustrationPointPropertiesTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -35,7 +35,6 @@ [TestFixture] public class WindDirectionClosingSituationIllustrationPointPropertiesTest { - [Test] public void Constructor_DefaultArgumentValues_DoesNotThrowException() { @@ -52,8 +51,11 @@ public void ToString_WithName_ReturnsCombinationOfWindDirectionAndClosingSituation(string name) { // Setup - var illustrationPoint = new IllustrationPoint(name, Enumerable.Empty(), Enumerable.Empty(), 3); - var context = new WindDirectionClosingSituationIllustrationPoint(new TestWindDirection(), "direction", illustrationPoint); + var submechanismIllustrationPoint = new SubmechanismIllustrationPoint(name, + Enumerable.Empty(), + Enumerable.Empty(), + 3); + var context = new WindDirectionClosingSituationIllustrationPoint(new TestWindDirection(), "direction", submechanismIllustrationPoint); // Call var hydraulicBoundaryLocationProperties = new WindDirectionClosingSituationIllustrationPointProperties @@ -65,7 +67,6 @@ Assert.AreEqual(name, hydraulicBoundaryLocationProperties.ToString()); } - [Test] public void GetProperties_ValidData_ReturnsExpectedValues() { @@ -80,13 +81,13 @@ { new IllustrationPointResult("some description", random.NextDouble()) }; - var illustrationPoint = new IllustrationPoint("name", stochasts, illustrationPointResults, beta); + var submechanismIllustrationPoint = new SubmechanismIllustrationPoint("name", stochasts, illustrationPointResults, beta); const string closingSituation = "closingSituation"; const string windDirectionName = "windDirection"; var windDirection = new WindDirection(windDirectionName, 123); - var context = new WindDirectionClosingSituationIllustrationPoint(windDirection, closingSituation, illustrationPoint); + var context = new WindDirectionClosingSituationIllustrationPoint(windDirection, closingSituation, submechanismIllustrationPoint); // Call var properties = new WindDirectionClosingSituationIllustrationPointProperties @@ -97,9 +98,9 @@ // Assert Assert.AreEqual(windDirectionName, properties.WindDirection); Assert.AreEqual(closingSituation, properties.ClosingSituation); - CollectionAssert.AreEqual(illustrationPoint.Stochasts, properties.AlphaValues); - CollectionAssert.AreEqual(illustrationPoint.Stochasts, properties.Durations); - CollectionAssert.AreEqual(illustrationPoint.IllustrationPointResults, properties.IllustrationPointResults); + CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.AlphaValues); + CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.Durations); + CollectionAssert.AreEqual(submechanismIllustrationPoint.IllustrationPointResults, properties.IllustrationPointResults); TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true); Assert.IsInstanceOf(classTypeConverter); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -136,7 +136,7 @@ { new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 1", + new SubmechanismIllustrationPoint("Punt 1", new[] { new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.9, 3), @@ -145,7 +145,7 @@ Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 2", + new SubmechanismIllustrationPoint("Punt 2", new[] { new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.43589, 3), @@ -173,7 +173,7 @@ { new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 1", + new SubmechanismIllustrationPoint("Punt 1", new[] { new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.9, 3), @@ -184,7 +184,7 @@ Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 2", + new SubmechanismIllustrationPoint("Punt 2", new[] { new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), @@ -195,7 +195,7 @@ Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", - new IllustrationPoint("Punt 3", + new SubmechanismIllustrationPoint("Punt 3", new[] { new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs =================================================================== diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs (.../GeneralResultConverterTest.cs) (revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs (.../GeneralResultConverterTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -30,13 +30,13 @@ using HydraGeneralResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.GeneralResult; using HydraWindDirection = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirection; using HydraStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.Stochast; -using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint; using HydraWindDirectionClosingSituation = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirectionClosingSituation; using HydraIllustrationPointTreeNode = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointTreeNode; using HydraCombinationType = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.CombinationType; using HydraIllustrationPointResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult; using HydraFaultTreeIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.FaultTreeIllustrationPoint; using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast; +using HydrasubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint; namespace Ringtoets.Common.Service.Test.IllustrationPoints { @@ -93,7 +93,7 @@ double beta = random.NextDouble(); var hydraIllustrationPoint = - new HydraSubMechanismIllustrationPoint("Illustration Point", + new HydrasubmechanismIllustrationPoint("Illustration Point", Enumerable.Empty(), Enumerable.Empty(), beta); @@ -125,11 +125,11 @@ AssertWindDirection(hydraWindDirection, combination.WindDirection); Assert.AreEqual(closingSituation, combination.ClosingSituation); - IllustrationPoint illustrationPoint = combination.IllustrationPoint; - Assert.AreEqual(hydraIllustrationPoint.Name, illustrationPoint.Name); - Assert.AreEqual(hydraIllustrationPoint.Beta, illustrationPoint.Beta, illustrationPoint.Beta.GetAccuracy()); - CollectionAssert.IsEmpty(illustrationPoint.Stochasts); - CollectionAssert.IsEmpty(illustrationPoint.IllustrationPointResults); + SubmechanismIllustrationPoint submechanismIllustrationPoint = combination.SubmechanismIllustrationPoint; + Assert.AreEqual(hydraIllustrationPoint.Name, submechanismIllustrationPoint.Name); + Assert.AreEqual(hydraIllustrationPoint.Beta, submechanismIllustrationPoint.Beta, submechanismIllustrationPoint.Beta.GetAccuracy()); + CollectionAssert.IsEmpty(submechanismIllustrationPoint.Stochasts); + CollectionAssert.IsEmpty(submechanismIllustrationPoint.IllustrationPointResults); } [Test] Fisheye: Tag bc298d659aee58c83cabc8094b0404e08dca5aca refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointConverterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubmechanismIllustrationPointConverterTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubmechanismIllustrationPointConverterTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubmechanismIllustrationPointConverterTest.cs (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -0,0 +1,90 @@ +// 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.Linq; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Service.IllustrationPoints; +using HydraIllustrationPointResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult; +using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast; + +namespace Ringtoets.Common.Service.Test.IllustrationPoints +{ + [TestFixture] + public class SubmechanismIllustrationPointConverterTest + { + [Test] + public void CreateCreateIllustrationPoint_SubMechanismIllustrationPointNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => SubmechanismIllustrationPointConverter.CreateSubmechanismIllustrationPoint(null); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("submechanismIllustrationPoint", paramName); + } + + [Test] + public void CreateIllustrationPoint_ValidArguments_ExpectedProperties() + { + // Setup + var random = new Random(21); + var hydraIllustrationPointResult = new HydraIllustrationPointResult("HydraIllustrationPointResult", + random.NextDouble()); + + const string name = "hydraSubmechanismIllustrationPointStochast"; + double alpha = random.NextDouble(); + double duration = random.NextDouble(); + double realization = random.NextDouble(); + var hydraSubmechanismIllustrationPointStochast = + new HydraSubmechanismIllustrationPointStochast(name, duration, alpha, realization); + + double beta = random.NextDouble(); + var subMechanismIllustrationPoint = new HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint("name", new[] + { + hydraSubmechanismIllustrationPointStochast + }, new[] + { + hydraIllustrationPointResult + }, beta); + + // Call + SubmechanismIllustrationPoint submechanismIllustrationPoint = + SubmechanismIllustrationPointConverter.CreateSubmechanismIllustrationPoint(subMechanismIllustrationPoint); + + // Assert + Assert.AreEqual(subMechanismIllustrationPoint.Beta, submechanismIllustrationPoint.Beta, submechanismIllustrationPoint.Beta.GetAccuracy()); + Assert.AreEqual(subMechanismIllustrationPoint.Name, submechanismIllustrationPoint.Name); + + IllustrationPointResult illustrationPointResult = submechanismIllustrationPoint.IllustrationPointResults.Single(); + Assert.AreEqual(hydraIllustrationPointResult.Description, illustrationPointResult.Description); + Assert.AreEqual(hydraIllustrationPointResult.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); + + SubmechanismIllustrationPointStochast stochast = submechanismIllustrationPoint.Stochasts.Single(); + Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); + Assert.AreEqual(duration, stochast.Duration, stochast.Duration.GetAccuracy()); + Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Name, stochast.Name); + Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy()); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverterTest.cs =================================================================== diff -u -r05f9fe5ade771d5cda22d8b1b5b4e451b2b11f6a -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverterTest.cs (.../WindDirectionClosingSituationIllustrationPointConverterTest.cs) (revision 05f9fe5ade771d5cda22d8b1b5b4e451b2b11f6a) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverterTest.cs (.../WindDirectionClosingSituationIllustrationPointConverterTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -26,11 +26,11 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.IllustrationPoints; using HydraWindDirection = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirection; -using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint; using HydraWindDirectionClosingSituation = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirectionClosingSituation; using HydraIllustrationPointResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult; using HydraRingTestWindDirection = Ringtoets.HydraRing.Calculation.TestUtil.IllustrationPoints.TestWindDirection; using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast; +using HydraSubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint; namespace Ringtoets.Common.Service.Test.IllustrationPoints { @@ -42,7 +42,7 @@ { // Setup var hydraSubMechanismIllustrationPoint = - new HydraSubMechanismIllustrationPoint("name", + new HydraSubmechanismIllustrationPoint("name", Enumerable.Empty(), Enumerable.Empty(), double.NaN); @@ -71,7 +71,7 @@ // Assert string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("hydraSubMechanismIllustrationPoint", paramName); + Assert.AreEqual("hydraSubmechanismIllustrationPoint", paramName); } [Test] @@ -97,7 +97,7 @@ new HydraSubmechanismIllustrationPointStochast(name, duration, alpha, realization); double beta = random.NextDouble(); - var subMechanismIllustrationPoint = new HydraSubMechanismIllustrationPoint("name", new[] + var subMechanismIllustrationPoint = new HydraSubmechanismIllustrationPoint("name", new[] { hydrasubmechanismIllustrationPointStochast }, new[] @@ -117,15 +117,15 @@ Assert.AreEqual(closingScenario, combination.ClosingSituation); - IllustrationPoint illustrationPoint = combination.IllustrationPoint; - Assert.AreEqual(subMechanismIllustrationPoint.Beta, illustrationPoint.Beta, illustrationPoint.Beta.GetAccuracy()); - Assert.AreEqual(subMechanismIllustrationPoint.Name, illustrationPoint.Name); + SubmechanismIllustrationPoint submechanismIllustrationPoint = combination.SubmechanismIllustrationPoint; + Assert.AreEqual(subMechanismIllustrationPoint.Beta, submechanismIllustrationPoint.Beta, submechanismIllustrationPoint.Beta.GetAccuracy()); + Assert.AreEqual(subMechanismIllustrationPoint.Name, submechanismIllustrationPoint.Name); - IllustrationPointResult illustrationPointResult = illustrationPoint.IllustrationPointResults.Single(); + IllustrationPointResult illustrationPointResult = submechanismIllustrationPoint.IllustrationPointResults.Single(); Assert.AreEqual(hydraIllustrationPointResult.Description, illustrationPointResult.Description); Assert.AreEqual(hydraIllustrationPointResult.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); - SubmechanismIllustrationPointStochast stochast = illustrationPoint.Stochasts.Single(); + SubmechanismIllustrationPointStochast stochast = submechanismIllustrationPoint.Stochasts.Single(); Assert.AreEqual(hydrasubmechanismIllustrationPointStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); Assert.AreEqual(hydrasubmechanismIllustrationPointStochast.Duration, stochast.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(hydrasubmechanismIllustrationPointStochast.Name, stochast.Name); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -66,7 +66,7 @@ - + Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs =================================================================== diff -u -r1413aaf4fe060785cf2f28ba1cf27c0ffb87969d -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs) (revision 1413aaf4fe060785cf2f28ba1cf27c0ffb87969d) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -126,7 +126,7 @@ var illustrationPoints = new[] { - new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestIllustrationPoint()), + new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestSubmechanismIllustrationPoint()), }; var stochasts = new[] { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs =================================================================== diff -u -r1413aaf4fe060785cf2f28ba1cf27c0ffb87969d -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs) (revision 1413aaf4fe060785cf2f28ba1cf27c0ffb87969d) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -126,7 +126,7 @@ var illustrationPoints = new[] { - new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestIllustrationPoint()), + new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestSubmechanismIllustrationPoint()), }; var stochasts = new[] { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubmechanismIllustrationPoint.cs =================================================================== diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubmechanismIllustrationPoint.cs (.../SubmechanismIllustrationPoint.cs) (revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubmechanismIllustrationPoint.cs (.../SubmechanismIllustrationPoint.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -27,10 +27,10 @@ /// /// Illustration point which contains the result of applying the sub mechanism. /// - public class SubMechanismIllustrationPoint : IIllustrationPoint + public class SubmechanismIllustrationPoint : IIllustrationPoint { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// The name of the illustration point. /// A collection of @@ -41,7 +41,7 @@ /// The beta value of the illustration point /// Thrown when , /// , or is null. - public SubMechanismIllustrationPoint(string name, + public SubmechanismIllustrationPoint(string name, IEnumerable stochasts, IEnumerable illustrationPointResults, double beta) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs =================================================================== diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -158,7 +158,7 @@ var illustrationPointResults = new List(); AddRange(illustrationPointResults, subMechanismResults[key]); - var illustrationPoint = new SubMechanismIllustrationPoint(submechanismIllustrationPointName, + var illustrationPoint = new SubmechanismIllustrationPoint(submechanismIllustrationPointName, illustrationPointStochasts, illustrationPointResults, subMechanismIllustrationPointBeta); @@ -349,7 +349,7 @@ results.Add(Tuple.Create( parentId, id, - type == "faulttree" ? typeof(FaultTreeIllustrationPoint) : typeof(SubMechanismIllustrationPoint), + type == "faulttree" ? typeof(FaultTreeIllustrationPoint) : typeof(SubmechanismIllustrationPoint), combine == "and" ? CombinationType.And : CombinationType.Or)); } return results; @@ -408,7 +408,7 @@ string submechanismIllustrationPointName = subMechanisms[subMechanismId]; double subMechanismIllustrationPointBeta = subMechanismBetaValues[dataKey]; - var illustrationPoint = new SubMechanismIllustrationPoint(submechanismIllustrationPointName, + var illustrationPoint = new SubmechanismIllustrationPoint(submechanismIllustrationPointName, illustrationPointStochasts, illustrationPointResults, subMechanismIllustrationPointBeta); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointTest.cs =================================================================== diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointTest.cs (.../SubMechanismIllustrationPointTest.cs) (revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointTest.cs (.../SubMechanismIllustrationPointTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -28,13 +28,13 @@ namespace Ringtoets.HydraRing.Calculation.Test.Data.Output.IllustrationPoints { [TestFixture] - public class SubMechanismIllustrationPointTest + public class SubmechanismIllustrationPointTest { [Test] public void Constructor_NameNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new SubMechanismIllustrationPoint(null, + TestDelegate call = () => new SubmechanismIllustrationPoint(null, Enumerable.Empty(), Enumerable.Empty(), 123); @@ -48,7 +48,7 @@ public void Constructor_StochastNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new SubMechanismIllustrationPoint("Name", null, Enumerable.Empty(), 123); + TestDelegate call = () => new SubmechanismIllustrationPoint("Name", null, Enumerable.Empty(), 123); // Assert var exception = Assert.Throws(call); @@ -59,7 +59,7 @@ public void Constructor_IllustrationPointResultsNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new SubMechanismIllustrationPoint("Name", Enumerable.Empty(), null, 123); + TestDelegate call = () => new SubmechanismIllustrationPoint("Name", Enumerable.Empty(), null, 123); // Assert var exception = Assert.Throws(call); @@ -79,7 +79,7 @@ IEnumerable illustrationPointResults = Enumerable.Empty(); // Call - var illustrationPoint = new SubMechanismIllustrationPoint(name, stochasts, illustrationPointResults, beta); + var illustrationPoint = new SubmechanismIllustrationPoint(name, stochasts, illustrationPointResults, beta); // Assert Assert.IsInstanceOf(illustrationPoint); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs =================================================================== diff -u -r40c4d9acffd63278a51a53a1655efff0ad988592 -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs (.../IllustrationPointsParserTest.cs) (revision 40c4d9acffd63278a51a53a1655efff0ad988592) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs (.../IllustrationPointsParserTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -174,22 +174,22 @@ CollectionAssert.AllItemsAreInstancesOfType(illustrationPointNodes.Values.Select(ip => ip.Data), typeof(FaultTreeIllustrationPoint)); ICollection faultTrees = new List(); - ICollection subMechanisms = new List(); + ICollection subMechanisms = new List(); GetAllNodes(illustrationPointNodes.Values.First(), faultTrees, subMechanisms); Assert.AreEqual(11, faultTrees.Count); Assert.AreEqual(12, subMechanisms.Count); - SubMechanismIllustrationPoint subMechanismIllustrationPoint = subMechanisms.First(); - Assert.AreEqual("Structure 2017 Z12", subMechanismIllustrationPoint.Name); - Assert.AreEqual(-7.94268, subMechanismIllustrationPoint.Beta); + SubmechanismIllustrationPoint submechanismIllustrationPoint = subMechanisms.First(); + Assert.AreEqual("Structure 2017 Z12", submechanismIllustrationPoint.Name); + Assert.AreEqual(-7.94268, submechanismIllustrationPoint.Beta); Assert.AreEqual(new[] { Tuple.Create("Faalkans kunstwerk gegeven erosie bodem", -1.0, 4383.0, -7.94268) - }, subMechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization))); - Assert.IsEmpty(subMechanismIllustrationPoint.Results); + }, submechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization))); + Assert.IsEmpty(submechanismIllustrationPoint.Results); FaultTreeIllustrationPoint faultTreeIllustrationPoint = faultTrees.First(); - Assert.AreEqual("Structure 2017 Z12", subMechanismIllustrationPoint.Name); + Assert.AreEqual("Structure 2017 Z12", submechanismIllustrationPoint.Name); Assert.AreEqual(2.23881, faultTreeIllustrationPoint.Beta); Assert.AreEqual(46, faultTreeIllustrationPoint.Stochasts.Count); Assert.AreEqual(new[] @@ -223,16 +223,16 @@ Assert.AreEqual(6, generalResult.Stochasts.Count()); Dictionary illustrationPointNodes = generalResult.IllustrationPoints; Assert.AreEqual(16, illustrationPointNodes.Count); - CollectionAssert.AllItemsAreInstancesOfType(illustrationPointNodes.Values.Select(ip => ip.Data), typeof(SubMechanismIllustrationPoint)); + CollectionAssert.AllItemsAreInstancesOfType(illustrationPointNodes.Values.Select(ip => ip.Data), typeof(SubmechanismIllustrationPoint)); ICollection faultTrees = new List(); - ICollection subMechanisms = new List(); + ICollection subMechanisms = new List(); GetAllNodes(illustrationPointNodes.Values.ElementAt(4), faultTrees, subMechanisms); Assert.IsEmpty(faultTrees); - SubMechanismIllustrationPoint subMechanismIllustrationPoint = subMechanisms.Single(); - Assert.AreEqual(5.30273, subMechanismIllustrationPoint.Beta); - Assert.AreEqual("Reference water level", subMechanismIllustrationPoint.Name); + SubmechanismIllustrationPoint submechanismIllustrationPoint = subMechanisms.Single(); + Assert.AreEqual(5.30273, submechanismIllustrationPoint.Beta); + Assert.AreEqual("Reference water level", submechanismIllustrationPoint.Name); Assert.AreEqual(new[] { Tuple.Create("Windrichting", 0.0, 12.0, 0.0), @@ -241,13 +241,13 @@ Tuple.Create("Onzekerheid waterstand IJsselmeer", -0.0695709, 96.0, 0.0146771), Tuple.Create("Onzekerheid windsnelheid Schiphol 16 richtingen", -0.121567, 12.0, 1.0303), Tuple.Create("Modelonzekerheid lokale waterstand", -0.295595, 4383.0, 0.235119) - }, subMechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization))); + }, submechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization))); Assert.AreEqual(new[] { Tuple.Create("Z", -0.00136652), Tuple.Create("Considered water level", 1.24846), Tuple.Create("Computed local water level", 1.24983) - }, subMechanismIllustrationPoint.Results.Select(s => Tuple.Create(s.Description, s.Value))); + }, submechanismIllustrationPoint.Results.Select(s => Tuple.Create(s.Description, s.Value))); } [Test] @@ -265,9 +265,9 @@ Assert.NotNull(generalResult); } - private static void GetAllNodes(IllustrationPointTreeNode tree, ICollection faultTrees, ICollection subMechanisms) + private static void GetAllNodes(IllustrationPointTreeNode tree, ICollection faultTrees, ICollection subMechanisms) { - var subMechanism = tree.Data as SubMechanismIllustrationPoint; + var subMechanism = tree.Data as SubmechanismIllustrationPoint; var faultTree = tree.Data as FaultTreeIllustrationPoint; if (subMechanism != null) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs =================================================================== diff -u -r1413aaf4fe060785cf2f28ba1cf27c0ffb87969d -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs (.../DesignWaterLevelLocationContextPropertiesTest.cs) (revision 1413aaf4fe060785cf2f28ba1cf27c0ffb87969d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs (.../DesignWaterLevelLocationContextPropertiesTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -130,7 +130,7 @@ var illustrationPoints = new[] { - new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestIllustrationPoint()), + new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestSubmechanismIllustrationPoint()), }; var stochasts = new[] { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs =================================================================== diff -u -r1413aaf4fe060785cf2f28ba1cf27c0ffb87969d -rbc298d659aee58c83cabc8094b0404e08dca5aca --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs (.../WaveHeightLocationContextPropertiesTest.cs) (revision 1413aaf4fe060785cf2f28ba1cf27c0ffb87969d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs (.../WaveHeightLocationContextPropertiesTest.cs) (revision bc298d659aee58c83cabc8094b0404e08dca5aca) @@ -133,7 +133,7 @@ var illustrationPoints = new[] { - new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestIllustrationPoint()), + new WindDirectionClosingSituationIllustrationPoint(new WindDirection("WEST", 4), "sluit", new TestSubmechanismIllustrationPoint()), }; var stochasts = new[] {