Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r578223a17aee5acbb69a4b804e6125a5d6db3c36 -r25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 578223a17aee5acbb69a4b804e6125a5d6db3c36) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f) @@ -41,6 +41,7 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Plugin.FileImporter; using Ringtoets.StabilityPointStructures.Data; +using Ringtoets.StabilityStoneCover.Data; namespace Demo.Ringtoets.Commands { @@ -87,6 +88,7 @@ InitializeHeightStructuresData(demoAssessmentSection); InitializeDemoPipingData(demoAssessmentSection); InitializeStabilityPointStructuresData(demoAssessmentSection); + InitializeStabilityStoneCoverData(demoAssessmentSection); return demoAssessmentSection; } @@ -292,8 +294,22 @@ #endregion + #region StabilityStoneCoverFailureMechanism + + private static void InitializeStabilityStoneCoverData(AssessmentSection demoAssessmentSection) + { + StabilityStoneCoverFailureMechanism failureMechanism = demoAssessmentSection.StabilityStoneCover; + + var calculation = new StabilityStoneCoverWaveConditionsCalculation(); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); + calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001); + calculation.InputParameters.NotifyObservers(); + } + #endregion + #endregion + #region HydraulicBoundaryDatabase private void InitializeDemoHydraulicBoundaryDatabase(AssessmentSection demoAssessmentSection) Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj =================================================================== diff -u -r578223a17aee5acbb69a4b804e6125a5d6db3c36 -r25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f --- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 578223a17aee5acbb69a4b804e6125a5d6db3c36) +++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f) @@ -197,6 +197,11 @@ Ringtoets.StabilityPointStructures.Data False + + {B479E3AF-7C34-488C-BB73-D324100D36C9} + Ringtoets.StabilityStoneCover.Data + False + Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r578223a17aee5acbb69a4b804e6125a5d6db3c36 -r25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 578223a17aee5acbb69a4b804e6125a5d6db3c36) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f) @@ -44,6 +44,7 @@ using Ringtoets.Piping.Service; using Ringtoets.Revetment.Data; using Ringtoets.StabilityPointStructures.Data; +using Ringtoets.StabilityStoneCover.Data; namespace Demo.Ringtoets.Test.Commands { @@ -107,6 +108,7 @@ AssertHeightStructuresFailureMechanism(demoAssessmentSection); AssertPipingFailureMechanism(demoAssessmentSection); AssertStabilityPointStructuresFailureMechanism(demoAssessmentSection); + AssertStabilityStoneCoverFailureMechanism(demoAssessmentSection); mocks.VerifyAll(); } @@ -163,11 +165,11 @@ private static void AssertGrassCoverErosionInwardsFailureMechanism(AssessmentSection demoAssessmentSection) { Assert.AreEqual(1, demoAssessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Count); - GrassCoverErosionInwardsCalculation grassCoverErosionInwardsCalculation = demoAssessmentSection.GrassCoverErosionInwards - .CalculationsGroup.GetCalculations() - .OfType() - .First(); - AssertExpectedGrassCoverErosionInwardsInput(grassCoverErosionInwardsCalculation.InputParameters); + GrassCoverErosionInwardsCalculation calculation = demoAssessmentSection.GrassCoverErosionInwards + .CalculationsGroup.GetCalculations() + .OfType() + .First(); + AssertExpectedGrassCoverErosionInwardsInput(calculation.InputParameters); } private static void AssertExpectedGrassCoverErosionInwardsInput(GrassCoverErosionInwardsInput inputParameters) @@ -192,11 +194,11 @@ AssertWaveHeightConvergenceOnGrassCoverErosionOutwardsHydraulicBoundaryLocations(hydraulicBoundaryLocations); Assert.AreEqual(1, demoAssessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Count); - GrassCoverErosionOutwardsWaveConditionsCalculation grassCoverErosionOutwardsCalculation = demoAssessmentSection.GrassCoverErosionOutwards - .WaveConditionsCalculationGroup.GetCalculations() - .OfType() - .First(); - AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(grassCoverErosionOutwardsCalculation.InputParameters); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = demoAssessmentSection.GrassCoverErosionOutwards + .WaveConditionsCalculationGroup.GetCalculations() + .OfType() + .First(); + AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(calculation.InputParameters); } private static void AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(WaveConditionsInput inputParameters) @@ -271,11 +273,11 @@ private static void AssertHeightStructuresFailureMechanism(AssessmentSection demoAssessmentSection) { Assert.AreEqual(1, demoAssessmentSection.HeightStructures.CalculationsGroup.Children.Count); - HeightStructuresCalculation heightStructuresCalculation = demoAssessmentSection.HeightStructures - .CalculationsGroup.GetCalculations() - .OfType() - .First(); - AssertExpectedHeightStructuresInput(heightStructuresCalculation.InputParameters); + HeightStructuresCalculation calculation = demoAssessmentSection.HeightStructures + .CalculationsGroup.GetCalculations() + .OfType() + .First(); + AssertExpectedHeightStructuresInput(calculation.InputParameters); } private static void AssertExpectedHeightStructuresInput(HeightStructuresInput inputParameters) @@ -384,11 +386,11 @@ private static void AssertStabilityPointStructuresFailureMechanism(AssessmentSection demoAssessmentSection) { Assert.AreEqual(1, demoAssessmentSection.StabilityPointStructures.CalculationsGroup.Children.Count); - StabilityPointStructuresCalculation grassCoverErosionInwardsCalculation = demoAssessmentSection.StabilityPointStructures - .CalculationsGroup.GetCalculations() - .OfType() - .First(); - AssertExpectedStabilityPointStructuresInput(grassCoverErosionInwardsCalculation.InputParameters); + StabilityPointStructuresCalculation calculation = demoAssessmentSection.StabilityPointStructures + .CalculationsGroup.GetCalculations() + .OfType() + .First(); + AssertExpectedStabilityPointStructuresInput(calculation.InputParameters); } private static void AssertExpectedStabilityPointStructuresInput(StabilityPointStructuresInput inputParameters) @@ -398,8 +400,27 @@ #endregion + #region StabilityStoneCoverFailureMechanism + + private static void AssertStabilityStoneCoverFailureMechanism(AssessmentSection demoAssessmentSection) + { + Assert.AreEqual(1, demoAssessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Count); + StabilityStoneCoverWaveConditionsCalculation calculation = demoAssessmentSection.StabilityStoneCover + .WaveConditionsCalculationGroup.GetCalculations() + .OfType() + .First(); + AssertExpectedStabilityStoneCoverWaveConditionsInputInput(calculation.InputParameters); + } + + private static void AssertExpectedStabilityStoneCoverWaveConditionsInputInput(WaveConditionsInput inputParameters) + { + Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id); + } + #endregion + #endregion + #region HydraulicBoundaryDatabase private static void AssertHydraulicBoundaryDatabase(AssessmentSection demoAssessmentSection) Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj =================================================================== diff -u -r578223a17aee5acbb69a4b804e6125a5d6db3c36 -r25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj (.../Demo.Ringtoets.Test.csproj) (revision 578223a17aee5acbb69a4b804e6125a5d6db3c36) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj (.../Demo.Ringtoets.Test.csproj) (revision 25ac2b1bc2a458afd3b7cd1c867aa74b1189ca7f) @@ -158,6 +158,10 @@ {3D4B9740-8348-4434-8D77-B611FC6EE57F} Ringtoets.StabilityPointStructures.Data + + {B479E3AF-7C34-488C-BB73-D324100D36C9} + Ringtoets.StabilityStoneCover.Data + {ffe3a667-3a4c-4f48-bc6b-1589867fcb41} Demo.Ringtoets