Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r36dbbaacc16602e76ed5c14bb2f4d50dc0e6e986 -re0569588050ef8940d731d357524f85d1d702b75 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 36dbbaacc16602e76ed5c14bb2f4d50dc0e6e986) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision e0569588050ef8940d731d357524f85d1d702b75) @@ -441,9 +441,9 @@ RoundedDouble assessmentLevel = calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.Result; - Assert.IsTrue(PipingCalculationService.Validate(calculation, assessmentLevel)); + Assert.IsTrue(PipingCalculationService.Validate(calculation)); - PipingCalculationService.Calculate(calculation, assessmentLevel); + PipingCalculationService.Calculate(calculation); Assert.IsTrue(calculation.HasOutput); Assert.AreEqual(0.683, calculation.Output.HeaveFactorOfSafety, 1e-3); Assert.AreEqual(-0.139, calculation.Output.HeaveZValue, 1e-3); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -recb753a5b17dd2e9cb0658ffb5a0a6d5a730c62f -re0569588050ef8940d731d357524f85d1d702b75 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision ecb753a5b17dd2e9cb0658ffb5a0a6d5a730c62f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision e0569588050ef8940d731d357524f85d1d702b75) @@ -80,7 +80,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new PipingInputContextProperties(null, () => (RoundedDouble) 1.1, handler); + TestDelegate test = () => new PipingInputContextProperties(null, GetCalculatedTestAssessmentLevel, handler); // Assert var exception = Assert.Throws(test); @@ -162,7 +162,7 @@ assessmentSection); // Call - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Assert Assert.IsInstanceOf>(properties); @@ -229,7 +229,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); // Call - var properties = new PipingInputContextProperties(context, handler) + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = false }; @@ -410,7 +410,7 @@ assessmentSection); // Call - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -459,7 +459,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); // Call - var properties = new PipingInputContextProperties(context, handler) + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = useManualAssessmentLevelInput }; @@ -554,7 +554,7 @@ assessmentSection); // Call - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Assert Assert.AreEqual(inputParameters.PhreaticLevelExit.Mean, properties.PhreaticLevelExit.Mean); @@ -591,7 +591,7 @@ properties.SaturatedVolumicWeightOfCoverageLayer.Shift); Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevel); - Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(inputParameters), properties.PiezometricHeadExit); + Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(inputParameters, inputParameters.AssessmentLevel), properties.PiezometricHeadExit); Assert.AreEqual(DerivedPipingInput.GetSeepageLength(inputParameters).Mean, properties.SeepageLength.Mean); Assert.AreEqual(DerivedPipingInput.GetSeepageLength(inputParameters).CoefficientOfVariation, properties.SeepageLength.CoefficientOfVariation); @@ -629,7 +629,7 @@ assessmentSection); var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); const double assessmentLevel = 0.36; const double entryPointL = 0.12; @@ -839,7 +839,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); // Call - var properties = new PipingInputContextProperties(context, handler) + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler) { ExitPointL = (RoundedDouble) exitPoint, EntryPointL = (RoundedDouble) entryPoint @@ -881,7 +881,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); // Call - var properties = new PipingInputContextProperties(context, handler) + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler) { EntryPointL = (RoundedDouble) 0.5, ExitPointL = (RoundedDouble) 2 @@ -929,7 +929,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call TestDelegate call = () => properties.ExitPointL = newExitPointL; @@ -976,7 +976,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call TestDelegate call = () => properties.EntryPointL = entryPoint; @@ -1023,7 +1023,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call TestDelegate call = () => properties.EntryPointL = entryPointL; @@ -1068,7 +1068,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call TestDelegate call = () => properties.ExitPointL = exitPointL; @@ -1107,7 +1107,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call properties.SelectedHydraulicBoundaryLocation = selectableHydraulicBoundaryLocation; @@ -1147,7 +1147,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call properties.SelectedHydraulicBoundaryLocation = selectableHydraulicBoundaryLocation; @@ -1186,7 +1186,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); - var properties = new PipingInputContextProperties(context, handler) + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler) { UseAssessmentLevelManualInput = false }; @@ -1240,7 +1240,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call properties.AssessmentLevel = (RoundedDouble) testLevel; @@ -1281,7 +1281,7 @@ var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); var testLevel = (RoundedDouble) random.NextDouble(); HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated( @@ -1330,7 +1330,7 @@ var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); inputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); @@ -1382,7 +1382,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call properties.SurfaceLine = testSurfaceLine; @@ -1433,7 +1433,7 @@ var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call properties.SurfaceLine = newSurfaceLine; @@ -1458,7 +1458,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call IEnumerable surfaceLines = properties.GetAvailableSurfaceLines(); @@ -1482,7 +1482,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Precondition: Assert.IsNull(calculation.InputParameters.SurfaceLine); @@ -1549,7 +1549,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Precondition: Assert.IsNotNull(calculation.InputParameters.SurfaceLine); @@ -1580,7 +1580,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Precondition Assert.IsNull(calculation.InputParameters.StochasticSoilModel); @@ -1618,7 +1618,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Precondition Assert.IsNotNull(calculation.InputParameters.StochasticSoilModel); @@ -1645,7 +1645,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null; @@ -1695,7 +1695,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // When IEnumerable availableHydraulicBoundaryLocations = @@ -1737,7 +1737,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call IEnumerable selectableHydraulicBoundaryLocations = @@ -1789,7 +1789,7 @@ var context = new PipingInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call IEnumerable selectableHydraulicBoundaryLocations = @@ -1854,7 +1854,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); IEnumerable originalList = properties.GetSelectableHydraulicBoundaryLocations() .ToList(); @@ -1904,7 +1904,7 @@ Enumerable.Empty(), failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call bool result = properties.DynamicReadOnlyValidationMethod("AssessmentLevel"); @@ -1931,7 +1931,7 @@ Enumerable.Empty(), failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call bool result = properties.DynamicReadOnlyValidationMethod("prop"); @@ -1967,7 +1967,7 @@ Enumerable.Empty(), failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call bool result = properties.DynamicVisibleValidationMethod("SelectedHydraulicBoundaryLocation"); @@ -1994,7 +1994,7 @@ Enumerable.Empty(), failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call bool result = properties.DynamicVisibleValidationMethod("prop"); @@ -2030,7 +2030,7 @@ observable }); - var properties = new PipingInputContextProperties(context, handler); + var properties = new PipingInputContextProperties(context, GetCalculatedTestAssessmentLevel, handler); // Call setProperty(properties); @@ -2040,6 +2040,11 @@ mocks.VerifyAll(); } + private static RoundedDouble GetCalculatedTestAssessmentLevel() + { + return (RoundedDouble) 1.1; + } + private static PipingStochasticSoilModel ValidStochasticSoilModel(double xMin, double xMax) { return new PipingStochasticSoilModel("StochasticSoilModelName", new[] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r6b60edb4d7f04f83c74089d70a72c4f79ed413dd -re0569588050ef8940d731d357524f85d1d702b75 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 6b60edb4d7f04f83c74089d70a72c4f79ed413dd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision e0569588050ef8940d731d357524f85d1d702b75) @@ -23,6 +23,7 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms.Design; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Gui.PropertyBag; using NUnit.Framework; @@ -71,7 +72,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(pipingInputContext, handler); + var properties = new PipingInputContextProperties(pipingInputContext, GetCalculatedTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); var someValue = new object(); @@ -139,7 +140,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(inputParametersContext, handler); + var properties = new PipingInputContextProperties(inputParametersContext, GetCalculatedTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilModelSelectionEditor(); var someValue = new object(); @@ -159,5 +160,10 @@ mockRepository.VerifyAll(); } + + private static RoundedDouble GetCalculatedTestAssessmentLevel() + { + return (RoundedDouble) 1.1; + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r6b60edb4d7f04f83c74089d70a72c4f79ed413dd -re0569588050ef8940d731d357524f85d1d702b75 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 6b60edb4d7f04f83c74089d70a72c4f79ed413dd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision e0569588050ef8940d731d357524f85d1d702b75) @@ -23,6 +23,7 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms.Design; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Gui.PropertyBag; using NUnit.Framework; @@ -71,7 +72,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(pipingInputContext, handler); + var properties = new PipingInputContextProperties(pipingInputContext, GetCalculatedTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); var someValue = new object(); @@ -139,7 +140,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(inputParametersContext, handler); + var properties = new PipingInputContextProperties(inputParametersContext, GetCalculatedTestAssessmentLevel, handler); var editor = new PipingInputContextStochasticSoilProfileSelectionEditor(); var someValue = new object(); @@ -159,5 +160,10 @@ mockRepository.VerifyAll(); } + + private static RoundedDouble GetCalculatedTestAssessmentLevel() + { + return (RoundedDouble) 1.1; + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -re0569588050ef8940d731d357524f85d1d702b75 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision e0569588050ef8940d731d357524f85d1d702b75) @@ -23,6 +23,7 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms.Design; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Gui.PropertyBag; using NUnit.Framework; @@ -69,7 +70,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(inputParametersContext, handler); + var properties = new PipingInputContextProperties(inputParametersContext, GetCalculatedTestAssessmentLevel, handler); var editor = new PipingInputContextSurfaceLineSelectionEditor(); var someValue = new object(); @@ -124,7 +125,7 @@ failureMechanism, assessmentSection); - var properties = new PipingInputContextProperties(inputParametersContext, handler); + var properties = new PipingInputContextProperties(inputParametersContext, GetCalculatedTestAssessmentLevel, handler); var editor = new PipingInputContextSurfaceLineSelectionEditor(); var someValue = new object(); @@ -145,6 +146,11 @@ mockRepository.VerifyAll(); } + private static RoundedDouble GetCalculatedTestAssessmentLevel() + { + return (RoundedDouble)1.1; + } + private static PipingSurfaceLine ValidSurfaceLine() { var surfaceLine = new PipingSurfaceLine(string.Empty);