Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs =================================================================== diff -u -r60c33e853468037d2d895f69a673d169947a29b6 -r1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 60c33e853468037d2d895f69a673d169947a29b6) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064) @@ -50,7 +50,7 @@ [TestFixture] public class ReferenceLineUpdateHandlerTest : NUnitFormTest { - private const int expectedNumberOfRemovedInstances = 189; + private const int expectedNumberOfRemovedInstances = 191; [Test] public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() @@ -207,7 +207,7 @@ IObservable[] observables = handler.Update(assessmentSection.ReferenceLine, referenceLine).ToArray(); // Assert - Assert.AreEqual(56, observables.Length); + Assert.AreEqual(57, observables.Length); PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping; CollectionAssert.IsEmpty(pipingFailureMechanism.Sections); @@ -308,6 +308,7 @@ MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards; CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.Sections); CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SectionResults); + CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SectionConfigurations); CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism); CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism.SectionResults); CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.CalculationsGroup.Children); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -re7a22f0c8b54eac700d6f14718cf9f15a5aa54bc -r1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision e7a22f0c8b54eac700d6f14718cf9f15a5aa54bc) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064) @@ -1631,7 +1631,7 @@ private static void AssertChangedObjects(ClearResults results, AssessmentSection assessmentSection) { IObservable[] changedObjects = results.ChangedObjects.ToArray(); - Assert.AreEqual(56, changedObjects.Length); + Assert.AreEqual(57, changedObjects.Length); PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping; CollectionAssert.Contains(changedObjects, pipingFailureMechanism); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs =================================================================== diff -u -r59482025a9b7fc432eaf09f808006f543dec5840 -r1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs (.../MacroStabilityInwardsDataSynchronizationService.cs) (revision 59482025a9b7fc432eaf09f808006f543dec5840) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs (.../MacroStabilityInwardsDataSynchronizationService.cs) (revision 1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064) @@ -119,6 +119,7 @@ var changedObjects = new Collection(); object[] removedObjects = failureMechanism.Sections.OfType() .Concat(failureMechanism.SectionResults) + .Concat(failureMechanism.SectionConfigurations) .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) .Concat(failureMechanism.StochasticSoilModels) .Concat(failureMechanism.SurfaceLines) @@ -127,6 +128,7 @@ failureMechanism.ClearAllSections(); changedObjects.Add(failureMechanism); changedObjects.Add(failureMechanism.SectionResults); + changedObjects.Add(failureMechanism.SectionConfigurations); failureMechanism.CalculationsGroup.Children.Clear(); changedObjects.Add(failureMechanism.CalculationsGroup); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r59482025a9b7fc432eaf09f808006f543dec5840 -r1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 59482025a9b7fc432eaf09f808006f543dec5840) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064) @@ -191,6 +191,7 @@ object[] expectedRemovedObjects = failureMechanism.Sections.OfType() .Concat(failureMechanism.SectionResults) + .Concat(failureMechanism.SectionConfigurations) .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) .Concat(failureMechanism.StochasticSoilModels) .Concat(failureMechanism.SurfaceLines) @@ -204,14 +205,16 @@ // the return result, no ToArray() should be called before these assertions: CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.SectionResults); + CollectionAssert.IsEmpty(failureMechanism.SectionConfigurations); CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(failureMechanism.StochasticSoilModels); CollectionAssert.IsEmpty(failureMechanism.SurfaceLines); IObservable[] array = results.ChangedObjects.ToArray(); - Assert.AreEqual(5, array.Length); + Assert.AreEqual(6, array.Length); CollectionAssert.Contains(array, failureMechanism); CollectionAssert.Contains(array, failureMechanism.SectionResults); + CollectionAssert.Contains(array, failureMechanism.SectionConfigurations); CollectionAssert.Contains(array, failureMechanism.CalculationsGroup); CollectionAssert.Contains(array, failureMechanism.StochasticSoilModels); CollectionAssert.Contains(array, failureMechanism.SurfaceLines); Index: Riskeer/Piping/test/Riskeer.Piping.Integration.Test/ProbabilisticPipingCalculationActivityIntegrationTest.cs =================================================================== diff -u -rd73bdf6275dbff8f21b5eed34c1fcc4708999b34 -r1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064 --- Riskeer/Piping/test/Riskeer.Piping.Integration.Test/ProbabilisticPipingCalculationActivityIntegrationTest.cs (.../ProbabilisticPipingCalculationActivityIntegrationTest.cs) (revision d73bdf6275dbff8f21b5eed34c1fcc4708999b34) +++ Riskeer/Piping/test/Riskeer.Piping.Integration.Test/ProbabilisticPipingCalculationActivityIntegrationTest.cs (.../ProbabilisticPipingCalculationActivityIntegrationTest.cs) (revision 1a920f4dfd257c0bafea1dc1af8e5ff0ac6ea064) @@ -399,10 +399,10 @@ PipingFailureMechanismSectionConfiguration sectionConfiguration = failureMechanism.SectionConfigurations.Single( c => calculation.IsSurfaceLineIntersectionWithReferenceLineInSection( Math2D.ConvertPointsToLineSegments(c.Section.Points))); - double mechanismSensitiveSectionLength = sectionConfiguration.GetFailureMechanismSensitiveSectionLength(); + double failureMechanismSensitiveSectionLength = sectionConfiguration.GetFailureMechanismSensitiveSectionLength(); AssertCalculatorInput(failureMechanism.GeneralInput, calculation.InputParameters, 0, profileSpecificInputs[0]); - AssertCalculatorInput(failureMechanism.GeneralInput, calculation.InputParameters, mechanismSensitiveSectionLength, sectionSpecificInputs[0]); + AssertCalculatorInput(failureMechanism.GeneralInput, calculation.InputParameters, failureMechanismSensitiveSectionLength, sectionSpecificInputs[0]); } mocks.VerifyAll();