Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -rc00754e69dff2c23630579b625ee2e4368ab25ae -r3cb5cf4da544396efd059517079d7ee462100e38 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision c00754e69dff2c23630579b625ee2e4368ab25ae) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 3cb5cf4da544396efd059517079d7ee462100e38) @@ -367,7 +367,7 @@ } [Test] - public void GivenEqualUserDefinedTargetProbabilities_WhenMerging_ThenCalculationsMerged() + public void GivenEqualUserDefinedTargetProbabilities_WhenMerging_CalculationsNotMergedObserversNotNotified() { // Given var handler = new AssessmentSectionMergeHandler(); @@ -439,13 +439,15 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(targetLocations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(sourceLocations); - + sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01; sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01; // Precondition - Assert.AreEqual(0, targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); - Assert.AreEqual(0, targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); + ObservableList waterLevelTargetProbabilities = targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities; + ObservableList waveHeightTargetProbabilities = targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities; + Assert.AreEqual(0, waterLevelTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); + Assert.AreEqual(0, waveHeightTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); // When handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData( @@ -464,8 +466,14 @@ })); // Then - Assert.AreEqual(1, targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); - Assert.AreEqual(1, targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); + Assert.AreEqual(2, waterLevelTargetProbabilities.Count); + Assert.AreEqual(2, waveHeightTargetProbabilities.Count); + + Assert.AreEqual(1, waterLevelTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); + Assert.AreEqual(1, waveHeightTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01))); + + Assert.AreEqual(1, waterLevelTargetProbabilities.Count(c => c.TargetProbability.Equals(0.1))); + Assert.AreEqual(1, waveHeightTargetProbabilities.Count(c => c.TargetProbability.Equals(0.1))); } private static void AssertHydraulicBoundaryCalculations(IEnumerable sourceCalculations,