Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -rfcfed8afc6a404167356e37de68e18d561af7389 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision fcfed8afc6a404167356e37de68e18d561af7389) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -37,7 +37,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCalculationOutputCreateExtensions.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCalculationOutputCreateExtensions.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCalculationOutputCreateExtensions.cs (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -0,0 +1,58 @@ +// 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 Application.Ringtoets.Storage.DbContext; +using Ringtoets.DuneErosion.Data; + +namespace Application.Ringtoets.Storage.Create.DuneErosion +{ + /// + /// Extension methods for related to creating a . + /// + internal static class DuneLocationCalculationOutputCreateExtensions + { + /// + /// Creates a based on the information of the . + /// + /// The output to create a database entity for. + /// A new . + /// Thrown when is null. + internal static DuneLocationOutputEntity Create(this DuneLocationCalculationOutput output) + { + if (output == null) + { + throw new ArgumentNullException(nameof(output)); + } + return new DuneLocationOutputEntity + { + WaterLevel = output.WaterLevel.ToNaNAsNull(), + WaveHeight = output.WaveHeight.ToNaNAsNull(), + WavePeriod = output.WavePeriod.ToNaNAsNull(), + TargetProbability = output.TargetProbability.ToNaNAsNull(), + TargetReliability = output.TargetReliability.ToNaNAsNull(), + CalculatedProbability = output.CalculatedProbability.ToNaNAsNull(), + CalculatedReliability = output.CalculatedReliability.ToNaNAsNull(), + CalculationConvergence = (byte) output.CalculationConvergence + }; + } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs =================================================================== diff -u -r397eafbec8987f6aa2e31318745c4e07ed575981 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision 397eafbec8987f6aa2e31318745c4e07ed575981) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -63,13 +63,13 @@ Order = order }; - CreateDuneLocationOutput(entity, location.Calculation.Output); + CreateDuneLocationCalculationOutput(entity, location.Calculation.Output); registry.Register(entity, location); return entity; } - private static void CreateDuneLocationOutput(DuneLocationEntity entity, DuneLocationOutput output) + private static void CreateDuneLocationCalculationOutput(DuneLocationEntity entity, DuneLocationCalculationOutput output) { if (output != null) { Fisheye: Tag 649b0974fb71df7368d19682bc255618f44d49c1 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationOutputCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationOutputEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationOutputEntityReadExtensions.cs (.../DuneLocationOutputEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationOutputEntityReadExtensions.cs (.../DuneLocationOutputEntityReadExtensions.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -27,18 +27,18 @@ { /// /// Extension methods for related to creating - /// a . + /// a . /// internal static class DuneLocationOutputEntityReadExtensions { /// - /// Read the and use the information to construct a . + /// Read the and use the information to construct a . /// - /// The to create for. - /// A new . - internal static DuneLocationOutput Read(this DuneLocationOutputEntity entity) + /// The to create for. + /// A new . + internal static DuneLocationCalculationOutput Read(this DuneLocationOutputEntity entity) { - return new DuneLocationOutput((CalculationConvergence) entity.CalculationConvergence, new DuneLocationOutput.ConstructionProperties + return new DuneLocationCalculationOutput((CalculationConvergence) entity.CalculationConvergence, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = entity.WaterLevel.ToNullAsNaN(), WaveHeight = entity.WaveHeight.ToNullAsNaN(), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj =================================================================== diff -u -rfcfed8afc6a404167356e37de68e18d561af7389 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision fcfed8afc6a404167356e37de68e18d561af7389) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -48,7 +48,7 @@ - + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCalculationOutputCreateExtensionsTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCalculationOutputCreateExtensionsTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCalculationOutputCreateExtensionsTest.cs (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -0,0 +1,110 @@ +// 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 Application.Ringtoets.Storage.Create.DuneErosion; +using Application.Ringtoets.Storage.DbContext; +using Core.Common.Base.Data; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.DuneErosion.Data; + +namespace Application.Ringtoets.Storage.Test.Create.DuneErosion +{ + [TestFixture] + public class DuneLocationCalculationOutputCreateExtensionsTest + { + [Test] + public void Create_DuneLocationCalculationOutputNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((DuneLocationCalculationOutput) null).Create(); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("output", paramName); + } + + [Test] + public void Create_WithValidParameters_ReturnsDuneLocationEntityWithOutputSet() + { + // Setup + var random = new Random(21); + var output = new DuneLocationCalculationOutput(random.NextEnumValue(), new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = random.NextDouble(), + WaveHeight = random.NextDouble(), + WavePeriod = random.NextDouble(), + TargetProbability = random.NextDouble(), + TargetReliability = random.NextDouble(), + CalculatedProbability = random.NextDouble(), + CalculatedReliability = random.NextDouble() + }); + + // Call + DuneLocationOutputEntity entity = output.Create(); + + // Assert + Assert.IsNotNull(entity); + Assert.AreEqual(output.WaterLevel, entity.WaterLevel, output.WaterLevel.GetAccuracy()); + Assert.AreEqual(output.WaveHeight, entity.WaveHeight, output.WaveHeight.GetAccuracy()); + Assert.AreEqual(output.WavePeriod, entity.WavePeriod, output.WavePeriod.GetAccuracy()); + Assert.AreEqual(output.TargetProbability, entity.TargetProbability); + Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy()); + Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability); + Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); + Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); + } + + [Test] + public void Create_WithNaNParameters_ReturnsDuneLocationEntityWithOutputSet() + { + // Setup + var random = new Random(21); + var output = new DuneLocationCalculationOutput(random.NextEnumValue(), new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = RoundedDouble.NaN, + WaveHeight = RoundedDouble.NaN, + WavePeriod = RoundedDouble.NaN, + TargetProbability = RoundedDouble.NaN, + TargetReliability = RoundedDouble.NaN, + CalculatedProbability = RoundedDouble.NaN, + CalculatedReliability = RoundedDouble.NaN + }); + + // Call + DuneLocationOutputEntity entity = output.Create(); + + // Assert + Assert.IsNotNull(entity); + Assert.IsNull(entity.WaterLevel); + Assert.IsNull(entity.WaveHeight); + Assert.IsNull(entity.WavePeriod); + Assert.IsNull(entity.TargetProbability); + Assert.IsNull(entity.TargetReliability); + Assert.IsNull(entity.CalculatedProbability); + Assert.IsNull(entity.CalculatedReliability); + Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); + } + } +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -145,23 +145,23 @@ { // Setup var random = new Random(21); - var duneLocationOutput = new DuneLocationOutput(random.NextEnumValue(), - new DuneLocationOutput.ConstructionProperties - { - WaterLevel = random.NextDouble(), - WaveHeight = random.NextDouble(), - WavePeriod = random.NextDouble(), - TargetProbability = random.NextDouble(), - TargetReliability = random.NextDouble(), - CalculatedProbability = random.NextDouble(), - CalculatedReliability = random.NextDouble() - }); + var output = new DuneLocationCalculationOutput(random.NextEnumValue(), + new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = random.NextDouble(), + WaveHeight = random.NextDouble(), + WavePeriod = random.NextDouble(), + TargetProbability = random.NextDouble(), + TargetReliability = random.NextDouble(), + CalculatedProbability = random.NextDouble(), + CalculatedReliability = random.NextDouble() + }); var location = new TestDuneLocation { Calculation = { - Output = duneLocationOutput + Output = output } }; @@ -175,7 +175,7 @@ DuneLocationOutputEntity duneLocationOutputEntity = entity.DuneLocationOutputEntities.SingleOrDefault(); Assert.IsNotNull(duneLocationOutputEntity); - AssertDuneBoundaryLocationOutput(duneLocationOutput, duneLocationOutputEntity); + AssertDuneLocationCalculationOutput(output, duneLocationOutputEntity); } [Test] @@ -194,7 +194,7 @@ Assert.AreSame(entity1, entity2); } - private static void AssertDuneBoundaryLocationOutput(DuneLocationOutput output, DuneLocationOutputEntity entity) + private static void AssertDuneLocationCalculationOutput(DuneLocationCalculationOutput output, DuneLocationOutputEntity entity) { Assert.AreEqual(output.WaterLevel, entity.WaterLevel, output.WaterLevel.GetAccuracy()); Assert.AreEqual(output.WaveHeight, entity.WaveHeight, output.WaveHeight.GetAccuracy()); Fisheye: Tag 649b0974fb71df7368d19682bc255618f44d49c1 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationOutputCreateExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rfcfed8afc6a404167356e37de68e18d561af7389 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision fcfed8afc6a404167356e37de68e18d561af7389) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -1069,10 +1069,10 @@ Assert.AreEqual(expectedLocation.Offset, actualLocation.Offset); Assert.AreEqual(expectedLocation.Orientation, actualLocation.Orientation); Assert.AreEqual(expectedLocation.D50, actualLocation.D50); - AssertDuneBoundaryLocationOutput(expectedLocation.Calculation.Output, actualLocation.Calculation.Output); + AssertDuneLocationCalculationOutput(expectedLocation.Calculation.Output, actualLocation.Calculation.Output); } - private static void AssertDuneBoundaryLocationOutput(DuneLocationOutput expectedOutput, DuneLocationOutput actualOutput) + private static void AssertDuneLocationCalculationOutput(DuneLocationCalculationOutput expectedOutput, DuneLocationCalculationOutput actualOutput) { if (expectedOutput == null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs (.../DuneLocationEntityReadExtensionsTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs (.../DuneLocationEntityReadExtensionsTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -180,7 +180,7 @@ // Assert Assert.IsNotNull(location); - AssertDuneLocationOutput(duneLocationOutputEntity, location.Calculation.Output); + AssertDuneLocationCalculationOutput(duneLocationOutputEntity, location.Calculation.Output); } [Test] @@ -202,7 +202,7 @@ Assert.AreSame(location1, location2); } - private static void AssertDuneLocationOutput(DuneLocationOutputEntity expected, DuneLocationOutput actual) + private static void AssertDuneLocationCalculationOutput(DuneLocationOutputEntity expected, DuneLocationCalculationOutput actual) { if (expected == null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r46d300b8932314e01403183fa15dc7f7cbdc7fd3 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationOutputEntityReadExtensionsTest.cs (.../DuneLocationOutputEntityReadExtensionsTest.cs) (revision 46d300b8932314e01403183fa15dc7f7cbdc7fd3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationOutputEntityReadExtensionsTest.cs (.../DuneLocationOutputEntityReadExtensionsTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -60,7 +60,7 @@ }; // Call - DuneLocationOutput output = entity.Read(); + DuneLocationCalculationOutput output = entity.Read(); // Assert Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy()); @@ -91,7 +91,7 @@ }; // Call - DuneLocationOutput output = entity.Read(); + DuneLocationCalculationOutput output = entity.Read(); // Assert Assert.IsNaN(output.WaterLevel); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r5927c21bfc3d4d3991661486050ea1be2e62a00d -r649b0974fb71df7368d19682bc255618f44d49c1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 5927c21bfc3d4d3991661486050ea1be2e62a00d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -833,8 +833,8 @@ { Calculation = { - Output = new DuneLocationOutput(CalculationConvergence.NotCalculated, - new DuneLocationOutput.ConstructionProperties()) + Output = new DuneLocationCalculationOutput(CalculationConvergence.NotCalculated, + new DuneLocationCalculationOutput.ConstructionProperties()) } }; @@ -849,17 +849,17 @@ { Calculation = { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, - new DuneLocationOutput.ConstructionProperties - { - WaterLevel = 10, - WaveHeight = 20, - WavePeriod = 30, - TargetProbability = 0.4, - TargetReliability = 50, - CalculatedProbability = 0.6, - CalculatedReliability = 70 - }) + Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, + new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = 10, + WaveHeight = 20, + WavePeriod = 30, + TargetProbability = 0.4, + TargetReliability = 50, + CalculatedProbability = 0.6, + CalculatedReliability = 70 + }) } }; Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationCalculation.cs =================================================================== diff -u -ree62f9ef8c69cd574bd23077bf9079e3e8fbdd8c -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationCalculation.cs (.../DuneLocationCalculation.cs) (revision ee62f9ef8c69cd574bd23077bf9079e3e8fbdd8c) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationCalculation.cs (.../DuneLocationCalculation.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -48,7 +48,7 @@ /// /// Gets or sets the output of the calculation. /// - public DuneLocationOutput Output { get; set; } + public DuneLocationCalculationOutput Output { get; set; } /// /// Gets the dune location the calculation belongs to. Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationCalculationOutput.cs =================================================================== diff -u --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationCalculationOutput.cs (revision 0) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationCalculationOutput.cs (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -0,0 +1,166 @@ +// 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 Core.Common.Base.Data; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.Probability; + +namespace Ringtoets.DuneErosion.Data +{ + /// + /// Class that holds all dune location calculation specific output parameters. + /// + public class DuneLocationCalculationOutput + { + /// + /// Creates a new instance of . + /// + /// The convergence status of the calculation. + /// The container for the properties for the . + /// Thrown when is null. + /// Thrown when + /// or falls outside the [0.0, 1.0] range. + public DuneLocationCalculationOutput(CalculationConvergence calculationConvergence, ConstructionProperties constructionProperties) + { + if (constructionProperties == null) + { + throw new ArgumentNullException(nameof(constructionProperties)); + } + + WaterLevel = new RoundedDouble(2, constructionProperties.WaterLevel); + WaveHeight = new RoundedDouble(2, constructionProperties.WaveHeight); + WavePeriod = new RoundedDouble(2, constructionProperties.WavePeriod); + + ProbabilityHelper.ValidateProbability(constructionProperties.TargetProbability, nameof(TargetProbability), true); + ProbabilityHelper.ValidateProbability(constructionProperties.CalculatedProbability, nameof(CalculatedProbability), true); + + TargetProbability = constructionProperties.TargetProbability; + TargetReliability = new RoundedDouble(5, constructionProperties.TargetReliability); + CalculatedProbability = constructionProperties.CalculatedProbability; + CalculatedReliability = new RoundedDouble(5, constructionProperties.CalculatedReliability); + CalculationConvergence = calculationConvergence; + } + + /// + /// Gets the water level of the calculation. + /// [m+NAP] + /// + public RoundedDouble WaterLevel { get; } + + /// + /// Gets the wave height of the calculation. + /// [m] + /// + public RoundedDouble WaveHeight { get; } + + /// + /// Gets the wave period of the calculation. + /// [s] + /// + public RoundedDouble WavePeriod { get; } + + /// + /// Gets the target probability. + /// [1/year] + /// + public double TargetProbability { get; } + + /// + /// Gets the target beta. + /// [-] + /// + public RoundedDouble TargetReliability { get; } + + /// + /// Gets the calculated probability. + /// [1/year] + /// + public double CalculatedProbability { get; } + + /// + /// Gets the calculated reliability. + /// [-] + /// + public RoundedDouble CalculatedReliability { get; } + + /// + /// Gets the convergence status of the calculation. + /// [-] + /// + public CalculationConvergence CalculationConvergence { get; } + + /// + /// Container for properties for constructing a . + /// + public class ConstructionProperties + { + /// + /// Creates a new instance of . + /// + public ConstructionProperties() + { + WaterLevel = double.NaN; + WaveHeight = double.NaN; + WavePeriod = double.NaN; + TargetProbability = double.NaN; + TargetReliability = double.NaN; + CalculatedProbability = double.NaN; + CalculatedReliability = double.NaN; + } + + /// + /// Gets the water level of the calculation. + /// + public double WaterLevel { internal get; set; } + + /// + /// Gets the wave height of the calculation. + /// + public double WaveHeight { internal get; set; } + + /// + /// Gets the wave period of the calculation. + /// + public double WavePeriod { internal get; set; } + + /// + /// Gets the target probability. + /// + public double TargetProbability { internal get; set; } + + /// + /// Gets the target beta. + /// + public double TargetReliability { internal get; set; } + + /// + /// Gets the calculated probability. + /// + public double CalculatedProbability { internal get; set; } + + /// + /// Gets the calculated reliability. + /// + public double CalculatedReliability { internal get; set; } + } + } +} \ No newline at end of file Fisheye: Tag 649b0974fb71df7368d19682bc255618f44d49c1 refers to a dead (removed) revision in file `Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Ringtoets.DuneErosion.Data.csproj =================================================================== diff -u -r430632f92b4e3ca3f4634108e2e30a36d26befe9 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Ringtoets.DuneErosion.Data.csproj (.../Ringtoets.DuneErosion.Data.csproj) (revision 430632f92b4e3ca3f4634108e2e30a36d26befe9) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Ringtoets.DuneErosion.Data.csproj (.../Ringtoets.DuneErosion.Data.csproj) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -17,7 +17,7 @@ - + Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs =================================================================== diff -u -rdc532d6d17803dd8d323f7aa1f9fc95c691ae64e -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision dc532d6d17803dd8d323f7aa1f9fc95c691ae64e) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -100,7 +100,7 @@ } /// - /// Gets the . + /// Gets the . /// [TypeConverter(typeof(NoValueRoundedDoubleConverter))] public RoundedDouble WaterLevel @@ -112,7 +112,7 @@ } /// - /// Gets the . + /// Gets the . /// [TypeConverter(typeof(NoValueRoundedDoubleConverter))] public RoundedDouble WaveHeight @@ -124,7 +124,7 @@ } /// - /// Gets the . + /// Gets the . /// [TypeConverter(typeof(NoValueRoundedDoubleConverter))] public RoundedDouble WavePeriod Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationCalculationsWriter.cs =================================================================== diff -u -rb037846a0ba3496f374b0dc28ca4fc28dd2c8275 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationCalculationsWriter.cs (.../DuneLocationCalculationsWriter.cs) (revision b037846a0ba3496f374b0dc28ca4fc28dd2c8275) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationCalculationsWriter.cs (.../DuneLocationCalculationsWriter.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -93,9 +93,9 @@ return string.Join(separator, stringComponents); } - private static IEnumerable GetOutputValues(DuneLocationOutput output) + private static IEnumerable GetOutputValues(DuneLocationCalculationOutput calculationOutput) { - return output == null + return calculationOutput == null ? new[] { Resources.DuneLocationsWriter_CreateCsvLine_Parameter_without_value, @@ -104,9 +104,9 @@ } : new[] { - GetOutputValue(output.WaterLevel), - GetOutputValue(output.WaveHeight), - GetOutputValue(output.WavePeriod) + GetOutputValue(calculationOutput.WaterLevel), + GetOutputValue(calculationOutput.WaveHeight), + GetOutputValue(calculationOutput.WavePeriod) }; } Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs =================================================================== diff -u -rbec4cdb458b713aed1a5a449d3807867764d1706 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision bec4cdb458b713aed1a5a449d3807867764d1706) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -148,7 +148,7 @@ if (string.IsNullOrEmpty(calculator.LastErrorFileContent)) { - duneLocationCalculation.Output = CreateDuneLocationOutput(duneLocationName, calculationInput.Beta, norm); + duneLocationCalculation.Output = CreateDuneLocationCalculationOutput(duneLocationName, calculationInput.Beta, norm); } } catch (HydraRingCalculationException) @@ -202,10 +202,10 @@ /// The name of the location. /// The target reliability for the calculation. /// The target probability for the calculation. - /// A . + /// A . /// Thrown when /// or the calculated probability falls outside the [0.0, 1.0] range and is not . - private DuneLocationOutput CreateDuneLocationOutput(string duneLocationName, double targetReliability, double targetProbability) + private DuneLocationCalculationOutput CreateDuneLocationCalculationOutput(string duneLocationName, double targetReliability, double targetProbability) { double reliability = calculator.ReliabilityIndex; double probability = StatisticsConverter.ReliabilityToProbability(reliability); @@ -217,17 +217,17 @@ log.WarnFormat(Resources.DuneErosionBoundaryCalculationService_CreateDuneLocationOutput_Calculation_for_DuneLocation_0_not_converged, duneLocationName); } - return new DuneLocationOutput(converged, - new DuneLocationOutput.ConstructionProperties - { - WaterLevel = calculator.WaterLevel, - WaveHeight = calculator.WaveHeight, - WavePeriod = calculator.WavePeriod, - TargetProbability = targetProbability, - TargetReliability = targetReliability, - CalculatedProbability = probability, - CalculatedReliability = reliability - }); + return new DuneLocationCalculationOutput(converged, + new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = calculator.WaterLevel, + WaveHeight = calculator.WaveHeight, + WavePeriod = calculator.WavePeriod, + TargetProbability = targetProbability, + TargetReliability = targetReliability, + CalculatedProbability = probability, + CalculatedReliability = reliability + }); } /// Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationCalculationOutputTest.cs =================================================================== diff -u --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationCalculationOutputTest.cs (revision 0) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationCalculationOutputTest.cs (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -0,0 +1,174 @@ +// 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 Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; + +namespace Ringtoets.DuneErosion.Data.Test +{ + [TestFixture] + public class DuneLocationCalculationOutputTest + { + [Test] + public void Constructor_ConstructionPropertiesNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("constructionProperties", exception.ParamName); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase(-1e-6)] + [TestCase(1.0 + 1e-6)] + public void Constructor_InvalidTargetProbability_ThrowsArgumentOutOfRangeException(double targetProbability) + { + // Setup + var random = new Random(32); + double waterLevel = random.NextDouble(); + double waveHeight = random.NextDouble(); + double wavePeriod = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedProbability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + TestDelegate call = () => new DuneLocationCalculationOutput(convergence, + new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = waterLevel, + WaveHeight = waveHeight, + WavePeriod = wavePeriod, + TargetProbability = targetProbability, + TargetReliability = targetReliability, + CalculatedProbability = calculatedProbability, + CalculatedReliability = calculatedReliability + }); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("TargetProbability", exception.ParamName); + StringAssert.Contains("Kans moet in het bereik [0,0, 1,0] liggen.", exception.Message); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase(-0.01)] + [TestCase(1.01)] + public void Constructor_InvalidCalculatedProbability_ThrowsArgumentOutOfRangeException(double calculatedProbability) + { + // Setup + var random = new Random(32); + double waterLevel = random.NextDouble(); + double waveHeight = random.NextDouble(); + double wavePeriod = random.NextDouble(); + double targetProbability = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + TestDelegate call = () => new DuneLocationCalculationOutput(convergence, + new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = waterLevel, + WaveHeight = waveHeight, + WavePeriod = wavePeriod, + TargetProbability = targetProbability, + TargetReliability = targetReliability, + CalculatedProbability = calculatedProbability, + CalculatedReliability = calculatedReliability + }); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("CalculatedProbability", exception.ParamName); + StringAssert.Contains("Kans moet in het bereik [0,0, 1,0] liggen.", exception.Message); + } + + [Test] + [TestCase(double.NaN, 0.5)] + [TestCase(0.2, double.NaN)] + public void Constructor_ValidInput_ExpectedProperties(double targetProbability, double calculatedProbability) + { + // Setup + var random = new Random(32); + double waterLevel = random.NextDouble(); + double waveHeight = random.NextDouble(); + double wavePeriod = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + var output = new DuneLocationCalculationOutput(convergence, + new DuneLocationCalculationOutput.ConstructionProperties + { + WaterLevel = waterLevel, + WaveHeight = waveHeight, + WavePeriod = wavePeriod, + TargetProbability = targetProbability, + TargetReliability = targetReliability, + CalculatedProbability = calculatedProbability, + CalculatedReliability = calculatedReliability + }); + + // Assert + Assert.AreEqual(2, output.WaterLevel.NumberOfDecimalPlaces); + Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy()); + Assert.AreEqual(2, output.WaveHeight.NumberOfDecimalPlaces); + Assert.AreEqual(waveHeight, output.WaveHeight, output.WaveHeight.GetAccuracy()); + Assert.AreEqual(2, output.WavePeriod.NumberOfDecimalPlaces); + Assert.AreEqual(wavePeriod, output.WavePeriod, output.WavePeriod.GetAccuracy()); + Assert.AreEqual(targetProbability, output.TargetProbability); + Assert.AreEqual(5, output.TargetReliability.NumberOfDecimalPlaces); + Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy()); + Assert.AreEqual(calculatedProbability, output.CalculatedProbability); + Assert.AreEqual(5, output.CalculatedReliability.NumberOfDecimalPlaces); + Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); + Assert.AreEqual(convergence, output.CalculationConvergence); + } + + [Test] + public void Constructor_EmptyConstructionProperties_DefaultValues() + { + // Call + var output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, + new DuneLocationCalculationOutput.ConstructionProperties()); + + // Assert + Assert.IsNaN(output.WaterLevel); + Assert.IsNaN(output.WaveHeight); + Assert.IsNaN(output.WavePeriod); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.IsNaN(output.CalculatedProbability); + } + } +} \ No newline at end of file Fisheye: Tag 649b0974fb71df7368d19682bc255618f44d49c1 refers to a dead (removed) revision in file `Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj =================================================================== diff -u -r4b64623cd95f3917397dbb4add6c34da61c25cf4 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj (.../Ringtoets.DuneErosion.Data.Test.csproj) (revision 4b64623cd95f3917397dbb4add6c34da61c25cf4) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/Ringtoets.DuneErosion.Data.Test.csproj (.../Ringtoets.DuneErosion.Data.Test.csproj) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -23,7 +23,7 @@ - + Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/DuneErosionLocationsTestHelperTest.cs =================================================================== diff -u -r89547a60aa8be73beada947969a59050eaca5fb6 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/DuneErosionLocationsTestHelperTest.cs (.../DuneErosionLocationsTestHelperTest.cs) (revision 89547a60aa8be73beada947969a59050eaca5fb6) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/DuneErosionLocationsTestHelperTest.cs (.../DuneErosionLocationsTestHelperTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -65,7 +65,7 @@ { Calculation = { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }, new TestDuneLocation() @@ -81,11 +81,11 @@ DuneLocationCalculation calculation4 = failureMechanism.CalculationsForLowerLimitNorm.First(); DuneLocationCalculation calculation5 = failureMechanism.CalculationsForFactorizedLowerLimitNorm.First(); - calculation1.Output = new TestDuneLocationOutput(); - calculation2.Output = new TestDuneLocationOutput(); - calculation3.Output = new TestDuneLocationOutput(); - calculation4.Output = new TestDuneLocationOutput(); - calculation5.Output = new TestDuneLocationOutput(); + calculation1.Output = new TestDuneLocationCalculationOutput(); + calculation2.Output = new TestDuneLocationCalculationOutput(); + calculation3.Output = new TestDuneLocationCalculationOutput(); + calculation4.Output = new TestDuneLocationCalculationOutput(); + calculation5.Output = new TestDuneLocationCalculationOutput(); // Call IEnumerable actualObjects = Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs =================================================================== diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs (.../TestDuneLocationOutputTest.cs) (revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs (.../TestDuneLocationOutputTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -31,10 +31,10 @@ public void Constructor_ExpectedValues() { // Call - var output = new TestDuneLocationOutput(); + var output = new TestDuneLocationCalculationOutput(); // Assert - Assert.IsInstanceOf(output); + Assert.IsInstanceOf(output); Assert.AreEqual(0, output.WaterLevel.Value); Assert.AreEqual(0, output.WaveHeight.Value); Assert.AreEqual(0, output.WavePeriod.Value); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/Ringtoets.DuneErosion.Data.TestUtil.csproj =================================================================== diff -u -r89547a60aa8be73beada947969a59050eaca5fb6 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/Ringtoets.DuneErosion.Data.TestUtil.csproj (.../Ringtoets.DuneErosion.Data.TestUtil.csproj) (revision 89547a60aa8be73beada947969a59050eaca5fb6) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/Ringtoets.DuneErosion.Data.TestUtil.csproj (.../Ringtoets.DuneErosion.Data.TestUtil.csproj) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -17,7 +17,7 @@ - + Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationCalculationOutput.cs =================================================================== diff -u --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationCalculationOutput.cs (revision 0) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationCalculationOutput.cs (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -0,0 +1,47 @@ +// 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 Ringtoets.Common.Data.Hydraulics; + +namespace Ringtoets.DuneErosion.Data.TestUtil +{ + /// + /// Class that creates simple instances of that + /// can be used during testing. + /// + public class TestDuneLocationCalculationOutput : DuneLocationCalculationOutput + { + /// + /// Creates a new instance of . + /// + public TestDuneLocationCalculationOutput() + : base(CalculationConvergence.CalculatedConverged, new ConstructionProperties + { + WaterLevel = 0, + WavePeriod = 0, + WaveHeight = 0, + TargetProbability = 0, + CalculatedReliability = 0, + TargetReliability = 0, + CalculatedProbability = 0 + }) {} + } +} \ No newline at end of file Fisheye: Tag 649b0974fb71df7368d19682bc255618f44d49c1 refers to a dead (removed) revision in file `Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -r6e236a1a97286ef68c664288eb5d89326f79a0cb -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs (.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs) (revision 6e236a1a97286ef68c664288eb5d89326f79a0cb) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs (.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -320,7 +320,7 @@ private static void SetCalculationOutput(IEnumerable calculations) { - var output = new TestDuneLocationOutput(); + var output = new TestDuneLocationCalculationOutput(); calculations.First().Output = output; } @@ -389,7 +389,7 @@ { Calculation = { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }; } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs (.../DuneErosionMapDataFeaturesFactoryTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs (.../DuneErosionMapDataFeaturesFactoryTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -70,7 +70,7 @@ { Calculation = { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }).Cast().ToArray(); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs =================================================================== diff -u -r1a1c79792a4f6e4ef9f79dce6017a0582f994559 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs (.../DuneLocationCalculationPropertiesTest.cs) (revision 1a1c79792a4f6e4ef9f79dce6017a0582f994559) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs (.../DuneLocationCalculationPropertiesTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -127,9 +127,9 @@ double calculatedProbability = random.NextDouble(); double calculatedReliability = random.NextDouble(); - var output = new DuneLocationOutput( + var output = new DuneLocationCalculationOutput( convergence, - new DuneLocationOutput.ConstructionProperties + new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = waterLevel, WaveHeight = waveHeight, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs (.../DuneErosionFailureMechanismViewTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs (.../DuneErosionFailureMechanismViewTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -341,7 +341,7 @@ Assert.IsNaN((double) duneLocationFeature.MetaData["Rekenwaarde waterstand"]); // Call - duneLocation.Calculation.Output = new TestDuneLocationOutput(); + duneLocation.Calculation.Output = new TestDuneLocationCalculationOutput(); duneLocation.NotifyObservers(); // Assert Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs =================================================================== diff -u -rdc532d6d17803dd8d323f7aa1f9fc95c691ae64e -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision dc532d6d17803dd8d323f7aa1f9fc95c691ae64e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -50,7 +50,7 @@ }); var duneLocationCalculation = new DuneLocationCalculation(duneLocation) { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties + Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = 3.0, WaveHeight = 4.0, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs =================================================================== diff -u -r60e31a4d64f102398b83b082294299d0ce44a4a8 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 60e31a4d64f102398b83b082294299d0ce44a4a8) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -330,7 +330,7 @@ }); var duneLocationCalculation = new DuneLocationCalculation(duneLocation) { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties + Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = 3.21, WaveHeight = 4.32, @@ -757,7 +757,7 @@ D50 = 0.000123 })) { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties + Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = 1.23, WaveHeight = 2.34, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs =================================================================== diff -u -r18e853179b2a70e1404a89b4db662d071c7bfec8 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs (.../DuneLocationCalculationsExporterTest.cs) (revision 18e853179b2a70e1404a89b4db662d071c7bfec8) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs (.../DuneLocationCalculationsExporterTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -80,12 +80,12 @@ var calculationWithUncalculatedOutput = new DuneLocationCalculation(CreateDuneLocationForExport(10, 9770.1, 1.9583e-4)) { - Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN) + Output = CreateDuneLocationCalculationOutputForExport(double.NaN, double.NaN, double.NaN) }; var calculationWithOutput = new DuneLocationCalculation(CreateDuneLocationForExport(11, 9771.34, 1.337e-4)) { - Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53) + Output = CreateDuneLocationCalculationOutputForExport(5.89, 14.11, 8.53) }; DuneLocationCalculation[] duneLocationCalculations = @@ -142,9 +142,9 @@ } } - private static DuneLocationOutput CreateDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight) + private static DuneLocationCalculationOutput CreateDuneLocationCalculationOutputForExport(double waterLevel, double wavePeriod, double waveHeight) { - return new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties + return new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = waterLevel, WavePeriod = wavePeriod, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsWriterTest.cs =================================================================== diff -u -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsWriterTest.cs (.../DuneLocationCalculationsWriterTest.cs) (revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsWriterTest.cs (.../DuneLocationCalculationsWriterTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -135,12 +135,12 @@ var calculationWithUncalculatedOutput = new DuneLocationCalculation(CreateDuneLocationForExport(10, 9770.1, 1.9583e-4)) { - Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN) + Output = CreateDuneLocationCalculationOutputForExport(double.NaN, double.NaN, double.NaN) }; var calculationWithOutput = new DuneLocationCalculation(CreateDuneLocationForExport(11, 9771.34, 1.337e-4)) { - Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53) + Output = CreateDuneLocationCalculationOutputForExport(5.89, 14.11, 8.53) }; DuneLocationCalculation[] duneLocationCalculations = @@ -175,9 +175,9 @@ } } - private static DuneLocationOutput CreateDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight) + private static DuneLocationCalculationOutput CreateDuneLocationCalculationOutputForExport(double waterLevel, double wavePeriod, double waveHeight) { - return new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties + return new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = waterLevel, WavePeriod = wavePeriod, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs =================================================================== diff -u -rfe4e8e2149f5369ac596b12135c64eba9561cd5c -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision fe4e8e2149f5369ac596b12135c64eba9561cd5c) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -132,7 +132,7 @@ var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var initialOutput = new TestDuneLocationOutput(); + var initialOutput = new TestDuneLocationCalculationOutput(); var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation()) { Output = initialOutput Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneLocationsViewIntegrationTest.cs =================================================================== diff -u -r66d32f2cd2dc282c88698ea28b0c316de2cddffe -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneLocationsViewIntegrationTest.cs (.../DuneLocationsViewIntegrationTest.cs) (revision 66d32f2cd2dc282c88698ea28b0c316de2cddffe) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneLocationsViewIntegrationTest.cs (.../DuneLocationsViewIntegrationTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -113,7 +113,7 @@ D50 = 0.000123 })) { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties + Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties { WaterLevel = 1.23, WaveHeight = 2.34, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs =================================================================== diff -u -r2b5c91f2bd6369a53ab9e89915707f98ce553463 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs (.../DuneLocationsContextExportInfoTest.cs) (revision 2b5c91f2bd6369a53ab9e89915707f98ce553463) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs (.../DuneLocationsContextExportInfoTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -146,7 +146,7 @@ { new DuneLocationCalculation(new TestDuneLocation()) { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }; var context = new DuneLocationCalculationsContext(duneLocationCalculations, Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs =================================================================== diff -u -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs (.../DuneErosionBoundaryCalculationActivityTest.cs) (revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs (.../DuneErosionBoundaryCalculationActivityTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -200,12 +200,12 @@ } [Test] - public void Run_DuneLocationOutputSet_ValidationAndCalculationNotPerformedAndStateSkipped() + public void Run_DuneLocationCalculationOutputSet_ValidationAndCalculationNotPerformedAndStateSkipped() { // Setup var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation()) { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties()) + Output = new TestDuneLocationCalculationOutput() }; var activity = new DuneErosionBoundaryCalculationActivity(duneLocationCalculation, @@ -257,13 +257,13 @@ } // Assert - DuneLocationOutput duneLocationOutput = duneLocationCalculation.Output; - Assert.IsNotNull(duneLocationOutput); - Assert.AreEqual(expectedWaterLevel, duneLocationOutput.WaterLevel, duneLocationOutput.WaterLevel.GetAccuracy()); - Assert.AreEqual(expectedWaveHeight, duneLocationOutput.WaveHeight, duneLocationOutput.WaveHeight.GetAccuracy()); - Assert.AreEqual(expectedWavePeriod, duneLocationOutput.WavePeriod, duneLocationOutput.WavePeriod.GetAccuracy()); - Assert.AreEqual(expectedReliabilityIndex, duneLocationOutput.CalculatedReliability, duneLocationOutput.CalculatedReliability.GetAccuracy()); - Assert.AreEqual(CalculationConvergence.CalculatedConverged, duneLocationOutput.CalculationConvergence); + DuneLocationCalculationOutput actualCalculationOutput = duneLocationCalculation.Output; + Assert.IsNotNull(actualCalculationOutput); + Assert.AreEqual(expectedWaterLevel, actualCalculationOutput.WaterLevel, actualCalculationOutput.WaterLevel.GetAccuracy()); + Assert.AreEqual(expectedWaveHeight, actualCalculationOutput.WaveHeight, actualCalculationOutput.WaveHeight.GetAccuracy()); + Assert.AreEqual(expectedWavePeriod, actualCalculationOutput.WavePeriod, actualCalculationOutput.WavePeriod.GetAccuracy()); + Assert.AreEqual(expectedReliabilityIndex, actualCalculationOutput.CalculatedReliability, actualCalculationOutput.CalculatedReliability.GetAccuracy()); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, actualCalculationOutput.CalculationConvergence); mockRepository.VerifyAll(); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs =================================================================== diff -u -r36c0124573e55edf34c958000ff8574ca93b4ed0 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 36c0124573e55edf34c958000ff8574ca93b4ed0) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -239,15 +239,15 @@ double targetReliability = StatisticsConverter.ProbabilityToReliability(norm); double calculatedProbability = StatisticsConverter.ReliabilityToProbability(calculator.ReliabilityIndex); - DuneLocationOutput duneLocationOutput = duneLocationCalculation.Output; - Assert.IsNotNull(duneLocationOutput); - Assert.AreEqual(calculator.ReliabilityIndex, duneLocationOutput.CalculatedReliability.Value); - Assert.AreEqual(calculatedProbability, duneLocationOutput.CalculatedProbability); - Assert.AreEqual(norm, duneLocationOutput.TargetProbability); - Assert.AreEqual(targetReliability, duneLocationOutput.TargetReliability, duneLocationOutput.TargetReliability.GetAccuracy()); - Assert.AreEqual(calculator.WaterLevel, duneLocationOutput.WaterLevel, duneLocationOutput.WaterLevel.GetAccuracy()); - Assert.AreEqual(calculator.WaveHeight, duneLocationOutput.WaveHeight, duneLocationOutput.WaveHeight.GetAccuracy()); - Assert.AreEqual(calculator.WavePeriod, duneLocationOutput.WavePeriod, duneLocationOutput.WavePeriod.GetAccuracy()); + DuneLocationCalculationOutput actualCalculationOutput = duneLocationCalculation.Output; + Assert.IsNotNull(actualCalculationOutput); + Assert.AreEqual(calculator.ReliabilityIndex, actualCalculationOutput.CalculatedReliability.Value); + Assert.AreEqual(calculatedProbability, actualCalculationOutput.CalculatedProbability); + Assert.AreEqual(norm, actualCalculationOutput.TargetProbability); + Assert.AreEqual(targetReliability, actualCalculationOutput.TargetReliability, actualCalculationOutput.TargetReliability.GetAccuracy()); + Assert.AreEqual(calculator.WaterLevel, actualCalculationOutput.WaterLevel, actualCalculationOutput.WaterLevel.GetAccuracy()); + Assert.AreEqual(calculator.WaveHeight, actualCalculationOutput.WaveHeight, actualCalculationOutput.WaveHeight.GetAccuracy()); + Assert.AreEqual(calculator.WavePeriod, actualCalculationOutput.WavePeriod, actualCalculationOutput.WavePeriod.GetAccuracy()); } mockRepository.VerifyAll(); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs =================================================================== diff -u -rf0c2e0726fb0d7a85fd1e192f3775c8dba10605f -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision f0c2e0726fb0d7a85fd1e192f3775c8dba10605f) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -233,7 +233,7 @@ { Calculation = { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }; @@ -278,31 +278,21 @@ failureMechanism.DuneLocations.AddRange(duneLocations); failureMechanism.SetDuneLocationCalculations(duneLocations); - failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationOutput(); + failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + IEnumerable expectedAffectedCalculations = + DuneErosionLocationsTestHelper.GetAllDuneErosionLocationCalculationsWithOutput(failureMechanism); + // Call IEnumerable affected = DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(failureMechanism); // Assert - var expectedAffectedCalculations = new[] - { - failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First(), - failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First(), - failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First(), - failureMechanism.CalculationsForLowerLimitNorm.First(), - failureMechanism.CalculationsForFactorizedLowerLimitNorm.First() - }; CollectionAssert.AreEquivalent(expectedAffectedCalculations, affected); - - Assert.True(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.All(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.All(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForLowerLimitNorm.All(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForFactorizedLowerLimitNorm.All(calc => calc.Output == null)); + DuneErosionLocationsTestHelper.AssertDuneLocationCalculationsHaveNoOutputs(failureMechanism); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r89547a60aa8be73beada947969a59050eaca5fb6 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 89547a60aa8be73beada947969a59050eaca5fb6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -257,7 +257,7 @@ { Calculation = { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }; var duneLocation2 = new TestDuneLocation(); @@ -1685,7 +1685,7 @@ { Calculation = { - Output = hasOutput ? new TestDuneLocationOutput() : null + Output = hasOutput ? new TestDuneLocationCalculationOutput() : null } }; @@ -1699,11 +1699,11 @@ if (hasOutput) { - failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationOutput(); + failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); } } } Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -re14019cefc9ac331b5b1a793c91e6801078ba889 -r649b0974fb71df7368d19682bc255618f44d49c1 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision e14019cefc9ac331b5b1a793c91e6801078ba889) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) @@ -1045,7 +1045,7 @@ { Calculation = { - Output = new TestDuneLocationOutput() + Output = new TestDuneLocationCalculationOutput() } }, new TestDuneLocation() @@ -1054,11 +1054,11 @@ failureMechanism.DuneLocations.AddRange(duneLocations); failureMechanism.SetDuneLocationCalculations(duneLocations); - failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationOutput(); - failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationOutput(); + failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForMechanismSpecificSignalingNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); + failureMechanism.CalculationsForFactorizedLowerLimitNorm.First().Output = new TestDuneLocationCalculationOutput(); AddFailureMechanismSections(failureMechanism); }