Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs =================================================================== diff -u -r28d9f08e359c89436494ad63a6cb7832baa10341 -r1aee3bed1c335bc1b6e48d1c5ca3df85d1f15633 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 28d9f08e359c89436494ad63a6cb7832baa10341) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 1aee3bed1c335bc1b6e48d1c5ca3df85d1f15633) @@ -31,8 +31,13 @@ using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.TestUtil; +using Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; +using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; +using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses { @@ -247,16 +252,30 @@ var propertyChangeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties()); + RoundedDouble assessmentLevel = new Random(21).NextRoundedDouble(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsInput input = calculation.InputParameters; // Call - var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel(), propertyChangeHandler); + var properties = new MacroStabilityInwardsWaterStressesProperties(input, assessmentLevel, propertyChangeHandler); // Assert Assert.AreEqual(input.WaterLevelRiverAverage, properties.WaterLevelRiverAverage); Assert.AreSame(input.LocationInputExtreme, properties.LocationExtreme.Data); Assert.AreSame(input.LocationInputDaily, properties.LocationDaily.Data); + Assert.AreSame(input, properties.WaterStressLines.Data); + + using (new MacroStabilityInwardsCalculatorFactoryConfig()) + { + MacroStabilityInwardsWaternetProperties waternetProperties = properties.WaterStressLines.WaternetExtreme; + + var calculatorFactory = (TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance; + + Assert.AreEqual(assessmentLevel, calculatorFactory.LastCreatedWaternetCalculator.Input.AssessmentLevel); + CalculatorOutputAssert.AssertWaternet(calculatorFactory.LastCreatedWaternetCalculator.Output, (MacroStabilityInwardsWaternet) waternetProperties.Data); + } + Assert.AreSame(input, properties.Drainage.Data); Assert.AreEqual(input.MinimumLevelPhreaticLineAtDikeTopRiver, properties.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.AreEqual(input.MinimumLevelPhreaticLineAtDikeTopPolder, properties.MinimumLevelPhreaticLineAtDikeTopPolder); @@ -277,8 +296,8 @@ var calculationItem = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsInput input = calculationItem.InputParameters; - var handler = new ObservablePropertyChangeHandler(calculationItem, input); - var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel(), handler); + var propertyChangeHandler = new ObservablePropertyChangeHandler(calculationItem, input); + var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel(), propertyChangeHandler); var random = new Random(21); double waterLevelRiverAverage = random.NextDouble(); @@ -460,18 +479,18 @@ MacroStabilityInwardsInput input = calculation.InputParameters; - var handler = new SetPropertyValueAfterConfirmationParameterTester(new[] + var propertyChangeHandler = new SetPropertyValueAfterConfirmationParameterTester(new[] { observable }); - var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel(), handler); + var properties = new MacroStabilityInwardsWaterStressesProperties(input, GetTestNormativeAssessmentLevel(), propertyChangeHandler); // Call setProperty(properties); // Assert - Assert.IsTrue(handler.Called); + Assert.IsTrue(propertyChangeHandler.Called); mocks.VerifyAll(); } }