Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs =================================================================== diff -u -r2d39ea602bc9c08d307eb6c1709765e618ff955a -r1a996fae755a66696cb36fcb32946f0f25e864e7 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 2d39ea602bc9c08d307eb6c1709765e618ff955a) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 1a996fae755a66696cb36fcb32946f0f25e864e7) @@ -49,7 +49,7 @@ [TestFixture] public class ReferenceLineUpdateHandlerTest : NUnitFormTest { - private const int expectedNumberOfRemovedInstances = 213; + private const int expectedNumberOfRemovedInstances = 215; [Test] public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() @@ -206,7 +206,7 @@ IObservable[] observables = handler.Update(assessmentSection.ReferenceLine, referenceLine).ToArray(); // Assert - Assert.AreEqual(68, observables.Length); + Assert.AreEqual(69, observables.Length); PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping; CollectionAssert.IsEmpty(pipingFailureMechanism.Sections); @@ -259,8 +259,10 @@ StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.Sections); CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.SectionResults); CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism); CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.SectionResultsOld); + CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.SectionResults); CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children); CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup); CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.ForeshoreProfiles); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r2d39ea602bc9c08d307eb6c1709765e618ff955a -r1a996fae755a66696cb36fcb32946f0f25e864e7 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 2d39ea602bc9c08d307eb6c1709765e618ff955a) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 1a996fae755a66696cb36fcb32946f0f25e864e7) @@ -1671,7 +1671,7 @@ private static void AssertChangedObjects(ClearResults results, AssessmentSection assessmentSection) { IObservable[] changedObjects = results.ChangedObjects.ToArray(); - Assert.AreEqual(68, changedObjects.Length); + Assert.AreEqual(69, changedObjects.Length); PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping; CollectionAssert.Contains(changedObjects, pipingFailureMechanism); @@ -1704,6 +1704,7 @@ StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism); CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.SectionResultsOld); + CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.SectionResults); CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup); CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.ForeshoreProfiles); @@ -1873,7 +1874,7 @@ private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(StabilityStoneCoverFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLineOld(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r1a996fae755a66696cb36fcb32946f0f25e864e7 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs (.../StabilityStoneCoverDataSynchronizationService.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs (.../StabilityStoneCoverDataSynchronizationService.cs) (revision 1a996fae755a66696cb36fcb32946f0f25e864e7) @@ -101,13 +101,15 @@ var changedObjects = new List(); object[] removedObjects = failureMechanism.Sections.OfType() .Concat(failureMechanism.SectionResultsOld) + .Concat(failureMechanism.SectionResults) .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) .Concat(failureMechanism.ForeshoreProfiles) .ToArray(); failureMechanism.ClearAllSections(); changedObjects.Add(failureMechanism); changedObjects.Add(failureMechanism.SectionResultsOld); + changedObjects.Add(failureMechanism.SectionResults); failureMechanism.WaveConditionsCalculationGroup.Children.Clear(); changedObjects.Add(failureMechanism.WaveConditionsCalculationGroup); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverDataSynchronizationServiceTest.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r1a996fae755a66696cb36fcb32946f0f25e864e7 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverDataSynchronizationServiceTest.cs (.../StabilityStoneCoverDataSynchronizationServiceTest.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverDataSynchronizationServiceTest.cs (.../StabilityStoneCoverDataSynchronizationServiceTest.cs) (revision 1a996fae755a66696cb36fcb32946f0f25e864e7) @@ -140,6 +140,7 @@ object[] expectedRemovedObjects = failureMechanism.Sections.OfType() .Concat(failureMechanism.SectionResultsOld) + .Concat(failureMechanism.SectionResults) .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) .Concat(failureMechanism.ForeshoreProfiles) .ToArray(); @@ -152,13 +153,15 @@ // the return result, no ToArray() should be called before these assertions: CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children); CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); IObservable[] array = results.ChangedObjects.ToArray(); - Assert.AreEqual(4, array.Length); + Assert.AreEqual(5, array.Length); CollectionAssert.Contains(array, failureMechanism); CollectionAssert.Contains(array, failureMechanism.SectionResultsOld); + CollectionAssert.Contains(array, failureMechanism.SectionResults); CollectionAssert.Contains(array, failureMechanism.WaveConditionsCalculationGroup); CollectionAssert.Contains(array, failureMechanism.ForeshoreProfiles);