Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj
===================================================================
diff -u -r570695e818fcf887563710ad6d26df301be56227 -r1e6314ff2b8eb58d3630a7989e5aed022e13d35e
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj (.../Ringtoets.Integration.Service.csproj) (revision 570695e818fcf887563710ad6d26df301be56227)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj (.../Ringtoets.Integration.Service.csproj) (revision 1e6314ff2b8eb58d3630a7989e5aed022e13d35e)
@@ -115,6 +115,14 @@
Ringtoets.HeightStructures.Service
False
+
+ {83D6B73E-91D5-46B0-9218-955DA1F75F7C}
+ Ringtoets.MacroStabilityInwards.Data
+
+
+ {55BE9A1B-68AB-488F-AF20-E037A50063DB}
+ Ringtoets.MacroStabilityInwards.Service
+
{CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB}
Ringtoets.Piping.Data
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs
===================================================================
diff -u -r5ee23018be55ff03a7851e54ca0a6682c521f952 -r1e6314ff2b8eb58d3630a7989e5aed022e13d35e
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 5ee23018be55ff03a7851e54ca0a6682c521f952)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 1e6314ff2b8eb58d3630a7989e5aed022e13d35e)
@@ -41,6 +41,8 @@
using Ringtoets.GrassCoverErosionOutwards.Service;
using Ringtoets.HeightStructures.Data;
using Ringtoets.HeightStructures.Service;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Service;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Service;
using Ringtoets.Revetment.Data;
@@ -630,6 +632,12 @@
return PipingDataSynchronizationService.ClearReferenceLineDependentData(pipingFailureMechanism);
}
+ var macroStabilityInwardsFailureMechanism = failureMechanism as MacroStabilityInwardsFailureMechanism;
+ if (macroStabilityInwardsFailureMechanism != null)
+ {
+ return MacroStabilityInwardsDataSynchronizationService.ClearReferenceLineDependentData(macroStabilityInwardsFailureMechanism);
+ }
+
var grassCoverErosionInwardsFailureMechanism = failureMechanism as GrassCoverErosionInwardsFailureMechanism;
if (grassCoverErosionInwardsFailureMechanism != null)
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs
===================================================================
diff -u -r490536070dbba464bd7a8e140609b1c853660007 -r1e6314ff2b8eb58d3630a7989e5aed022e13d35e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs (.../ReferenceLineReplacementHandlerTest.cs) (revision 490536070dbba464bd7a8e140609b1c853660007)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs (.../ReferenceLineReplacementHandlerTest.cs) (revision 1e6314ff2b8eb58d3630a7989e5aed022e13d35e)
@@ -154,7 +154,7 @@
IObservable[] observables = handler.Replace(assessmentSection, referenceLine).ToArray();
// Assert
- Assert.AreEqual(39, observables.Length);
+ Assert.AreEqual(42, observables.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.PipingFailureMechanism;
CollectionAssert.IsEmpty(pipingFailureMechanism.Sections);
@@ -245,6 +245,12 @@
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.Sections);
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SectionResults);
CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism);
+ CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.CalculationsGroup.Children);
+ CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism.CalculationsGroup);
+ CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.StochasticSoilModels);
+ CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism.StochasticSoilModels);
+ CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SurfaceLines);
+ CollectionAssert.Contains(observables, macroStabilityInwardsFailureMechanism.SurfaceLines);
MacrostabilityOutwardsFailureMechanism macrostabilityOutwardsFailureMechanism = assessmentSection.MacrostabilityOutwards;
CollectionAssert.IsEmpty(macrostabilityOutwardsFailureMechanism.Sections);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rd6fe8399e8398224cf1bda9259052232d85b85a4 -r1e6314ff2b8eb58d3630a7989e5aed022e13d35e
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision d6fe8399e8398224cf1bda9259052232d85b85a4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 1e6314ff2b8eb58d3630a7989e5aed022e13d35e)
@@ -559,6 +559,9 @@
MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards;
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.Sections);
CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SectionResults);
+ CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.CalculationsGroup.Children);
+ CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.StochasticSoilModels);
+ CollectionAssert.IsEmpty(macroStabilityInwardsFailureMechanism.SurfaceLines);
MacrostabilityOutwardsFailureMechanism macrostabilityOutwardsFailureMechanism = assessmentSection.MacrostabilityOutwards;
CollectionAssert.IsEmpty(macrostabilityOutwardsFailureMechanism.Sections);
@@ -608,7 +611,7 @@
// Assert
IObservable[] changedObjects = results.ChangedObjects.ToArray();
- Assert.AreEqual(39, changedObjects.Length);
+ Assert.AreEqual(42, changedObjects.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.PipingFailureMechanism;
CollectionAssert.Contains(changedObjects, pipingFailureMechanism);
@@ -659,6 +662,9 @@
MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards;
CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism);
+ CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.CalculationsGroup);
+ CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.StochasticSoilModels);
+ CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.SurfaceLines);
MacrostabilityOutwardsFailureMechanism macrostabilityOutwardsFailureMechanism = assessmentSection.MacrostabilityOutwards;
CollectionAssert.Contains(changedObjects, macrostabilityOutwardsFailureMechanism);
@@ -705,7 +711,7 @@
// Assert
IObservable[] changedObjects = results.ChangedObjects.ToArray();
- Assert.AreEqual(39, changedObjects.Length);
+ Assert.AreEqual(42, changedObjects.Length);
PipingFailureMechanism pipingFailureMechanism = assessmentSection.PipingFailureMechanism;
CollectionAssert.Contains(changedObjects, pipingFailureMechanism);
@@ -756,6 +762,9 @@
MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards;
CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism);
+ CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.CalculationsGroup);
+ CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.StochasticSoilModels);
+ CollectionAssert.Contains(changedObjects, macroStabilityInwardsFailureMechanism.SurfaceLines);
MacrostabilityOutwardsFailureMechanism macrostabilityOutwardsFailureMechanism = assessmentSection.MacrostabilityOutwards;
CollectionAssert.Contains(changedObjects, macrostabilityOutwardsFailureMechanism);