Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r814349430deb526dabf1cd5ac5bd71e0ff3597cb -r78532d8087d842a4658db8130641ad8fe6c548e6 --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 78532d8087d842a4658db8130641ad8fe6c548e6) @@ -25,6 +25,7 @@ using Core.Common.Base.Data; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.ClosingStructures.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probability; @@ -37,6 +38,7 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Revetment.Data; +using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -270,6 +272,26 @@ Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) }; + var emptyClosingStructuresCalculation = new StructuresCalculation(); + var closingStructuresCalculation = new StructuresCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + }, + Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) + }; + + var emptyStabilityPointStructuresCalculation = new StructuresCalculation(); + var stabilityPointStructuresCalculation = new StructuresCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + }, + Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) + }; + var emptyStabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation(); var stabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation { @@ -306,6 +328,10 @@ assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(grassCoverErosionInwardsCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(emptyHeightStructuresCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(heightStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(emptyClosingStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(closingStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(emptyStabilityPointStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(stabilityPointStructuresCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(emptyStabilityStoneCoverWaveConditionsCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(stabilityStoneCoverWaveConditionsCalculation); assessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(grassCoverErosionOutwardsWaveConditionsCalculation); @@ -327,6 +353,8 @@ Assert.IsNull(pipingCalculation.Output); Assert.IsNull(grassCoverErosionInwardsCalculation.Output); Assert.IsNull(heightStructuresCalculation.Output); + Assert.IsNull(closingStructuresCalculation.Output); + Assert.IsNull(stabilityPointStructuresCalculation.Output); Assert.IsNull(stabilityStoneCoverWaveConditionsCalculation.Output); Assert.IsNull(grassCoverErosionOutwardsWaveConditionsCalculation.Output); Assert.IsNull(waveImpactAshpaltCoverWaveConditionsCalculation.Output); @@ -337,7 +365,9 @@ stabilityStoneCoverWaveConditionsCalculation, waveImpactAshpaltCoverWaveConditionsCalculation, grassCoverErosionOutwardsWaveConditionsCalculation, - heightStructuresCalculation + heightStructuresCalculation, + closingStructuresCalculation, + stabilityPointStructuresCalculation }, affectedItems); } @@ -375,6 +405,24 @@ } }; + var emptyClosingStructuresCalculation = new StructuresCalculation(); + var closingStructuresCalculation = new StructuresCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + + var emptyStabilityPointStructuresCalculation = new StructuresCalculation(); + var stabilityPointStructuresCalculation = new StructuresCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + var emptyStabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation(); var stabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation { @@ -408,6 +456,10 @@ assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(grassCoverErosionInwardsCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(emptyHeightStructuresCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(heightStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(emptyClosingStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(closingStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(emptyStabilityPointStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(stabilityPointStructuresCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(emptyStabilityStoneCoverWaveConditionsCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(stabilityStoneCoverWaveConditionsCalculation); assessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(emptyGrassCoverErosionOutwardsWaveConditionsCalculation); @@ -422,6 +474,8 @@ Assert.IsNull(pipingCalculation.InputParameters.HydraulicBoundaryLocation); Assert.IsNull(grassCoverErosionInwardsCalculation.InputParameters.HydraulicBoundaryLocation); Assert.IsNull(heightStructuresCalculation.InputParameters.HydraulicBoundaryLocation); + Assert.IsNull(closingStructuresCalculation.InputParameters.HydraulicBoundaryLocation); + Assert.IsNull(stabilityPointStructuresCalculation.InputParameters.HydraulicBoundaryLocation); Assert.IsNull(stabilityStoneCoverWaveConditionsCalculation.InputParameters.HydraulicBoundaryLocation); Assert.IsNull(grassCoverErosionOutwardsWaveConditionsCalculation.InputParameters.HydraulicBoundaryLocation); Assert.IsNull(waveImpactAshpaltCoverWaveConditionsCalculation.InputParameters.HydraulicBoundaryLocation); @@ -432,7 +486,9 @@ stabilityStoneCoverWaveConditionsCalculation, waveImpactAshpaltCoverWaveConditionsCalculation, grassCoverErosionOutwardsWaveConditionsCalculation, - heightStructuresCalculation + heightStructuresCalculation, + closingStructuresCalculation, + stabilityPointStructuresCalculation }, affectedItems); } @@ -460,6 +516,18 @@ Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) }; + var emptyClosingStructuresCalculation = new StructuresCalculation(); + var closingStructuresCalculation = new StructuresCalculation + { + Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) + }; + + var emptyStabilityPointStructuresCalculation = new StructuresCalculation(); + var stabilityPointStructuresCalculation = new StructuresCalculation + { + Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) + }; + var emptyStabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation(); var stabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation { @@ -484,6 +552,10 @@ assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(grassCoverErosionInwardsCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(emptyHeightStructuresCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(heightStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(emptyClosingStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(closingStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(emptyStabilityPointStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(stabilityPointStructuresCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(emptyStabilityStoneCoverWaveConditionsCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(stabilityStoneCoverWaveConditionsCalculation); assessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(emptyGrassCoverErosionOutwardsWaveConditionsCalculation); @@ -498,6 +570,8 @@ Assert.IsNull(pipingCalculation.Output); Assert.IsNull(grassCoverErosionInwardsCalculation.Output); Assert.IsNull(heightStructuresCalculation.Output); + Assert.IsNull(closingStructuresCalculation.Output); + Assert.IsNull(stabilityPointStructuresCalculation.Output); Assert.IsNull(stabilityStoneCoverWaveConditionsCalculation.Output); Assert.IsNull(grassCoverErosionOutwardsWaveConditionsCalculation.Output); Assert.IsNull(waveImpactAshpaltCoverWaveConditionsCalculation.Output); @@ -508,7 +582,9 @@ stabilityStoneCoverWaveConditionsCalculation, waveImpactAshpaltCoverWaveConditionsCalculation, grassCoverErosionOutwardsWaveConditionsCalculation, - heightStructuresCalculation + heightStructuresCalculation, + closingStructuresCalculation, + stabilityPointStructuresCalculation }, affectedItems); } @@ -521,13 +597,17 @@ var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput()); var emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(); var emptyHeightStructuresCalculation = new StructuresCalculation(); + var emptyClosingStructuresCalculation = new StructuresCalculation(); + var emptyStabilityPointStructuresCalculation = new StructuresCalculation(); var emptyStabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation(); var emptyGrassCoverErosionOutwardsCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation(); var emptyWaveImpactAshpaltCoverWaveConditionsCalculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(emptyPipingCalculation); assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(emptyGrassCoverErosionInwardsCalculation); assessmentSection.HeightStructures.CalculationsGroup.Children.Add(emptyHeightStructuresCalculation); + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(emptyClosingStructuresCalculation); + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(emptyStabilityPointStructuresCalculation); assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(emptyStabilityStoneCoverWaveConditionsCalculation); assessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(emptyGrassCoverErosionOutwardsCalculation); assessmentSection.WaveImpactAsphaltCover.WaveConditionsCalculationGroup.Children.Add(emptyWaveImpactAshpaltCoverWaveConditionsCalculation);