Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs =================================================================== diff -u -raacb07cede4cf74a24528a1d466ac03e1d69f284 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision aacb07cede4cf74a24528a1d466ac03e1d69f284) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -147,7 +147,7 @@ public void GetTestNormativeAssessmentLevel_Always_ReturnsTheSameRandomValue() { // Call & Assert - Assert.AreEqual(AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + Assert.AreEqual(AssessmentSectionHelper.GetTestAssessmentLevel(), AssessmentSectionHelper.GetTestAssessmentLevel()); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs =================================================================== diff -u -raacb07cede4cf74a24528a1d466ac03e1d69f284 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs (.../AssessmentSectionHelper.cs) (revision aacb07cede4cf74a24528a1d466ac03e1d69f284) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs (.../AssessmentSectionHelper.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using Core.Common.Base.Data; @@ -39,7 +38,7 @@ /// public static class AssessmentSectionHelper { - private static readonly RoundedDouble testNormativeAssessmentLevel = new Random(21).NextRoundedDouble(); + private static readonly RoundedDouble testAssessmentLevel = new Random(21).NextRoundedDouble(); /// /// Creates a stub of with a that is not linked. @@ -85,13 +84,13 @@ } /// - /// Gets a random normative assessment level for testing purposes. + /// Gets a random assessment level for testing purposes. /// - /// The normative assessment level. + /// The assessment level. /// The returned assessment level is random, though always the same. - public static RoundedDouble GetTestNormativeAssessmentLevel() + public static RoundedDouble GetTestAssessmentLevel() { - return testNormativeAssessmentLevel; + return testAssessmentLevel; } /// Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r894385e96604672cd8a88801e34dd8040ef0366f -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 894385e96604672cd8a88801e34dd8040ef0366f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -68,7 +68,7 @@ // Call var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -90,7 +90,7 @@ // Call var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -79,7 +79,7 @@ // Call TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -136,7 +136,7 @@ // Call TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, null); // Assert @@ -165,7 +165,7 @@ // Call var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -197,7 +197,7 @@ // Call var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = false @@ -342,7 +342,7 @@ // Call var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = useManualAssessmentLevelInput @@ -443,13 +443,13 @@ // Call var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert RoundedDouble expectedAssessmentLevel = useManualAssessmentLevelInput ? inputParameters.AssessmentLevel - : AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + : AssessmentSectionHelper.GetTestAssessmentLevel(); Assert.AreEqual(expectedAssessmentLevel, properties.AssessmentLevel); Assert.AreSame(hydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation); Assert.AreEqual(inputParameters.UseAssessmentLevelManualInput, properties.UseAssessmentLevelManualInput); @@ -504,7 +504,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var random = new Random(21); @@ -681,7 +681,7 @@ var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D(); @@ -737,7 +737,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -793,7 +793,7 @@ var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -860,7 +860,7 @@ }); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -886,7 +886,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -912,7 +912,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition: @@ -984,7 +984,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition: @@ -1017,7 +1017,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition @@ -1058,7 +1058,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition @@ -1087,7 +1087,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null; @@ -1139,7 +1139,7 @@ failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // When @@ -1183,7 +1183,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1237,7 +1237,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1304,7 +1304,7 @@ }); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); IEnumerable originalList = properties.GetSelectableHydraulicBoundaryLocations() @@ -1356,7 +1356,7 @@ failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1385,7 +1385,7 @@ failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1423,7 +1423,7 @@ failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1452,7 +1452,7 @@ failureMechanism, assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1490,7 +1490,7 @@ }); var properties = new MacroStabilityInwardsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -44,7 +44,7 @@ { // Call TestDelegate test = () => new MacroStabilityInwardsWaterStressLinesProperties(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert var exception = Assert.Throws(test); @@ -59,7 +59,7 @@ // Call var properties = new MacroStabilityInwardsWaterStressLinesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert Assert.IsInstanceOf>(properties); @@ -99,7 +99,7 @@ MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var properties = new MacroStabilityInwardsWaterStressLinesProperties(calculation.InputParameters, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -119,7 +119,7 @@ // Setup var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties()); var properties = new MacroStabilityInwardsWaterStressLinesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Call string name = properties.ToString(); @@ -136,7 +136,7 @@ // Call var properties = new MacroStabilityInwardsWaterStressLinesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -71,7 +71,7 @@ // Call var properties = new MacroStabilityInwardsWaterStressesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), propertyChangeHandler); // Assert @@ -100,7 +100,7 @@ // Call TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), propertyChangeHandler); // Assert @@ -117,7 +117,7 @@ // Call TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), null); // Assert @@ -137,7 +137,7 @@ // Call var properties = new MacroStabilityInwardsWaterStressesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), propertyChangeHandler); // Assert @@ -306,7 +306,7 @@ var propertyChangeHandler = new ObservablePropertyChangeHandler(calculationItem, input); var properties = new MacroStabilityInwardsWaterStressesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), propertyChangeHandler); var random = new Random(21); @@ -465,7 +465,7 @@ var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties()); var properties = new MacroStabilityInwardsWaterStressesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), propertyChangeHandler); // Call @@ -492,7 +492,7 @@ }); var properties = new MacroStabilityInwardsWaterStressesProperties(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel(), + AssessmentSectionHelper.GetTestAssessmentLevel(), propertyChangeHandler); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -73,7 +73,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor(); @@ -144,7 +144,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -74,7 +74,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor(); @@ -145,7 +145,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -71,7 +71,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new MacroStabilityInwardsInputContextSurfaceLineSelectionEditor(); @@ -128,7 +128,7 @@ assessmentSection); var properties = new MacroStabilityInwardsInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new MacroStabilityInwardsInputContextSurfaceLineSelectionEditor(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -71,7 +71,7 @@ { // Call TestDelegate test = () => new MacroStabilityInwardsInputView(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel); + AssessmentSectionHelper.GetTestAssessmentLevel); // Assert string paramName = Assert.Throws(test).ParamName; @@ -97,7 +97,7 @@ // Call using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert Assert.IsInstanceOf(view); @@ -126,7 +126,7 @@ // Call using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert MacroStabilityInwardsInputViewChartDataAssert.AssertEmptyChartData(view.Chart.Data); @@ -141,7 +141,7 @@ // Call using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert CollectionAssert.IsEmpty(GetSoilLayerTable(view).Rows); @@ -166,7 +166,7 @@ // Call using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert MacroStabilityInwardsInputViewChartDataAssert.AssertEmptyWaternetChartData(view.Chart.Data); @@ -192,7 +192,7 @@ // Call using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert ChartData[] chartData = view.Chart.Data.Collection.ToArray(); @@ -224,7 +224,7 @@ // Call using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert ChartDataCollection chartData = view.Chart.Data; @@ -264,7 +264,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); @@ -297,7 +297,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { List chartDataList = view.Chart.Data.Collection.ToList(); var surfaceLineChartData = (ChartLineData) chartDataList[surfaceLineIndex]; @@ -343,7 +343,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { List chartDataList = view.Chart.Data.Collection.ToList(); var surfaceLineChartData = (ChartDataCollection) chartDataList[soilProfileIndex]; @@ -397,7 +397,7 @@ var calculation = new MacroStabilityInwardsCalculationScenario(); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = view.Chart.Data; @@ -505,7 +505,7 @@ var calculation = new MacroStabilityInwardsCalculationScenario(); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = view.Chart.Data; List chartDataList = chartData.Collection.ToList(); @@ -543,7 +543,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = view.Chart.Data; List chartDataList = chartData.Collection.ToList(); @@ -605,7 +605,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { MacroStabilityInwardsSoilLayerDataTable soilLayerDataTable = GetSoilLayerTable(view); @@ -642,7 +642,7 @@ SetGridValues(input.RightGrid); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition ChartDataCollection chartData = view.Chart.Data; @@ -690,7 +690,7 @@ MacroStabilityInwardsInput input = calculation.InputParameters; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition ChartDataCollection chartData = view.Chart.Data; @@ -737,7 +737,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = view.Chart.Data; @@ -780,7 +780,7 @@ var macroStabilityInwardsCalculatorFactoryConfig = new MacroStabilityInwardsCalculatorFactoryConfig(); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition ChartData[] chartData = view.Chart.Data.Collection.ToArray(); @@ -816,7 +816,7 @@ }; using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition MacroStabilityInwardsInputViewChartDataAssert.AssertEmptyWaternetChartData(view.Chart.Data); @@ -854,7 +854,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition ChartData[] chartData = view.Chart.Data.Collection.ToArray(); @@ -896,7 +896,7 @@ // Call using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert MacroStabilityInwardsInputViewChartDataAssert.AssertChartData(calculation, view.Chart.Data); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -53,7 +53,7 @@ { // Call TestDelegate test = () => new MacroStabilityInwardsOutputChartControl(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel); + AssessmentSectionHelper.GetTestAssessmentLevel); // Assert string paramName = Assert.Throws(test).ParamName; @@ -79,7 +79,7 @@ // Call var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel); + AssessmentSectionHelper.GetTestAssessmentLevel); // Assert Assert.IsInstanceOf(control); @@ -115,7 +115,7 @@ // Call using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert IChartControl chartControl = GetChartControl(control); @@ -143,7 +143,7 @@ // Call using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert IChartControl chartControl = GetChartControl(control); @@ -175,7 +175,7 @@ // Call using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert IChartControl chartControl = GetChartControl(control); @@ -205,7 +205,7 @@ // Call using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert IChartControl chartControl = GetChartControl(control); @@ -234,7 +234,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = GetChartControl(control).Data; @@ -272,7 +272,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = GetChartControl(control).Data; @@ -310,7 +310,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = GetChartControl(control).Data; @@ -338,7 +338,7 @@ var calculation = new MacroStabilityInwardsCalculationScenario(); using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { IChartControl chartControl = GetChartControl(control); @@ -372,7 +372,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = GetChartControl(control).Data; @@ -408,7 +408,7 @@ using (var macroStabilityInwardsCalculatorFactoryConfig = new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, GetChartControl(control).Data); @@ -440,7 +440,7 @@ }; using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { ChartDataCollection chartData = GetChartControl(control).Data; @@ -476,7 +476,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var control = new MacroStabilityInwardsOutputChartControl(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Precondition ChartData[] chartData = GetChartControl(control).Data.Collection.ToArray(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -47,7 +47,7 @@ { // Call TestDelegate test = () => new MacroStabilityInwardsOutputView(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel); + AssessmentSectionHelper.GetTestAssessmentLevel); // Assert string paramName = Assert.Throws(test).ParamName; @@ -73,7 +73,7 @@ // Call using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert Assert.IsInstanceOf(view); @@ -102,7 +102,7 @@ // Call using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) using (var form = new Form()) { form.Controls.Add(view); @@ -135,7 +135,7 @@ using (var form = new Form()) using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { form.Controls.Add(view); form.Show(); @@ -174,7 +174,7 @@ using (var form = new Form()) using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { form.Controls.Add(view); form.Show(); @@ -214,7 +214,7 @@ using (var form = new Form()) using (new MacroStabilityInwardsCalculatorFactoryConfig()) using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { form.Controls.Add(view); form.Show(); @@ -254,7 +254,7 @@ using (var form = new Form()) using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { form.Controls.Add(view); form.Show(); @@ -288,7 +288,7 @@ }; using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { MacroStabilityInwardsSlicesTable slicesTable = GetSlicesTable(view); @@ -314,7 +314,7 @@ }; using (var view = new MacroStabilityInwardsOutputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { MacroStabilityInwardsSlicesTable slicesTable = GetSlicesTable(view); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -139,7 +139,7 @@ assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, calculationScenarioContext); @@ -168,7 +168,7 @@ assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, calculationScenarioContext); @@ -198,7 +198,7 @@ assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, calculationGroupContext); @@ -228,7 +228,7 @@ assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, calculationGroupContext); @@ -260,7 +260,7 @@ assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, calculationGroupContext); @@ -292,7 +292,7 @@ assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, calculationGroupContext); @@ -317,7 +317,7 @@ var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, failureMechanismContext); @@ -342,7 +342,7 @@ var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(new MacroStabilityInwardsFailureMechanism(), assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, failureMechanismContext); @@ -370,7 +370,7 @@ var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, failureMechanismContext); @@ -398,7 +398,7 @@ var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(new MacroStabilityInwardsFailureMechanism(), assessmentSection); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, failureMechanismContext); @@ -418,7 +418,7 @@ failureMechanism.CalculationsGroup.Children.Add(calculation); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -437,7 +437,7 @@ failureMechanism.CalculationsGroup.Children.Add(calculation); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, new MacroStabilityInwardsFailureMechanism()); @@ -459,7 +459,7 @@ failureMechanism.CalculationsGroup.Children.Add(calculationGroup); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -481,7 +481,7 @@ failureMechanism.CalculationsGroup.Children.Add(calculationGroup); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, new MacroStabilityInwardsFailureMechanism()); @@ -508,7 +508,7 @@ mocks.ReplayAll(); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -536,7 +536,7 @@ mocks.ReplayAll(); using (var view = new MacroStabilityInwardsInputView(new MacroStabilityInwardsCalculationScenario(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -567,7 +567,7 @@ mocks.ReplayAll(); using (var view = new MacroStabilityInwardsInputView(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -598,7 +598,7 @@ mocks.ReplayAll(); using (var view = new MacroStabilityInwardsInputView(new MacroStabilityInwardsCalculationScenario(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Call bool closeForData = info.CloseForData(view, assessmentSection); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -76,7 +76,7 @@ invalidMacroStabilityInwardsCalculation.Output = originalOutput; var activity = new MacroStabilityInwardsCalculationActivity(invalidMacroStabilityInwardsCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Call Action call = () => activity.Run(); @@ -109,7 +109,7 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); activity.Run(); // Call @@ -145,7 +145,7 @@ validMacroStabilityInwardsCalculation.Attach(observer); var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); activity.Run(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -70,7 +70,7 @@ { // Call Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -92,7 +92,7 @@ // Call bool isValid = MacroStabilityInwardsCalculationService.Validate(invalidMacroStabilityInwardsCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert Assert.IsFalse(isValid); @@ -108,7 +108,7 @@ // Call Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -136,7 +136,7 @@ // Call Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -163,7 +163,7 @@ // Call Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -191,7 +191,7 @@ // Call Action call = () => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -218,7 +218,7 @@ // Call Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, tuples => @@ -246,7 +246,7 @@ public void Calculate_ValidCalculation_LogStartAndEndOfValidatingInputsAndCalculation() { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -275,7 +275,7 @@ public void Calculate_ValidCalculationWithOutput_ShouldChangeOutput() { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); testCalculation.Output = output; @@ -307,7 +307,7 @@ { // Call MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -340,7 +340,7 @@ { // Call MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -386,7 +386,7 @@ { // Call MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -423,7 +423,7 @@ { // Call MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance) @@ -441,7 +441,7 @@ public void Calculate_CalculationRan_SetOutput() { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -462,7 +462,7 @@ public void Calculate_ErrorWhileCalculating_LogErrorMessageAndThrowException() { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -518,7 +518,7 @@ // Call Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -543,7 +543,7 @@ // Call Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -573,7 +573,7 @@ // Call Action call = () => MacroStabilityInwardsCalculationService.Calculate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -597,7 +597,7 @@ public void Calculate_CompleteInput_SetsInputOnCalculator(bool useAssessmentLevelManualInput) { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); MacroStabilityInwardsInput input = testCalculation.InputParameters; input.AssessmentLevel = (RoundedDouble) 2.2; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs =================================================================== diff -u -rc22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs (.../MacroStabilityInwardsInputValidatorTest.cs) (revision c22b1f3b27e7a10c0f75bd8c7ee3d99a13ba8bc6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs (.../MacroStabilityInwardsInputValidatorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -60,7 +60,7 @@ { // Call string[] messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -74,7 +74,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -113,7 +113,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -130,7 +130,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -147,7 +147,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -198,7 +198,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -250,7 +250,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -276,7 +276,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -340,7 +340,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -398,7 +398,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -457,7 +457,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -532,7 +532,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -560,7 +560,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -634,7 +634,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -699,7 +699,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -714,7 +714,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -735,7 +735,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -760,7 +760,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -777,7 +777,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.AreEqual(new[] @@ -797,7 +797,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); @@ -813,7 +813,7 @@ // Call IEnumerable messages = MacroStabilityInwardsInputValidator.Validate(input, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()).ToArray(); + AssessmentSectionHelper.GetTestAssessmentLevel()).ToArray(); // Assert CollectionAssert.IsEmpty(messages); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -81,7 +81,7 @@ // Call TestDelegate test = () => new PipingInputContextProperties(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -138,7 +138,7 @@ // Call TestDelegate test = () => new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, null); // Assert @@ -167,7 +167,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -236,7 +236,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = false @@ -419,7 +419,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -470,7 +470,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = useManualAssessmentLevelInput @@ -570,7 +570,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -609,7 +609,7 @@ RoundedDouble expectedAssessmentLevel = useManualAssessmentLevelInput ? inputParameters.AssessmentLevel - : AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + : AssessmentSectionHelper.GetTestAssessmentLevel(); Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(inputParameters, expectedAssessmentLevel), properties.PiezometricHeadExit); @@ -651,7 +651,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); const double assessmentLevel = 0.36; @@ -867,7 +867,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler) { ExitPointL = (RoundedDouble) exitPoint, @@ -911,7 +911,7 @@ // Call var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler) { EntryPointL = (RoundedDouble) 0.5, @@ -961,7 +961,7 @@ }); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1010,7 +1010,7 @@ }); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1059,7 +1059,7 @@ }); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1106,7 +1106,7 @@ }); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1149,7 +1149,7 @@ var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); inputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); @@ -1203,7 +1203,7 @@ assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1256,7 +1256,7 @@ var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1283,7 +1283,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1309,7 +1309,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition: @@ -1378,7 +1378,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition: @@ -1411,7 +1411,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition @@ -1451,7 +1451,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Precondition @@ -1480,7 +1480,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null; @@ -1532,7 +1532,7 @@ failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // When @@ -1576,7 +1576,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1630,7 +1630,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1697,7 +1697,7 @@ }); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); IEnumerable originalList = properties.GetSelectableHydraulicBoundaryLocations() @@ -1749,7 +1749,7 @@ failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1778,7 +1778,7 @@ failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1816,7 +1816,7 @@ failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1845,7 +1845,7 @@ failureMechanism, assessmentSection); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -1883,7 +1883,7 @@ }); var properties = new PipingInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -73,7 +73,7 @@ assessmentSection); var properties = new PipingInputContextProperties(pipingInputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); @@ -143,7 +143,7 @@ assessmentSection); var properties = new PipingInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -73,7 +73,7 @@ assessmentSection); var properties = new PipingInputContextProperties(pipingInputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); @@ -143,7 +143,7 @@ assessmentSection); var properties = new PipingInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -71,7 +71,7 @@ assessmentSection); var properties = new PipingInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new PipingInputContextSurfaceLineSelectionEditor(); @@ -128,7 +128,7 @@ assessmentSection); var properties = new PipingInputContextProperties(inputParametersContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); var editor = new PipingInputContextSurfaceLineSelectionEditor(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -77,7 +77,7 @@ invalidPipingCalculation.Output = originalOutput; var activity = new PipingCalculationActivity(invalidPipingCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Call Action call = () => activity.Run(); @@ -110,7 +110,7 @@ validPipingCalculation.Output = null; var activity = new PipingCalculationActivity(validPipingCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); activity.Run(); // Call @@ -145,7 +145,7 @@ validPipingCalculation.Attach(observer); var activity = new PipingCalculationActivity(validPipingCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); activity.Run(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 8c29cd869cbdd8e61e86dc49ad27bb23dc4813bf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -68,7 +68,7 @@ { // Call Action call = () => PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -89,7 +89,7 @@ // Call bool isValid = PipingCalculationService.Validate(invalidPipingCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert Assert.IsFalse(isValid); @@ -105,7 +105,7 @@ // Call var isValid = false; Action call = () => isValid = PipingCalculationService.Validate(calculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -159,7 +159,7 @@ // Call var isValid = false; Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -183,7 +183,7 @@ // Call var isValid = false; Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -206,7 +206,7 @@ // Call var isValid = false; Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -231,7 +231,7 @@ // Call var isValid = false; Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -262,7 +262,7 @@ // Call var isValid = false; Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -287,7 +287,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -343,7 +343,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -378,7 +378,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -426,7 +426,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -477,7 +477,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -551,7 +551,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -617,7 +617,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -676,7 +676,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -742,7 +742,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -812,7 +812,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -868,7 +868,7 @@ // Call Action call = () => isValid = PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -936,7 +936,7 @@ // Call Action call = () => PipingCalculationService.Validate(testCalculation, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel()); + AssessmentSectionHelper.GetTestAssessmentLevel()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -967,7 +967,7 @@ public void Calculate_ValidPipingCalculation_LogStartAndEndOfValidatingInputsAndCalculation() { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); Action call = () => { @@ -993,7 +993,7 @@ public void Calculate_ValidPipingCalculationNoOutput_ShouldSetOutput() { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); // Precondition Assert.IsNull(testCalculation.Output); @@ -1019,7 +1019,7 @@ { // Setup PipingOutput output = PipingOutputTestFactory.Create(); - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); testCalculation.Output = output; @@ -1038,7 +1038,7 @@ public void Validate_CompleteInput_InputSetOnSubCalculators(bool useAssessmentLevelManualInput) { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); PipingInput input = testCalculation.InputParameters; input.AssessmentLevel = (RoundedDouble) 2.2; @@ -1063,7 +1063,7 @@ public void Calculate_CompleteInput_InputSetOnSubCalculators(bool useAssessmentLevelManualInput) { // Setup - RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestNormativeAssessmentLevel(); + RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel(); PipingInput input = testCalculation.InputParameters; input.UseAssessmentLevelManualInput = useAssessmentLevelManualInput; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -reea256188484122c8e96ab87e90a2c410caf60c9 -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision eea256188484122c8e96ab87e90a2c410caf60c9) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -78,7 +78,7 @@ // Call TestDelegate test = () => new TestWaveConditionsInputContextProperties(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -122,7 +122,7 @@ // Call TestDelegate test = () => new TestWaveConditionsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, null); // Assert @@ -239,7 +239,7 @@ // Call var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Assert @@ -507,7 +507,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null; @@ -544,7 +544,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -588,7 +588,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -632,7 +632,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // When @@ -670,7 +670,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -713,7 +713,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -756,7 +756,7 @@ var otherProfile = new TestForeshoreProfile(new Point2D(0, 190)); var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty()); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, customHandler); IEnumerable originalList = properties.GetSelectableHydraulicBoundaryLocations() @@ -798,7 +798,7 @@ var inputContext = new TestWaveConditionsInputContext(input, foreshoreProfiles, assessmentSection); var properties = new TestWaveConditionsInputContextProperties(inputContext, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, handler); // Call @@ -835,7 +835,7 @@ }); var properties = new TestWaveConditionsInputContextProperties(context, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel, + AssessmentSectionHelper.GetTestAssessmentLevel, customHandler); // Call Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r8ce51e30daf6665658c57d67ba01a8a97f3489ad -r1b61e079b5ce825f3966ecac688d65e9ff567237 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 8ce51e30daf6665658c57d67ba01a8a97f3489ad) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) @@ -82,7 +82,7 @@ { // Call TestDelegate test = () => new WaveConditionsInputView(null, - AssessmentSectionHelper.GetTestNormativeAssessmentLevel); + AssessmentSectionHelper.GetTestAssessmentLevel); // Assert var exception = Assert.Throws(test); @@ -105,7 +105,7 @@ { // Call using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert Assert.IsInstanceOf(view); @@ -121,7 +121,7 @@ { // Call using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { // Assert var chartControl = (IChartControl) view.Controls.Find("chartControl", true).First(); @@ -138,7 +138,7 @@ { // Setup using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()); @@ -155,7 +155,7 @@ { // Setup using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { var calculation = new object(); @@ -172,7 +172,7 @@ { // Setup using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel) + AssessmentSectionHelper.GetTestAssessmentLevel) { Data = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) }) @@ -264,7 +264,7 @@ { // Setup using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { const string initialName = "Initial name"; const string updatedName = "Updated name"; @@ -294,7 +294,7 @@ { // Setup using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel)) + AssessmentSectionHelper.GetTestAssessmentLevel)) { const string initialName = "Initial name"; const string updatedName = "Updated name"; @@ -440,7 +440,7 @@ var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()); using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestNormativeAssessmentLevel) + AssessmentSectionHelper.GetTestAssessmentLevel) { Data = calculation })