Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs =================================================================== diff -u -r99cac92e4eeb290856138296baab92ca7c09e0f7 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs (.../MacroStabilityInwardsGridTest.cs) (revision 99cac92e4eeb290856138296baab92ca7c09e0f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs (.../MacroStabilityInwardsGridTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -22,6 +22,7 @@ using System; using Core.Common.Base.Data; using NUnit.Framework; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Data.Test { @@ -35,16 +36,16 @@ var grid = new MacroStabilityInwardsGrid(); // Assert - Assert.AreEqual(0, grid.XLeft.Value); + Assert.AreEqual(0, grid.XLeft, grid.XLeft.GetAccuracy()); Assert.AreEqual(2, grid.XLeft.NumberOfDecimalPlaces); - Assert.AreEqual(0, grid.XRight.Value); + Assert.AreEqual(0, grid.XRight, grid.XRight.GetAccuracy()); Assert.AreEqual(2, grid.XRight.NumberOfDecimalPlaces); - Assert.AreEqual(0, grid.ZTop.Value); + Assert.AreEqual(0, grid.ZTop, grid.ZTop.GetAccuracy()); Assert.AreEqual(2, grid.ZTop.NumberOfDecimalPlaces); - Assert.AreEqual(0, grid.ZBottom.Value); + Assert.AreEqual(0, grid.ZBottom, grid.ZBottom.GetAccuracy()); Assert.AreEqual(2, grid.ZBottom.NumberOfDecimalPlaces); Assert.AreEqual(0, grid.NumberOfHorizontalPoints); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs =================================================================== diff -u -r801944e042197afab2cf3bb57359970479e286b3 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -53,82 +53,91 @@ Assert.IsFalse(inputParameters.UseAssessmentLevelManualInput); - Assert.AreEqual(10, inputParameters.SlipPlaneMinimumDepth.Value); + Assert.AreEqual(10, inputParameters.SlipPlaneMinimumDepth, inputParameters.SlipPlaneMinimumDepth.GetAccuracy()); Assert.AreEqual(2, inputParameters.SlipPlaneMinimumDepth.NumberOfDecimalPlaces); - Assert.AreEqual(30, inputParameters.SlipPlaneMinimumLength.Value); + Assert.AreEqual(30, inputParameters.SlipPlaneMinimumLength, inputParameters.SlipPlaneMinimumLength.GetAccuracy()); Assert.AreEqual(2, inputParameters.SlipPlaneMinimumLength.NumberOfDecimalPlaces); - Assert.AreEqual(5, inputParameters.MaximumSliceWidth.Value); + Assert.AreEqual(5, inputParameters.MaximumSliceWidth, inputParameters.MaximumSliceWidth.GetAccuracy()); Assert.AreEqual(2, inputParameters.MaximumSliceWidth.NumberOfDecimalPlaces); Assert.IsTrue(inputParameters.MoveGrid); Assert.AreEqual(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, inputParameters.DikeSoilScenario); - Assert.AreEqual(0, inputParameters.WaterLevelRiverAverage.Value); + Assert.AreEqual(0, inputParameters.WaterLevelRiverAverage, inputParameters.WaterLevelRiverAverage.GetAccuracy()); Assert.AreEqual(2, inputParameters.WaterLevelRiverAverage.NumberOfDecimalPlaces); Assert.AreEqual(0, inputParameters.WaterLevelPolder.Value); Assert.AreEqual(2, inputParameters.WaterLevelPolder.NumberOfDecimalPlaces); Assert.IsFalse(inputParameters.DrainageConstructionPresent); - Assert.IsNaN(inputParameters.XCoordinateDrainageConstruction.Value); + Assert.IsNaN(inputParameters.XCoordinateDrainageConstruction); Assert.AreEqual(2, inputParameters.XCoordinateDrainageConstruction.NumberOfDecimalPlaces); - Assert.IsNaN(inputParameters.ZCoordinateDrainageConstruction.Value); + Assert.IsNaN(inputParameters.ZCoordinateDrainageConstruction); Assert.AreEqual(2, inputParameters.ZCoordinateDrainageConstruction.NumberOfDecimalPlaces); - Assert.IsNaN(inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver.Value); + Assert.IsNaN(inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.AreEqual(2, inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver.NumberOfDecimalPlaces); - Assert.IsNaN(inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder.Value); + Assert.IsNaN(inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.AreEqual(2, inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder.NumberOfDecimalPlaces); Assert.IsTrue(inputParameters.UseDefaultOffset); - Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowDikeTopAtRiver.Value); + Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowDikeTopAtRiver); Assert.AreEqual(2, inputParameters.PhreaticLineOffsetBelowDikeTopAtRiver.NumberOfDecimalPlaces); - Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowDikeTopAtPolder.Value); + Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowDikeTopAtPolder); Assert.AreEqual(2, inputParameters.PhreaticLineOffsetBelowDikeTopAtPolder.NumberOfDecimalPlaces); - Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowShoulderBaseInside.Value); + Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowShoulderBaseInside); Assert.AreEqual(2, inputParameters.PhreaticLineOffsetBelowShoulderBaseInside.NumberOfDecimalPlaces); - Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowDikeToeAtPolder.Value); + Assert.IsNaN(inputParameters.PhreaticLineOffsetBelowDikeToeAtPolder); Assert.AreEqual(2, inputParameters.PhreaticLineOffsetBelowDikeToeAtPolder.NumberOfDecimalPlaces); Assert.IsTrue(inputParameters.AdjustPhreaticLine3And4ForUplift); - Assert.AreEqual(0, inputParameters.LeakageLengthOutwardsPhreaticLine3.Value); + Assert.AreEqual(0, inputParameters.LeakageLengthOutwardsPhreaticLine3, + inputParameters.LeakageLengthOutwardsPhreaticLine3.GetAccuracy()); Assert.AreEqual(2, inputParameters.LeakageLengthOutwardsPhreaticLine3.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.LeakageLengthInwardsPhreaticLine3.Value); + Assert.AreEqual(0, inputParameters.LeakageLengthInwardsPhreaticLine3, + inputParameters.LeakageLengthInwardsPhreaticLine3.GetAccuracy()); Assert.AreEqual(2, inputParameters.LeakageLengthInwardsPhreaticLine3.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.LeakageLengthOutwardsPhreaticLine4.Value); + Assert.AreEqual(0, inputParameters.LeakageLengthOutwardsPhreaticLine4, + inputParameters.LeakageLengthOutwardsPhreaticLine4.GetAccuracy()); Assert.AreEqual(2, inputParameters.LeakageLengthOutwardsPhreaticLine4.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.LeakageLengthInwardsPhreaticLine4.Value); + Assert.AreEqual(0, inputParameters.LeakageLengthInwardsPhreaticLine4, + inputParameters.LeakageLengthInwardsPhreaticLine4.GetAccuracy()); Assert.AreEqual(2, inputParameters.LeakageLengthInwardsPhreaticLine4.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.PiezometricHeadPhreaticLine2Outwards.Value); + Assert.AreEqual(0, inputParameters.PiezometricHeadPhreaticLine2Outwards, + inputParameters.PiezometricHeadPhreaticLine2Outwards.GetAccuracy()); Assert.AreEqual(2, inputParameters.PiezometricHeadPhreaticLine2Outwards.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.PiezometricHeadPhreaticLine2Inwards.Value); + Assert.AreEqual(0, inputParameters.PiezometricHeadPhreaticLine2Inwards, + inputParameters.PiezometricHeadPhreaticLine2Inwards.GetAccuracy()); Assert.AreEqual(2, inputParameters.PiezometricHeadPhreaticLine2Inwards.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.PenetrationLength.Value); + Assert.AreEqual(0, inputParameters.PenetrationLength, + inputParameters.PenetrationLength.GetAccuracy()); Assert.AreEqual(2, inputParameters.PenetrationLength.NumberOfDecimalPlaces); Assert.AreEqual(MacroStabilityInwardsGridDetermination.Automatic, inputParameters.GridDetermination); Assert.AreEqual(MacroStabilityInwardsTangentLineDetermination.LayerSeparated, inputParameters.TangentLineDetermination); - Assert.AreEqual(0, inputParameters.TangentLineZTop.Value); + Assert.AreEqual(0, inputParameters.TangentLineZTop, + inputParameters.TangentLineZTop.GetAccuracy()); Assert.AreEqual(2, inputParameters.TangentLineZTop.NumberOfDecimalPlaces); - Assert.AreEqual(0, inputParameters.TangentLineZBottom.Value); + Assert.AreEqual(0, inputParameters.TangentLineZBottom, + inputParameters.TangentLineZBottom.GetAccuracy()); Assert.AreEqual(2, inputParameters.TangentLineZBottom.NumberOfDecimalPlaces); Assert.IsNotNull(inputParameters.LeftGrid); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs =================================================================== diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -203,7 +203,8 @@ { Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation); Assert.IsTrue(calculation.InputParameters.UseAssessmentLevelManualInput); - Assert.AreEqual(3, calculation.InputParameters.AssessmentLevel.Value); + Assert.AreEqual(3, calculation.InputParameters.AssessmentLevel, + calculation.InputParameters.AssessmentLevel.GetAccuracy()); } if (hasSurfaceLine) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs =================================================================== diff -u -re63dcbcfc3539e54d563a826d494bf5909cdbdc8 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs (.../MacroStabilityInwardsDrainagePropertiesTest.cs) (revision e63dcbcfc3539e54d563a826d494bf5909cdbdc8) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs (.../MacroStabilityInwardsDrainagePropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -27,6 +27,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.TestUtil; @@ -183,8 +184,10 @@ // Then Assert.AreEqual(constructionPresent, input.DrainageConstructionPresent); - Assert.AreEqual(xCoordinateDrainageConstruction, input.XCoordinateDrainageConstruction.Value); - Assert.AreEqual(zCoordinateDrainageConstruction, input.ZCoordinateDrainageConstruction.Value); + Assert.AreEqual(xCoordinateDrainageConstruction, input.XCoordinateDrainageConstruction, + input.XCoordinateDrainageConstruction.GetAccuracy()); + Assert.AreEqual(zCoordinateDrainageConstruction, input.ZCoordinateDrainageConstruction, + input.ZCoordinateDrainageConstruction.GetAccuracy()); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs =================================================================== diff -u -re63dcbcfc3539e54d563a826d494bf5909cdbdc8 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs (.../MacroStabilityInwardsGridSettingsPropertiesTest.cs) (revision e63dcbcfc3539e54d563a826d494bf5909cdbdc8) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs (.../MacroStabilityInwardsGridSettingsPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -29,6 +29,7 @@ using Core.Common.Utils; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.TestUtil; @@ -227,8 +228,8 @@ Assert.AreEqual(moveGrid, input.MoveGrid); Assert.AreEqual(gridDetermination, input.GridDetermination); Assert.AreEqual(tangentLineDetermination, input.TangentLineDetermination); - Assert.AreEqual(tangentLineZTop, input.TangentLineZTop.Value); - Assert.AreEqual(tangentLineZBottom, input.TangentLineZBottom.Value); + Assert.AreEqual(tangentLineZTop, input.TangentLineZTop, input.TangentLineZTop.GetAccuracy()); + Assert.AreEqual(tangentLineZBottom, input.TangentLineZBottom, input.TangentLineZBottom.GetAccuracy()); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -re63dcbcfc3539e54d563a826d494bf5909cdbdc8 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision e63dcbcfc3539e54d563a826d494bf5909cdbdc8) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -452,7 +452,7 @@ properties.MaximumSliceWidth = (RoundedDouble) maximumSliceWidth; // Then - Assert.AreEqual(assessmentLevel, inputParameters.AssessmentLevel.Value); + Assert.AreEqual(assessmentLevel, inputParameters.AssessmentLevel, inputParameters.AssessmentLevel.GetAccuracy()); Assert.AreSame(surfaceLine, inputParameters.SurfaceLine); Assert.AreSame(soilModel, inputParameters.StochasticSoilModel); Assert.AreSame(soilProfile, inputParameters.StochasticSoilProfile); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs =================================================================== diff -u -r5c77968df3d50b52ec1285c1305f00833fd40a79 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs (.../MacroStabilityInwardsOffsetPropertiesTest.cs) (revision 5c77968df3d50b52ec1285c1305f00833fd40a79) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs (.../MacroStabilityInwardsOffsetPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -27,6 +27,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.TestUtil; @@ -207,10 +208,14 @@ // Then Assert.AreEqual(useDefaultOffset, input.UseDefaultOffset); - Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtRiver, input.PhreaticLineOffsetBelowDikeTopAtRiver.Value); - Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtPolder, input.PhreaticLineOffsetBelowDikeTopAtPolder.Value); - Assert.AreEqual(phreaticLineOffsetBelowShoulderBaseInside, input.PhreaticLineOffsetBelowShoulderBaseInside.Value); - Assert.AreEqual(phreaticLineOffsetBelowDikeToeAtPolder, input.PhreaticLineOffsetBelowDikeToeAtPolder.Value); + Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtRiver, input.PhreaticLineOffsetBelowDikeTopAtRiver, + input.PhreaticLineOffsetBelowDikeTopAtRiver.GetAccuracy()); + Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtPolder, input.PhreaticLineOffsetBelowDikeTopAtPolder, + input.PhreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy()); + Assert.AreEqual(phreaticLineOffsetBelowShoulderBaseInside, input.PhreaticLineOffsetBelowShoulderBaseInside, + input.PhreaticLineOffsetBelowShoulderBaseInside.GetAccuracy()); + Assert.AreEqual(phreaticLineOffsetBelowDikeToeAtPolder, input.PhreaticLineOffsetBelowDikeToeAtPolder, + input.PhreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy()); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs =================================================================== diff -u -r072f14cf0e58568db3813c08ec27020920bc4fea -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 072f14cf0e58568db3813c08ec27020920bc4fea) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -27,6 +27,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.TestUtil; @@ -137,7 +138,7 @@ PropertyDescriptor drainageProperty = dynamicProperties[expectedDrainagePropertyIndex]; TestHelper.AssertTypeConverter( - nameof(MacroStabilityInwardsWaterStressesProperties.Drainage)); + nameof(MacroStabilityInwardsWaterStressesProperties.Drainage)); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( drainageProperty, waterStressesCategory, @@ -161,7 +162,7 @@ PropertyDescriptor offsetProperty = dynamicProperties[expecteOffsetPropertyIndex]; TestHelper.AssertTypeConverter( - nameof(MacroStabilityInwardsWaterStressesProperties.Offsets)); + nameof(MacroStabilityInwardsWaterStressesProperties.Offsets)); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( offsetProperty, waterStressesCategory, @@ -298,18 +299,29 @@ properties.PenetrationLength = (RoundedDouble) penetrationLength; // Then - Assert.AreEqual(waterLevelRiverAverage, input.WaterLevelRiverAverage.Value); - Assert.AreEqual(waterLevelPolder, input.WaterLevelPolder.Value); - Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, input.MinimumLevelPhreaticLineAtDikeTopRiver.Value); - Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, input.MinimumLevelPhreaticLineAtDikeTopPolder.Value); + Assert.AreEqual(waterLevelRiverAverage, input.WaterLevelRiverAverage, + input.WaterLevelRiverAverage.GetAccuracy()); + Assert.AreEqual(waterLevelPolder, input.WaterLevelPolder, + input.WaterLevelPolder.GetAccuracy()); + Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, input.MinimumLevelPhreaticLineAtDikeTopRiver, + input.MinimumLevelPhreaticLineAtDikeTopRiver.GetAccuracy()); + Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, input.MinimumLevelPhreaticLineAtDikeTopPolder, + input.MinimumLevelPhreaticLineAtDikeTopPolder.GetAccuracy()); Assert.AreEqual(adjustPhreaticLine3And4ForUplift, input.AdjustPhreaticLine3And4ForUplift); - Assert.AreEqual(leakageLengthOutwardsPhreaticLine3, input.LeakageLengthOutwardsPhreaticLine3.Value); - Assert.AreEqual(leakageLengthInwardsPhreaticLine3, input.LeakageLengthInwardsPhreaticLine3.Value); - Assert.AreEqual(leakageLengthOutwardsPhreaticLine4, input.LeakageLengthOutwardsPhreaticLine4.Value); - Assert.AreEqual(leakageLengthInwardsPhreaticLine4, input.LeakageLengthInwardsPhreaticLine4.Value); - Assert.AreEqual(piezometricHeadPhreaticLine2Outwards, input.PiezometricHeadPhreaticLine2Outwards.Value); - Assert.AreEqual(piezometricHeadPhreaticLine2Inwards, input.PiezometricHeadPhreaticLine2Inwards.Value); - Assert.AreEqual(penetrationLength, input.PenetrationLength.Value); + Assert.AreEqual(leakageLengthOutwardsPhreaticLine3, input.LeakageLengthOutwardsPhreaticLine3, + input.LeakageLengthOutwardsPhreaticLine3.GetAccuracy()); + Assert.AreEqual(leakageLengthInwardsPhreaticLine3, input.LeakageLengthInwardsPhreaticLine3, + input.LeakageLengthInwardsPhreaticLine3.GetAccuracy()); + Assert.AreEqual(leakageLengthOutwardsPhreaticLine4, input.LeakageLengthOutwardsPhreaticLine4, + input.LeakageLengthOutwardsPhreaticLine4.GetAccuracy()); + Assert.AreEqual(leakageLengthInwardsPhreaticLine4, input.LeakageLengthInwardsPhreaticLine4, + input.LeakageLengthInwardsPhreaticLine4.GetAccuracy()); + Assert.AreEqual(piezometricHeadPhreaticLine2Outwards, input.PiezometricHeadPhreaticLine2Outwards, + input.PiezometricHeadPhreaticLine2Outwards.GetAccuracy()); + Assert.AreEqual(piezometricHeadPhreaticLine2Inwards, input.PiezometricHeadPhreaticLine2Inwards, + input.PiezometricHeadPhreaticLine2Inwards.GetAccuracy()); + Assert.AreEqual(penetrationLength, input.PenetrationLength, + input.PenetrationLength.GetAccuracy()); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs =================================================================== diff -u -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs (.../PipingTestDataGeneratorTest.cs) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs (.../PipingTestDataGeneratorTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -21,9 +21,11 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base.Data; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Piping.Data.TestUtil.Test @@ -206,7 +208,8 @@ { Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation); Assert.IsTrue(calculation.InputParameters.UseAssessmentLevelManualInput); - Assert.AreEqual(3, calculation.InputParameters.AssessmentLevel.Value); + Assert.AreEqual(3, calculation.InputParameters.AssessmentLevel, + calculation.InputParameters.AssessmentLevel.GetAccuracy()); } if (hasSurfaceLine) @@ -239,10 +242,17 @@ Assert.IsNull(calculation.InputParameters.StochasticSoilProfile); } - Assert.AreEqual(0, calculation.InputParameters.PhreaticLevelExit.Mean.Value); - Assert.AreEqual(0.1, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); - Assert.AreEqual(0.7, calculation.InputParameters.DampingFactorExit.Mean.Value); - Assert.AreEqual(0.1, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); + DistributionAssert.AreEqual(new NormalDistribution(3) + { + Mean = (RoundedDouble) 0, + StandardDeviation = (RoundedDouble) 0.1 + }, calculation.InputParameters.PhreaticLevelExit); + + DistributionAssert.AreEqual(new LogNormalDistribution(3) + { + Mean = (RoundedDouble) 0.7, + StandardDeviation = (RoundedDouble) 0.1 + }, calculation.InputParameters.DampingFactorExit); } private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -472,7 +472,8 @@ properties.WaterVolumetricWeight = roundedValue; // Assert - Assert.AreEqual(value, failureMechanism.GeneralInput.WaterVolumetricWeight.Value, failureMechanism.GeneralInput.WaterVolumetricWeight.GetAccuracy()); + Assert.AreEqual(value, failureMechanism.GeneralInput.WaterVolumetricWeight, + failureMechanism.GeneralInput.WaterVolumetricWeight.GetAccuracy()); Assert.IsTrue(changeHandler.Called); mocks.VerifyAll(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 09693d79085118c47709b7059ab7c1ef459ad2aa) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -591,9 +591,12 @@ properties.PhreaticLevelExit.StandardDeviation = phreaticLevelExit.Distribution.StandardDeviation; // Then - Assert.AreEqual(assessmentLevel, inputParameters.AssessmentLevel.Value); - Assert.AreEqual(entryPointL, inputParameters.EntryPointL.Value); - Assert.AreEqual(exitPointL, inputParameters.ExitPointL.Value); + Assert.AreEqual(assessmentLevel, inputParameters.AssessmentLevel, + inputParameters.AssessmentLevel.GetAccuracy()); + Assert.AreEqual(entryPointL, inputParameters.EntryPointL, + inputParameters.EntryPointL.GetAccuracy()); + Assert.AreEqual(exitPointL, inputParameters.ExitPointL, + inputParameters.ExitPointL.GetAccuracy()); Assert.AreSame(surfaceLine, inputParameters.SurfaceLine); Assert.AreSame(soilModel, inputParameters.StochasticSoilModel); Assert.AreSame(soilProfile, inputParameters.StochasticSoilProfile); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs (.../PipingSurfaceLineUpdateDataStrategyTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs (.../PipingSurfaceLineUpdateDataStrategyTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) @@ -27,6 +27,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.Exceptions; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.SurfaceLines; using Ringtoets.Piping.Data; @@ -1195,7 +1196,7 @@ Assert.IsFalse(affectedCalculation.HasOutput); PipingInput affectedInput = affectedCalculation.InputParameters; Assert.AreSame(affectedSurfaceLine, affectedInput.SurfaceLine); - Assert.AreEqual(0, affectedInput.EntryPointL.Value); + Assert.AreEqual(0, affectedInput.EntryPointL, affectedInput.EntryPointL.GetAccuracy()); Assert.IsNaN(affectedInput.ExitPointL); CollectionAssert.AreEqual(importedAffectedSurfaceLine.Points, affectedSurfaceLine.Points);