Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -r899d227631395ebeb5154719f7b92a42ddbc6f96 -r3dbf451144dc23d8abe649913baee1a5e544c48c --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) @@ -523,10 +523,24 @@ Assert.IsFalse(designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(designWaterLevelCalculation); + designWaterLevelCalculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation3; + Assert.IsFalse(designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); + AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(designWaterLevelCalculation); + + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation2); + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation4); + HydraulicBoundaryLocationCalculation waveHeightCalculation = hydraulicBoundaryLocation.WaveHeightCalculation1; Assert.IsFalse(waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationWaveHeightCalculation(waveHeightCalculation); + waveHeightCalculation = hydraulicBoundaryLocation.WaveHeightCalculation3; + Assert.IsFalse(waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); + AssertHydraulicBoundaryLocationWaveHeightCalculation(waveHeightCalculation); + + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation2); + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation4); + HydraulicBoundaryLocation hydraulicBoundaryLocationWithIllustrationPoints = hydraulicBoundaryDatabase.Locations[1]; Assert.AreEqual(13002, hydraulicBoundaryLocationWithIllustrationPoints.Id); Assert.AreEqual("test2", hydraulicBoundaryLocationWithIllustrationPoints.Name); @@ -539,13 +553,37 @@ AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(designWaterLevelCalculationWithIllustrationPoints); AssertGeneralResultTopLevelSubMechanismIllustrationPoint(designWaterLevelCalculationWithIllustrationPoints.Output.GeneralResult); + designWaterLevelCalculationWithIllustrationPoints = + hydraulicBoundaryLocationWithIllustrationPoints.DesignWaterLevelCalculation3; + Assert.IsTrue(designWaterLevelCalculationWithIllustrationPoints.InputParameters.ShouldIllustrationPointsBeCalculated); + AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(designWaterLevelCalculationWithIllustrationPoints); + AssertGeneralResultTopLevelSubMechanismIllustrationPoint(designWaterLevelCalculationWithIllustrationPoints.Output.GeneralResult); + + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocationWithIllustrationPoints.DesignWaterLevelCalculation2); + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocationWithIllustrationPoints.DesignWaterLevelCalculation4); + HydraulicBoundaryLocationCalculation waveHeightCalculationWithIllustrationPoints = hydraulicBoundaryLocationWithIllustrationPoints.WaveHeightCalculation1; Assert.IsTrue(waveHeightCalculationWithIllustrationPoints.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationWaveHeightCalculation(waveHeightCalculationWithIllustrationPoints); AssertGeneralResultTopLevelSubMechanismIllustrationPoint(waveHeightCalculationWithIllustrationPoints.Output.GeneralResult); + + waveHeightCalculationWithIllustrationPoints = + hydraulicBoundaryLocationWithIllustrationPoints.WaveHeightCalculation3; + Assert.IsTrue(waveHeightCalculationWithIllustrationPoints.InputParameters.ShouldIllustrationPointsBeCalculated); + AssertHydraulicBoundaryLocationWaveHeightCalculation(waveHeightCalculationWithIllustrationPoints); + AssertGeneralResultTopLevelSubMechanismIllustrationPoint(waveHeightCalculationWithIllustrationPoints.Output.GeneralResult); + + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocationWithIllustrationPoints.WaveHeightCalculation2); + AssertSimpleHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocationWithIllustrationPoints.WaveHeightCalculation4); } + private static void AssertSimpleHydraulicBoundaryLocationCalculation(HydraulicBoundaryLocationCalculation calculation) + { + Assert.IsFalse(calculation.InputParameters.ShouldIllustrationPointsBeCalculated); + Assert.IsFalse(calculation.HasOutput); + } + private static void AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(HydraulicBoundaryLocationCalculation calculation) { HydraulicBoundaryLocationOutput output = calculation.Output;