Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805) @@ -23,13 +23,15 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Base; +using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.Probability; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.HydraRing.Data; @@ -51,11 +53,14 @@ const int normValue = 200; const int numberOfCalculations = 3; + var waveHeight = (RoundedDouble) 3.0; + var designWaterLevel = (RoundedDouble) 4.2; + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 0.0, 0.0) { - WaveHeight = 3.0, - DesignWaterLevel = 4.2 + WaveHeight = waveHeight, + DesignWaterLevel = designWaterLevel }); AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) @@ -124,8 +129,8 @@ // Precondition Assert.AreEqual(failureMechanismContribution.Norm.ToString(), normTester.Text); - Assert.AreEqual(3.0, hydraulicBoundaryLocation.WaveHeight); - Assert.AreEqual(4.2, hydraulicBoundaryLocation.DesignWaterLevel); + Assert.AreEqual(waveHeight, hydraulicBoundaryLocation.WaveHeight, hydraulicBoundaryLocation.WaveHeight.GetAccuracy()); + Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy()); Assert.IsNotNull(pipingCalculation.Output); Assert.IsNotNull(grassCoverErosionInwardsCalculation.Output); Assert.IsNotNull(heightStructuresCalculation.Output); @@ -156,11 +161,13 @@ // Setup const int normValue = 200; + var waveHeight = (RoundedDouble) 3.0; + var designWaterLevel = (RoundedDouble) 4.2; HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 0.0, 0.0) { - WaveHeight = 3.0, - DesignWaterLevel = 4.2 + WaveHeight = waveHeight, + DesignWaterLevel = designWaterLevel }); AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) @@ -209,8 +216,8 @@ // Precondition Assert.AreEqual(failureMechanismContribution.Norm.ToString(), normTester.Text); - Assert.AreEqual(3.0, hydraulicBoundaryLocation.WaveHeight); - Assert.AreEqual(4.2, hydraulicBoundaryLocation.DesignWaterLevel); + Assert.AreEqual(waveHeight, hydraulicBoundaryLocation.WaveHeight, hydraulicBoundaryLocation.WaveHeight.GetAccuracy()); + Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy()); // Call Action call = () => normTester.Properties.Text = normValue.ToString(); @@ -225,7 +232,7 @@ } [Test] - public void NormTextBox_HydraulicBoundaryLocationNoOutputAndCalcultionWithOutputAndValueChanged_CalculationObserverNotifiedAndMessageLogged() + public void NormTextBox_HydraulicBoundaryLocationNoOutputAndCalculationWithOutputAndValueChanged_CalculationObserverNotifiedAndMessageLogged() { // Setup const int normValue = 200;