Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r3b863fee27bbd11b773356a5b8548090b6c394cd -r8ce51e30daf6665658c57d67ba01a8a97f3489ad --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 3b863fee27bbd11b773356a5b8548090b6c394cd) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 8ce51e30daf6665658c57d67ba01a8a97f3489ad) @@ -54,7 +54,7 @@ { // Call TestDelegate action = () => TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(null, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, string.Empty); @@ -75,7 +75,7 @@ // Call TestDelegate action = () => TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, null); @@ -93,7 +93,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), string.Empty, validPreprocessorDirectory, string.Empty); @@ -120,7 +120,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), invalidFilePath, validPreprocessorDirectory, string.Empty); @@ -147,7 +147,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, invalidPreprocessorDirectory, string.Empty); @@ -174,7 +174,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), dbFilePath, validPreprocessorDirectory, string.Empty); @@ -202,7 +202,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, string.Empty); @@ -221,7 +221,7 @@ } [Test] - public void Validate_NormativeAssessmentLevelNaN_ReturnsFalseAndLogsValidationError() + public void Validate_AssessmentLevelNaN_ReturnsFalseAndLogsValidationError() { // Setup var isValid = false; @@ -260,7 +260,7 @@ [TestCase(1.0, double.NaN, 12.0)] public void Validate_NoWaterLevels_ReturnsFalseAndLogsValidationError(double lowerBoundaryRevetments, double upperBoundaryRevetments, - double normativeAssessmentLevel) + double assessmentLevel) { // Setup var isValid = false; @@ -278,7 +278,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - (RoundedDouble) normativeAssessmentLevel, + (RoundedDouble) assessmentLevel, validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -311,7 +311,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -344,7 +344,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -390,7 +390,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -418,7 +418,7 @@ // Call Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -453,7 +453,7 @@ c, norm, null, - GetValidNormativeAssessmentLevel(), + GetValidAssessmentLevel(), hcldFilePath, string.Empty); @@ -914,7 +914,7 @@ c); } - private static RoundedDouble GetValidNormativeAssessmentLevel() + private static RoundedDouble GetValidAssessmentLevel() { return (RoundedDouble) 12; } @@ -924,13 +924,13 @@ public IEnumerable Outputs; public static bool PublicValidateWaveConditionsInput(WaveConditionsInput waveConditionsInput, - RoundedDouble normativeAssessmentLevel, + RoundedDouble assessmentLevel, string dbFilePath, string preprocessorDirectory, string valueName) { return ValidateWaveConditionsInput(waveConditionsInput, - normativeAssessmentLevel, + assessmentLevel, dbFilePath, preprocessorDirectory, valueName); @@ -941,12 +941,12 @@ RoundedDouble c, double norm, WaveConditionsInput input, - RoundedDouble normativeAssessmentLevel, + RoundedDouble assessmentLevel, string dbFilePath, string preprocessorDirectory) { Outputs = CalculateWaveConditions(input, - normativeAssessmentLevel, + assessmentLevel, a, b, c,