Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r6cd47071c8dbb10eb401925acbb067c4be9266d9 -rb116b56a97e5a4aee668e9dda089e8a2e2d45e57 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 6cd47071c8dbb10eb401925acbb067c4be9266d9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision b116b56a97e5a4aee668e9dda089e8a2e2d45e57) @@ -285,17 +285,28 @@ } } - [Test] - public void Calculate_CompleteInput_SetsInputOnCalculator() + [TestCase(true)] + [TestCase(false)] + public void Calculate_CompleteInput_SetsInputOnCalculator(bool useAssessmentLevelManualInput) { // Setup + RoundedDouble normativeAssessmentLevel = GetCalculatedTestAssessmentLevel(); + MacroStabilityInwardsInput input = testCalculation.InputParameters; + + input.AssessmentLevel = (RoundedDouble) 2.2; + + input.UseAssessmentLevelManualInput = useAssessmentLevelManualInput; using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + MacroStabilityInwardsCalculationService.Calculate(testCalculation, normativeAssessmentLevel); // Assert - AssertInput(testCalculation.InputParameters, (TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance); + RoundedDouble expectedAssessmentLevel = useAssessmentLevelManualInput + ? testCalculation.InputParameters.AssessmentLevel + : normativeAssessmentLevel; + + AssertInput(testCalculation.InputParameters, (TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance, expectedAssessmentLevel); } } @@ -591,7 +602,7 @@ } } - private static void AssertInput(MacroStabilityInwardsInput originalInput, TestMacroStabilityInwardsCalculatorFactory factory) + private static void AssertInput(MacroStabilityInwardsInput originalInput, TestMacroStabilityInwardsCalculatorFactory factory, RoundedDouble expectedAssessmentLevel) { UpliftVanCalculatorInput actualInput = factory.LastCreatedUpliftVanCalculator.Input; CalculatorInputAssert.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile); @@ -604,7 +615,7 @@ Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod); Assert.AreEqual(LandwardDirection.PositiveX, actualInput.LandwardDirection); Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine); - Assert.AreEqual(originalInput.AssessmentLevel, actualInput.AssessmentLevel); + Assert.AreEqual(expectedAssessmentLevel, actualInput.AssessmentLevel); Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario); Assert.AreEqual(originalInput.WaterLevelRiverAverage, actualInput.WaterLevelRiverAverage); Assert.AreEqual(originalInput.LocationInputExtreme.WaterLevelPolder, actualInput.WaterLevelPolderExtreme);