Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision e56b96f63d7f5098e36566ea556f45af5c142320) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f) @@ -25,7 +25,6 @@ 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.DikeProfiles; @@ -39,6 +38,7 @@ using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.TestUtil; namespace Ringtoets.Revetment.Service.Test { @@ -650,7 +650,9 @@ WaveConditionsOutput[] waveConditionsOutputs = service.Outputs.ToArray(); Assert.AreEqual(3, waveConditionsOutputs.Length); - AssertFailedCalculationOutput(waterLevelUpperBoundary, norm, waveConditionsOutputs[0]); + WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundary, + norm, + waveConditionsOutputs[0]); } mockRepository.VerifyAll(); } @@ -696,24 +698,6 @@ 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 WaveConditionsInput GetDefaultValidationInput() { var input = new WaveConditionsInput