Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision e56b96f63d7f5098e36566ea556f45af5c142320) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f) @@ -24,12 +24,10 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.TestUtil; -using Core.Common.Utils; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; @@ -40,6 +38,7 @@ using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Service; +using Ringtoets.Revetment.TestUtil; using Ringtoets.WaveImpactAsphaltCover.Data; namespace Ringtoets.WaveImpactAsphaltCover.Service.Test @@ -810,29 +809,13 @@ Assert.AreEqual(3, waveConditionsOutputs.Length); double targetNorm = assessmentSectionStub.FailureMechanismContribution.Norm; - AssertFailedCalculationOutput(waterLevelUpperBoundaryRevetment, targetNorm, waveConditionsOutputs[0]); + WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment, + targetNorm, + waveConditionsOutputs[0]); } mockRepository.VerifyAll(); } - private static void AssertFailedCalculationOutput(double waterLevel, double targetNorm, WaveConditionsOutput actual) - { - double targetReliability = StatisticsConverter.ProbabilityToReliability(targetNorm); - double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability); - - Assert.IsNotNull(actual); - Assert.AreEqual(waterLevel, actual.WaterLevel, actual.WaterLevel.GetAccuracy()); - Assert.IsNaN(actual.WaveHeight); - Assert.IsNaN(actual.WavePeakPeriod); - Assert.IsNaN(actual.WaveAngle); - Assert.IsNaN(actual.WaveDirection); - Assert.AreEqual(targetProbability, actual.TargetProbability); - Assert.AreEqual(targetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy()); - Assert.IsNaN(actual.CalculatedProbability); - Assert.IsNaN(actual.CalculatedReliability); - Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, actual.CalculationConvergence); - } - private static WaveImpactAsphaltCoverWaveConditionsCalculation GetValidCalculation() { var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation