Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs =================================================================== diff -u -r5856d41b9f384ea1c20a51d637e9d45413df0a4d -rb28a844780b613e1901fa82328ba3917f485c729 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs (.../OvertoppingRateOutputTest.cs) (revision 5856d41b9f384ea1c20a51d637e9d45413df0a4d) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs (.../OvertoppingRateOutputTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) @@ -23,6 +23,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; @@ -32,9 +33,12 @@ public class OvertoppingRateOutputTest { [Test] - [TestCase(double.NaN, 0.8457)] - [TestCase(0.654, double.NaN)] - public void Constructor_ValidInputWithGeneralResultNull_ExpectedProperties(double targetProbability, double calculatedProbability) + [TestCase(double.NaN, 0.8457, true)] + [TestCase(0.654, double.NaN, false)] + public void Constructor_ValidInputWithGeneralResultNull_ExpectedProperties( + double targetProbability, + double calculatedProbability, + bool withIllustrationPoints) { // Setup var random = new Random(32); @@ -43,40 +47,10 @@ double calculatedReliability = random.NextDouble(); var convergence = random.NextEnumValue(); - // Call - var output = new OvertoppingRateOutput(overtoppingRate, - targetProbability, - targetReliability, - calculatedProbability, - calculatedReliability, - convergence, - null); + GeneralResult generalResult = withIllustrationPoints + ? new TestGeneralResultFaultTreeIllustrationPoint() + : null; - // Assert - Assert.IsInstanceOf(output); - Assert.AreEqual(overtoppingRate, output.OvertoppingRate, output.OvertoppingRate.GetAccuracy()); - Assert.AreEqual(targetProbability, output.TargetProbability); - Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy()); - Assert.AreEqual(calculatedProbability, output.CalculatedProbability); - Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); - Assert.AreEqual(convergence, output.CalculationConvergence); - Assert.IsFalse(output.HasGeneralResult); - Assert.IsNull(output.GeneralResult); - } - - [Test] - [TestCase(double.NaN, 0.8457)] - [TestCase(0.654, double.NaN)] - public void Constructor_ValidInputWithGeneralResult_ExpectedProperties(double targetProbability, double calculatedProbability) - { - // Setup - var random = new Random(32); - double overtoppingRate = random.NextDouble(); - double targetReliability = random.NextDouble(); - double calculatedReliability = random.NextDouble(); - var convergence = random.NextEnumValue(); - var generalResult = new TestGeneralResultFaultTreeIllustrationPoint(); - // Call var output = new OvertoppingRateOutput(overtoppingRate, targetProbability, @@ -94,7 +68,7 @@ Assert.AreEqual(calculatedProbability, output.CalculatedProbability); Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual(convergence, output.CalculationConvergence); - Assert.IsTrue(output.HasGeneralResult); + Assert.AreEqual(withIllustrationPoints, output.HasGeneralResult); Assert.AreSame(generalResult, output.GeneralResult); } }