Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -r4a35dfcba3abf411171c9d6ee9e822c0f1956b78 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 4a35dfcba3abf411171c9d6ee9e822c0f1956b78) @@ -185,9 +185,15 @@ { GrassCoverErosionOutwardsFailureMechanism failureMechanism = demoAssessmentSection.GrassCoverErosionOutwards; - var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation(); + var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), + CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm + } + }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); - calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001); calculation.InputParameters.NotifyObservers(); } @@ -757,7 +763,14 @@ { StabilityStoneCoverFailureMechanism failureMechanism = demoAssessmentSection.StabilityStoneCover; - var calculation = new StabilityStoneCoverWaveConditionsCalculation(); + var calculation = new StabilityStoneCoverWaveConditionsCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), + CategoryType = AssessmentSectionCategoryType.LowerLimitNorm + } + }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001); calculation.InputParameters.NotifyObservers(); @@ -771,7 +784,14 @@ { WaveImpactAsphaltCoverFailureMechanism failureMechanism = demoAssessmentSection.WaveImpactAsphaltCover; - var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); + var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation + { + InputParameters = + { + HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), + CategoryType = AssessmentSectionCategoryType.LowerLimitNorm + } + }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001); calculation.InputParameters.NotifyObservers(); Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r6345fd6a8fffc7852289a9c0e7ed2e0aad96c908 -r4a35dfcba3abf411171c9d6ee9e822c0f1956b78 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 6345fd6a8fffc7852289a9c0e7ed2e0aad96c908) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 4a35dfcba3abf411171c9d6ee9e822c0f1956b78) @@ -228,9 +228,10 @@ AssertHydraulicBoundaryCalculationResult(5.34, calculations, 17); } - private static void AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(WaveConditionsInput inputParameters) + private static void AssertExpectedGrassCoverErosionOutwardsWaveConditionsInput(FailureMechanismCategoryWaveConditionsInput inputParameters) { Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id); + Assert.AreEqual(FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, inputParameters.CategoryType); } #endregion @@ -556,9 +557,10 @@ AssertExpectedStabilityStoneCoverWaveConditionsInput(calculation.InputParameters); } - private static void AssertExpectedStabilityStoneCoverWaveConditionsInput(WaveConditionsInput inputParameters) + private static void AssertExpectedStabilityStoneCoverWaveConditionsInput(AssessmentSectionCategoryWaveConditionsInput inputParameters) { Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id); + Assert.AreEqual(AssessmentSectionCategoryType.LowerLimitNorm, inputParameters.CategoryType); } #endregion @@ -575,9 +577,10 @@ AssertExpectedWaveImpactAsphaltCoverWaveConditionsInput(calculation.InputParameters); } - private static void AssertExpectedWaveImpactAsphaltCoverWaveConditionsInput(WaveConditionsInput inputParameters) + private static void AssertExpectedWaveImpactAsphaltCoverWaveConditionsInput(AssessmentSectionCategoryWaveConditionsInput inputParameters) { Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id); + Assert.AreEqual(AssessmentSectionCategoryType.LowerLimitNorm, inputParameters.CategoryType); } #endregion