Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -r40e087900a4895c7d1f9e7b49868b8a14b8e21fa -r0edc8d6f9624c8987ea4e9f8757e738c96ed98e2 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 40e087900a4895c7d1f9e7b49868b8a14b8e21fa) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 0edc8d6f9624c8987ea4e9f8757e738c96ed98e2) @@ -312,7 +312,7 @@ if (mergeData.MergeStabilityPointStructures) { targetAssessmentSection.StabilityPointStructures = sourceAssessmentSection.StabilityPointStructures; - UpdateCalculationHydraulicBoundaryLocationReferences, StabilityPointStructuresInput>( + UpdateCalculationHydraulicBoundaryLocationReferences, StabilityPointStructuresInput>( targetAssessmentSection.StabilityPointStructures, hydraulicBoundaryLocations); LogMergeMessage(targetAssessmentSection.StabilityPointStructures); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r40e087900a4895c7d1f9e7b49868b8a14b8e21fa -r0edc8d6f9624c8987ea4e9f8757e738c96ed98e2 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 40e087900a4895c7d1f9e7b49868b8a14b8e21fa) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 0edc8d6f9624c8987ea4e9f8757e738c96ed98e2) @@ -418,7 +418,7 @@ HydraulicBoundaryLocation = sourceLocations[0] } }); - sourceAssessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(new StructuresCalculation + sourceAssessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(new StructuresCalculationScenario { InputParameters = { @@ -487,7 +487,7 @@ var closingStructuresCalculation = (StructuresCalculationScenario) targetAssessmentSection.ClosingStructures.Calculations.Single(); Assert.AreSame(targetLocations[0], closingStructuresCalculation.InputParameters.HydraulicBoundaryLocation); - var stabilityPointStructuresCalculation = (StructuresCalculation) targetAssessmentSection.StabilityPointStructures.Calculations.Single(); + var stabilityPointStructuresCalculation = (StructuresCalculationScenario) targetAssessmentSection.StabilityPointStructures.Calculations.Single(); Assert.AreSame(targetLocations[1], stabilityPointStructuresCalculation.InputParameters.HydraulicBoundaryLocation); var stabilityStoneCoverCalculation = (StabilityStoneCoverWaveConditionsCalculation) targetAssessmentSection.StabilityStoneCover.Calculations.Single();