Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -rb116b56a97e5a4aee668e9dda089e8a2e2d45e57 -r3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision b116b56a97e5a4aee668e9dda089e8a2e2d45e57) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c) @@ -68,7 +68,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -89,7 +89,7 @@ invalidMacroStabilityInwardsCalculation.Output = output; // Call - bool isValid = MacroStabilityInwardsCalculationService.Validate(invalidMacroStabilityInwardsCalculation, GetCalculatedTestAssessmentLevel()); + bool isValid = MacroStabilityInwardsCalculationService.Validate(invalidMacroStabilityInwardsCalculation, GetTestNormativeAssessmentLevel()); // Assert Assert.IsFalse(isValid); @@ -104,7 +104,7 @@ var isValid = true; // Call - Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(calculation, GetCalculatedTestAssessmentLevel()); + Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(calculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -131,7 +131,7 @@ calculator.LastCreatedUpliftVanCalculator.ReturnValidationError = true; // Call - Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -157,7 +157,7 @@ calculator.LastCreatedUpliftVanCalculator.ReturnValidationWarning = true; // Call - Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -184,7 +184,7 @@ calculator.LastCreatedUpliftVanCalculator.ReturnValidationError = true; // Call - Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -210,7 +210,7 @@ calculatorFactory.LastCreatedUpliftVanCalculator.ThrowExceptionOnValidate = true; // Call - Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, tuples => @@ -238,7 +238,7 @@ public void Calculate_ValidCalculation_LogStartAndEndOfValidatingInputsAndCalculation() { // Setup - RoundedDouble normativeAssessmentLevel = GetCalculatedTestAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -267,7 +267,7 @@ public void Calculate_ValidCalculationWithOutput_ShouldChangeOutput() { // Setup - RoundedDouble normativeAssessmentLevel = GetCalculatedTestAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); testCalculation.Output = output; @@ -290,7 +290,7 @@ public void Calculate_CompleteInput_SetsInputOnCalculator(bool useAssessmentLevelManualInput) { // Setup - RoundedDouble normativeAssessmentLevel = GetCalculatedTestAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); MacroStabilityInwardsInput input = testCalculation.InputParameters; input.AssessmentLevel = (RoundedDouble) 2.2; @@ -323,7 +323,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -355,7 +355,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -400,7 +400,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -436,7 +436,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -454,7 +454,7 @@ public void Calculate_CalculationRan_SetOutput() { // Setup - RoundedDouble normativeAssessmentLevel = GetCalculatedTestAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -475,7 +475,7 @@ public void Calculate_ErrorWhileCalculating_LogErrorMessageAndThrowException() { // Setup - RoundedDouble normativeAssessmentLevel = GetCalculatedTestAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -530,7 +530,7 @@ calculator.LastCreatedUpliftVanCalculator.ReturnCalculationError = true; // Call - Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -554,7 +554,7 @@ calculator.LastCreatedUpliftVanCalculator.ReturnCalculationWarning = true; // Call - Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -583,7 +583,7 @@ calculator.LastCreatedUpliftVanCalculator.ReturnCalculationError = true; // Call - Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel()); + Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -762,7 +762,7 @@ Assert.AreEqual(expectedGrid.NumberOfVerticalPoints, actualGrid.NumberOfVerticalPoints); } - private static RoundedDouble GetCalculatedTestAssessmentLevel() + private static RoundedDouble GetTestNormativeAssessmentLevel() { return (RoundedDouble) 1.1; }