Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs (.../RingtoetsCommonDataCalculationServiceTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs (.../RingtoetsCommonDataCalculationServiceTest.cs) (revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5) @@ -19,40 +19,28 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Core.Common.Utils; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data.Output; +using Ringtoets.HydraRing.Data; namespace Ringtoets.Common.Service.Test { [TestFixture] public class RingtoetsCommonDataCalculationServiceTest { [Test] - public void CalculationConverged_WithNullOutput_ThrowsArgumentNullException() - { - // Call - TestDelegate test = () => RingtoetsCommonDataCalculationService.CalculationConverged(null, 1.0); - - // Assert - var exception = Assert.Throws(test); - Assert.AreEqual("output", exception.ParamName); - } - - [Test] public void CalculationConverged_WithConvergedResults_CalculationConvergedTrue() { // Setup double norm = 1.0e3; double reliabilityIndex = StatisticsConverter.NormToBeta(norm); - var output = new ReliabilityIndexCalculationOutput(reliabilityIndex, reliabilityIndex); // Call - bool calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(output, norm); + CalculationConvergence calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(reliabilityIndex, norm); // Assert - Assert.IsTrue(calculationConverged); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, calculationConverged); } [Test] @@ -63,10 +51,10 @@ double norm = 1; // Call - bool calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(output, norm); + CalculationConvergence calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(output.CalculatedReliabilityIndex, norm); // Assert - Assert.IsFalse(calculationConverged); + Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, calculationConverged); } } } \ No newline at end of file