Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r4c0cc92421b1790567779ec2ece30570a3a36ec5 -r6c024cb346f6f7f497a596ec3f1193dce605d6ba --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 4c0cc92421b1790567779ec2ece30570a3a36ec5) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 6c024cb346f6f7f497a596ec3f1193dce605d6ba) @@ -444,14 +444,11 @@ }; AssessmentSection targetAssessmentSection = CreateAssessmentSection(targetLocations); - AssessmentSection sourceAssessmentSection = CreateAssessmentSection(sourceLocations); + AssessmentSection sourceAssessmentSection = CreateAssessmentSection(sourceLocations, 0.01); targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Attach(observer); targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Attach(observer); - sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01; - sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01; - // When handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData( sourceAssessmentSection, @@ -482,18 +479,18 @@ mocks.VerifyAll(); } - private static AssessmentSection CreateAssessmentSection(HydraulicBoundaryLocation[] locations) + private static AssessmentSection CreateAssessmentSection(HydraulicBoundaryLocation[] locations, double targetProbability = 0.1) { var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) + assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability) { HydraulicBoundaryLocationCalculations = { new HydraulicBoundaryLocationCalculation(locations[0]) } }); - assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) + assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability) { HydraulicBoundaryLocationCalculations = { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -rd8ec9b8eec266efcbd1044008022bcf5171efb31 -r6c024cb346f6f7f497a596ec3f1193dce605d6ba --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision d8ec9b8eec266efcbd1044008022bcf5171efb31) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 6c024cb346f6f7f497a596ec3f1193dce605d6ba) @@ -549,9 +549,8 @@ const double targetProbability = 0.01; - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability) { - TargetProbability = targetProbability, HydraulicBoundaryLocationCalculations = { new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) @@ -634,9 +633,8 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName"); - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability) { - TargetProbability = targetProbability, HydraulicBoundaryLocationCalculations = { new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) @@ -718,9 +716,8 @@ const double targetProbability = 0.01; - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability) { - TargetProbability = targetProbability, HydraulicBoundaryLocationCalculations = { new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) @@ -794,9 +791,8 @@ var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation("locationName")); - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1) + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01) { - TargetProbability = 0.01, HydraulicBoundaryLocationCalculations = { calculation