Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs =================================================================== diff -u -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d -r2594768e09254bb5188002e2756af87e58bdda53 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision 2594768e09254bb5188002e2756af87e58bdda53) @@ -25,6 +25,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Data.Test @@ -41,7 +42,9 @@ // Assert Assert.IsInstanceOf(scenario); Assert.IsInstanceOf(scenario); + Assert.IsTrue(scenario.IsRelevant); + Assert.AreEqual(4, scenario.Contribution.NumberOfDecimalPlaces); Assert.AreEqual((RoundedDouble) 1.0, scenario.Contribution); Assert.AreEqual(CalculationScenarioStatus.NotCalculated, scenario.Status); } @@ -62,19 +65,20 @@ } [Test] - [TestCase(1)] - [TestCase(15.0)] - public void Contribution_Always_ReturnsSetValue(double newValue) + public void Contribution_Always_ReturnsSetValue() { // Setup + var random = new Random(21); + RoundedDouble roundedDouble = random.NextRoundedDouble(); + var scenario = new MacroStabilityInwardsCalculationScenario(); - var roundedDouble = (RoundedDouble) newValue; // Call scenario.Contribution = roundedDouble; // Assert - Assert.AreEqual(roundedDouble, scenario.Contribution); + Assert.AreEqual(4, scenario.Contribution.NumberOfDecimalPlaces); + Assert.AreEqual(roundedDouble, scenario.Contribution, scenario.Contribution.GetAccuracy()); } [Test] @@ -147,7 +151,9 @@ IsRelevant = random.NextBoolean(), Contribution = random.NextRoundedDouble() }; + MacroStabilityInwardsTestDataGenerator.SetRandomMacroStabilityInwardsInput(calculation.InputParameters); + return calculation; } }