Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rbb7d45597fde9aa9066da6454e833aebbea32908 -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision bb7d45597fde9aa9066da6454e833aebbea32908) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -20,11 +20,11 @@ // All rights reserved. using System.ComponentModel; -using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; @@ -68,7 +68,9 @@ new GrassCoverErosionOutwardsFailureMechanism()); // Call - var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler); + var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, + AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + handler); // Assert Assert.IsInstanceOf>(properties); @@ -87,7 +89,9 @@ new GrassCoverErosionOutwardsFailureMechanism()); // Call - var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler); + var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, + AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + handler); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -109,10 +113,5 @@ Assert.AreEqual("Bovengrens op basis van waterstand bij doorsnede-eis [m+NAP]", upperBoundaryDesignWaterLevelProperty.DisplayName); Assert.AreEqual("Bovengrens bepaald aan de hand van de waarde van de waterstand bij doorsnede-eis op de geselecteerde hydraulische locatie.", upperBoundaryDesignWaterLevelProperty.Description); } - - private static RoundedDouble GetTestNormativeAssessmentLevel() - { - return (RoundedDouble) 1.1; - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -70,7 +70,7 @@ { // Call TestDelegate test = () => GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(null, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -96,7 +96,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), testFilePath, validPreprocessorDirectory); @@ -132,7 +132,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), invalidFilePath, validPreprocessorDirectory); @@ -168,7 +168,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, invalidPreprocessorDirectory); @@ -204,7 +204,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), testFilePath, validPreprocessorDirectory); @@ -240,7 +240,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -314,7 +314,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -355,7 +355,7 @@ { // Call Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -1102,7 +1102,7 @@ return calculation; } - private static RoundedDouble GetTestNormativeAssessmentLevel() + private static RoundedDouble GetValidNormativeAssessmentLevel() { return (RoundedDouble) 9.3; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; -using Core.Common.Base.Data; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using Core.Components.Chart.Data; @@ -117,7 +116,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -143,7 +143,8 @@ // Setup var calculationToRemove = new TestWaveConditionsCalculation(); - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculationToRemove }) @@ -167,7 +168,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -195,7 +197,8 @@ null, new GrassCoverErosionOutwardsFailureMechanism(), new AssessmentSection(AssessmentSectionComposition.Dike)); - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -219,7 +222,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -243,7 +247,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -270,7 +275,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -294,7 +300,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -317,7 +324,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -340,7 +348,8 @@ ICalculation calculation) { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = new TestWaveConditionsCalculation() }) @@ -373,7 +382,8 @@ } }); - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -410,7 +420,8 @@ null, new GrassCoverErosionOutwardsFailureMechanism(), new AssessmentSection(AssessmentSectionComposition.Dike)); - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -463,11 +474,6 @@ Assert.AreEqual(assessmentLevel, designWaterLevelChartData.Points.First().Y); } - private static RoundedDouble GetTestNormativeAssessmentLevel() - { - return (RoundedDouble) 1.1; - } - #region TestCaseData private const int lowerBoundaryRevetmentChartDataIndex = 1; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs =================================================================== diff -u -re444a84b4fbf8411cd3237eb2e836df68790652b -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -790,7 +790,7 @@ var input = new WaveConditionsInput(); // Call - IEnumerable points = WaveConditionsChartDataPointsFactory.CreateDesignWaterLevelGeometryPoints(input, GetTestNormativeAssessmentLevel()); + IEnumerable points = WaveConditionsChartDataPointsFactory.CreateDesignWaterLevelGeometryPoints(input, GetValidNormativeAssessmentLevel()); // Assert var expectedPoints = new[] @@ -816,7 +816,7 @@ }; // Call - IEnumerable points = WaveConditionsChartDataPointsFactory.CreateDesignWaterLevelGeometryPoints(input, GetTestNormativeAssessmentLevel()); + IEnumerable points = WaveConditionsChartDataPointsFactory.CreateDesignWaterLevelGeometryPoints(input, GetValidNormativeAssessmentLevel()); // Assert var expectedPoints = new[] @@ -836,7 +836,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = GetValidNormativeAssessmentLevel(); var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry) @@ -921,7 +921,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - var normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); + var normativeAssessmentLevel = GetValidNormativeAssessmentLevel(); var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry), @@ -1009,7 +1009,7 @@ }).SetName(string.Format(testNameFormat, "ForeshoreProfilePositiveCoordinates")); } - private static RoundedDouble GetTestNormativeAssessmentLevel() + private static RoundedDouble GetValidNormativeAssessmentLevel() { return (RoundedDouble) 6; } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r19b12b646711dbaefd9ba10a4a4fbf2be05c8b13 -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 19b12b646711dbaefd9ba10a4a4fbf2be05c8b13) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -81,7 +81,8 @@ public void Constructor_InputViewStyleNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => new WaveConditionsInputView(null, GetTestNormativeAssessmentLevel); + TestDelegate test = () => new WaveConditionsInputView(null, + AssessmentSectionHelper.GetTestNormativeAssessmentLevel); // Assert var exception = Assert.Throws(test); @@ -103,7 +104,8 @@ public void Constructor_ExpectedValues() { // Call - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) { // Assert Assert.IsInstanceOf(view); @@ -118,7 +120,8 @@ public void Constructor_Always_AddEmptyChartControl() { // Call - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) { // Assert var chartControl = (IChartControl) view.Controls.Find("chartControl", true).First(); @@ -134,7 +137,8 @@ public void Data_IWaveConditionsCalculation_DataSet() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) { var calculation = new TestWaveConditionsCalculation(); @@ -150,7 +154,8 @@ public void Data_OtherThanWaveConditionsCalculation_DataNull() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) { var calculation = new object(); @@ -166,7 +171,8 @@ public void Data_SetToNull_ChartDataCleared() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = new TestWaveConditionsCalculation() }) @@ -257,7 +263,8 @@ public void UpdateObserver_CalculationNameUpdated_ChartTitleUpdated() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) { const string initialName = "Initial name"; const string updatedName = "Updated name"; @@ -286,7 +293,8 @@ public void UpdateObserver_PreviousCalculationNameUpdated_ChartTitleNotUpdated() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) { const string initialName = "Initial name"; const string updatedName = "Updated name"; @@ -431,7 +439,8 @@ var calculation = new TestWaveConditionsCalculation(); - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), + AssessmentSectionHelper.GetTestNormativeAssessmentLevel) { Data = calculation }) @@ -636,10 +645,5 @@ { return ((pointY - lastForeshorePoint.Y) / 3) + lastForeshorePoint.X; } - - private static RoundedDouble GetTestNormativeAssessmentLevel() - { - return (RoundedDouble) 1.1; - } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r20b1e5f41a3c869ba74bd54ddbda31f94957550e -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 20b1e5f41a3c869ba74bd54ddbda31f94957550e) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -54,7 +54,7 @@ { // Call TestDelegate action = () => new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(null, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, string.Empty); @@ -75,7 +75,7 @@ // Call TestDelegate action = () => new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, null); @@ -93,7 +93,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new WaveConditionsInput(), - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), string.Empty, validPreprocessorDirectory, string.Empty); @@ -120,7 +120,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new WaveConditionsInput(), - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), invalidFilePath, validPreprocessorDirectory, string.Empty); @@ -147,7 +147,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new WaveConditionsInput(), - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, invalidPreprocessorDirectory, string.Empty); @@ -174,7 +174,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new WaveConditionsInput(), - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), dbFilePath, validPreprocessorDirectory, string.Empty); @@ -202,7 +202,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, string.Empty); @@ -311,7 +311,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -344,7 +344,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -390,7 +390,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -418,7 +418,7 @@ // Call Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory, "DesignWaterLevelName"); @@ -453,7 +453,7 @@ c, norm, null, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), hcldFilePath, string.Empty); @@ -914,7 +914,7 @@ c); } - private static RoundedDouble GetTestNormativeAssessmentLevel() + private static RoundedDouble GetValidNormativeAssessmentLevel() { return (RoundedDouble) 12; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -68,7 +68,7 @@ { // Call TestDelegate test = () => StabilityStoneCoverWaveConditionsCalculationService.Validate(null, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -94,7 +94,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), testFilePath, validPreprocessorDirectory); @@ -130,7 +130,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), invalidFilePath, validPreprocessorDirectory); @@ -166,7 +166,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, invalidPreprocessorDirectory); @@ -202,7 +202,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), testFilePath, validPreprocessorDirectory); @@ -237,7 +237,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -311,7 +311,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -352,7 +352,7 @@ { // Call Action call = () => isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -1233,7 +1233,7 @@ return calculation; } - private static RoundedDouble GetTestNormativeAssessmentLevel() + private static RoundedDouble GetValidNormativeAssessmentLevel() { return (RoundedDouble) 9.3; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -r173e8ea872d4b79f77fd309347d3e66bf158dc6f --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 173e8ea872d4b79f77fd309347d3e66bf158dc6f) @@ -68,7 +68,7 @@ { // Call TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(null, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -94,7 +94,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), testFilePath, validPreprocessorDirectory); @@ -130,7 +130,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), invalidFilePath, validPreprocessorDirectory); @@ -166,7 +166,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, invalidPreprocessorDirectory); @@ -202,7 +202,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), testFilePath, validPreprocessorDirectory); @@ -237,7 +237,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -311,7 +311,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -352,7 +352,7 @@ { // Call Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, - GetTestNormativeAssessmentLevel(), + GetValidNormativeAssessmentLevel(), validFilePath, validPreprocessorDirectory); @@ -1045,7 +1045,7 @@ return calculation; } - private static RoundedDouble GetTestNormativeAssessmentLevel() + private static RoundedDouble GetValidNormativeAssessmentLevel() { return (RoundedDouble) 9.3; }