Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs =================================================================== diff -u -rb28a844780b613e1901fa82328ba3917f485c729 -r0c7a5a6cfb143049b4d95758fef2d96337cf0667 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs (.../OvertoppingRateOutputTest.cs) (revision b28a844780b613e1901fa82328ba3917f485c729) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateOutputTest.cs (.../OvertoppingRateOutputTest.cs) (revision 0c7a5a6cfb143049b4d95758fef2d96337cf0667) @@ -33,12 +33,11 @@ public class OvertoppingRateOutputTest { [Test] - [TestCase(double.NaN, 0.8457, true)] - [TestCase(0.654, double.NaN, false)] + [TestCase(double.NaN, 0.8457)] + [TestCase(0.654, double.NaN)] public void Constructor_ValidInputWithGeneralResultNull_ExpectedProperties( double targetProbability, - double calculatedProbability, - bool withIllustrationPoints) + double calculatedProbability) { // Setup var random = new Random(32); @@ -47,10 +46,41 @@ double calculatedReliability = random.NextDouble(); var convergence = random.NextEnumValue(); - GeneralResult generalResult = withIllustrationPoints - ? new TestGeneralResultFaultTreeIllustrationPoint() - : null; + // Call + var output = new OvertoppingRateOutput(overtoppingRate, + targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence, + 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] + public void Constructor_ValidInputWithGeneralResult_ExpectedProperties() + { + // Setup + var random = new Random(32); + double overtoppingRate = random.NextDouble(); + double targetProbability = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedProbability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + GeneralResult generalResult = new TestGeneralResultFaultTreeIllustrationPoint(); + // Call var output = new OvertoppingRateOutput(overtoppingRate, targetProbability, @@ -68,7 +98,7 @@ Assert.AreEqual(calculatedProbability, output.CalculatedProbability); Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual(convergence, output.CalculationConvergence); - Assert.AreEqual(withIllustrationPoints, output.HasGeneralResult); + Assert.IsTrue(output.HasGeneralResult); Assert.AreSame(generalResult, output.GeneralResult); } }