Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs (.../ClosingStructuresScenariosViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs (.../ClosingStructuresScenariosViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -33,6 +33,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms; namespace Ringtoets.ClosingStructures.Forms.Test.Views @@ -210,7 +211,7 @@ view.Data = failureMechanism.CalculationsGroup; view.FailureMechanism = failureMechanism; - view.FailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(view.FailureMechanism, new[] { new FailureMechanismSection("SectionC", new[] { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -210,7 +210,7 @@ view.Data = failureMechanism.CalculationsGroup; view.FailureMechanism = failureMechanism; - view.FailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(view.FailureMechanism, new[] { new FailureMechanismSection("SectionC", new[] { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs (.../HeightStructuresScenariosViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs (.../HeightStructuresScenariosViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; @@ -211,7 +212,7 @@ view.Data = failureMechanism.CalculationsGroup; view.FailureMechanism = failureMechanism; - view.FailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(view.FailureMechanism, new[] { new FailureMechanismSection("SectionC", new[] { Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/DataImportHelper.cs =================================================================== diff -u -rb6b66dd18eb14bc0723da7aa10d81a8e14e5b645 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/DataImportHelper.cs (.../DataImportHelper.cs) (revision b6b66dd18eb14bc0723da7aa10d81a8e14e5b645) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/DataImportHelper.cs (.../DataImportHelper.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -30,6 +30,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.IO.FileImporters.MessageProviders; using Ringtoets.Common.IO.ReferenceLines; @@ -146,7 +147,7 @@ foreach (FailureMechanismSection section in failureMechanisms[0].Sections) { FailureMechanismSection clonedSection = DeepCloneSection(section); - failureMechanisms[i].SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanisms[i], new[] { clonedSection }); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsFailureMechanism.cs (.../TestMacroStabilityInwardsFailureMechanism.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsFailureMechanism.cs (.../TestMacroStabilityInwardsFailureMechanism.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -22,6 +22,7 @@ using System.Collections.Generic; using Core.Common.Base.Geometry; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -499,7 +499,7 @@ public void GivenMacroStabilityInwardsCalculationsViewWithFailureMechanism_WhenSectionsAddedAndFailureMechanismNotified_ThenSectionsListBoxCorrectlyUpdated() { // Given - var failureMechanismWithSections = new MacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { new Point2D(0.0, 0.0), @@ -518,22 +518,22 @@ using (MacroStabilityInwardsCalculationsView macroStabilityInwardsCalculationsView = ShowMacroStabilityInwardsCalculationsView()) { - macroStabilityInwardsCalculationsView.MacroStabilityInwardsFailureMechanism = failureMechanismWithSections; + macroStabilityInwardsCalculationsView.MacroStabilityInwardsFailureMechanism = failureMechanism; var listBox = (ListBox) new ControlTester("listBox").TheObject; // Precondition Assert.AreEqual(0, listBox.Items.Count); - failureMechanismWithSections.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { failureMechanismSection1, failureMechanismSection2, failureMechanismSection3 }); // When - failureMechanismWithSections.NotifyObservers(); + failureMechanism.NotifyObservers(); // Then Assert.AreEqual(3, listBox.Items.Count); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -173,7 +173,7 @@ public void GivenScenariosViewWithFailureMechanism_WhenSectionsAddedAndFailureMechanismNotified_ThenSectionsListBoxCorrectlyUpdated() { // Given - var failureMechanismWithSections = new MacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { new Point2D(0.0, 0.0), @@ -191,22 +191,22 @@ }); MacroStabilityInwardsScenariosView macroStabilityInwardsScenarioView = ShowMacroStabilityInwardsScenarioView(); - macroStabilityInwardsScenarioView.MacroStabilityInwardsFailureMechanism = failureMechanismWithSections; + macroStabilityInwardsScenarioView.MacroStabilityInwardsFailureMechanism = failureMechanism; var listBox = (ListBox) new ControlTester("listBox").TheObject; // Precondition Assert.AreEqual(0, listBox.Items.Count); - failureMechanismWithSections.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { failureMechanismSection1, failureMechanismSection2, failureMechanismSection3 }); // When - failureMechanismWithSections.NotifyObservers(); + failureMechanism.NotifyObservers(); // Then Assert.AreEqual(3, listBox.Items.Count); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs (.../TestPipingFailureMechanism.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs (.../TestPipingFailureMechanism.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -22,6 +22,7 @@ using System.Collections.Generic; using Core.Common.Base.Geometry; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Data.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -rb6b66dd18eb14bc0723da7aa10d81a8e14e5b645 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision b6b66dd18eb14bc0723da7aa10d81a8e14e5b645) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -223,7 +223,7 @@ public void PipingFailureMechanism_PipingFailureMechanismWithSections_SectionsListBoxCorrectlyInitialized() { // Setup - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { new Point2D(0.0, 0.0), @@ -240,7 +240,7 @@ new Point2D(15.0, 0.0) }); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { failureMechanismSection1, failureMechanismSection2, @@ -250,7 +250,7 @@ using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { // Call - pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; + pipingCalculationsView.PipingFailureMechanism = failureMechanism; // Assert var listBox = (ListBox) new ControlTester("listBox").TheObject; @@ -587,7 +587,7 @@ public void GivenPipingCalculationsViewWithPipingFailureMechanism_WhenSectionsAddedAndPipingFailureMechanismNotified_ThenSectionsListBoxCorrectlyUpdated() { // Given - var pipingFailureMechanismWithSections = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { new Point2D(0.0, 0.0), @@ -606,22 +606,22 @@ using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { - pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanismWithSections; + pipingCalculationsView.PipingFailureMechanism = failureMechanism; var listBox = (ListBox) new ControlTester("listBox").TheObject; // Precondition Assert.AreEqual(0, listBox.Items.Count); - pipingFailureMechanismWithSections.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { failureMechanismSection1, failureMechanismSection2, failureMechanismSection3 }); // When - pipingFailureMechanismWithSections.NotifyObservers(); + failureMechanism.NotifyObservers(); // Then Assert.AreEqual(3, listBox.Items.Count); @@ -1384,14 +1384,14 @@ new Point3D(5.0, -5.0, 0.0) }); - var pipingFailureMechanism = new PipingFailureMechanism(); - pipingFailureMechanism.SurfaceLines.AddRange(new[] + var failureMechanism = new PipingFailureMechanism(); + failureMechanism.SurfaceLines.AddRange(new[] { surfaceLine1, surfaceLine2 }, "path"); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -1431,7 +1431,7 @@ }; pipingCalculationsView.AssessmentSection = assessmentSection; - pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; + pipingCalculationsView.PipingFailureMechanism = failureMechanism; return pipingCalculationsView; } @@ -1446,8 +1446,8 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var pipingFailureMechanism = new PipingFailureMechanism(); - pipingFailureMechanism.SetSections(new[] + var failureMechanism = new PipingFailureMechanism(); + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -1487,7 +1487,7 @@ }; pipingCalculationsView.AssessmentSection = assessmentSection; - pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; + pipingCalculationsView.PipingFailureMechanism = failureMechanism; return pipingCalculationsView; } @@ -1518,14 +1518,14 @@ new Point3D(5.0, -5.0, 0.0) }); - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); const string arbitraryFilePath = "path"; - pipingFailureMechanism.SurfaceLines.AddRange(new[] + failureMechanism.SurfaceLines.AddRange(new[] { surfaceLine1, surfaceLine2 }, arbitraryFilePath); - pipingFailureMechanism.StochasticSoilModels.AddRange(new[] + failureMechanism.StochasticSoilModels.AddRange(new[] { new PipingStochasticSoilModel("PipingStochasticSoilModel", new[] { @@ -1538,7 +1538,7 @@ }) }, arbitraryFilePath); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -1552,7 +1552,7 @@ }) }); - return pipingFailureMechanism; + return failureMechanism; } private static CalculationGroup ConfigureCalculationGroup(IAssessmentSection assessmentSection, PipingFailureMechanism failureMechanism) @@ -1633,15 +1633,15 @@ new Point3D(5.0, -5.0, 0.0) }); - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); const string arbitraryFilePath = "path"; - pipingFailureMechanism.SurfaceLines.AddRange(new[] + failureMechanism.SurfaceLines.AddRange(new[] { surfaceLine1, surfaceLine2 }, arbitraryFilePath); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -1695,7 +1695,7 @@ stochasticSoilProfile5 }); - pipingFailureMechanism.StochasticSoilModels.AddRange(new[] + failureMechanism.StochasticSoilModels.AddRange(new[] { stochasticSoilModelA, new PipingStochasticSoilModel("Model C", new[] @@ -1719,7 +1719,7 @@ }), stochasticSoilModelE }, arbitraryFilePath); - return pipingFailureMechanism; + return failureMechanism; } private PipingCalculationsView ShowPipingCalculationsView() Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -rb6b66dd18eb14bc0723da7aa10d81a8e14e5b645 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision b6b66dd18eb14bc0723da7aa10d81a8e14e5b645) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -135,7 +135,7 @@ public void PipingFailureMechanism_PipingFailureMechanismWithSections_SectionsListBoxCorrectlyInitialized() { // Setup - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { new Point2D(0.0, 0.0), @@ -152,7 +152,7 @@ new Point2D(15.0, 0.0) }); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { failureMechanismSection1, failureMechanismSection2, @@ -162,7 +162,7 @@ PipingScenariosView pipingScenarioView = ShowPipingScenarioView(); // Call - pipingScenarioView.PipingFailureMechanism = pipingFailureMechanism; + pipingScenarioView.PipingFailureMechanism = failureMechanism; // Assert var listBox = (ListBox) new ControlTester("listBox").TheObject; @@ -176,7 +176,7 @@ public void GivenPipingScenariosViewWithPipingFailureMechanism_WhenSectionsAddedAndPipingFailureMechanismNotified_ThenSectionsListBoxCorrectlyUpdated() { // Given - var pipingFailureMechanismWithSections = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { new Point2D(0.0, 0.0), @@ -194,22 +194,22 @@ }); PipingScenariosView pipingScenarioView = ShowPipingScenarioView(); - pipingScenarioView.PipingFailureMechanism = pipingFailureMechanismWithSections; + pipingScenarioView.PipingFailureMechanism = failureMechanism; var listBox = (ListBox) new ControlTester("listBox").TheObject; // Precondition Assert.AreEqual(0, listBox.Items.Count); - pipingFailureMechanismWithSections.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { failureMechanismSection1, failureMechanismSection2, failureMechanismSection3 }); // When - pipingFailureMechanismWithSections.NotifyObservers(); + failureMechanism.NotifyObservers(); // Then Assert.AreEqual(3, listBox.Items.Count); @@ -419,9 +419,9 @@ new Point3D(5.0, -5.0, 0.0) }); - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -481,7 +481,7 @@ } }; - pipingScenarioView.PipingFailureMechanism = pipingFailureMechanism; + pipingScenarioView.PipingFailureMechanism = failureMechanism; return pipingScenarioView; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb6b66dd18eb14bc0723da7aa10d81a8e14e5b645 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision b6b66dd18eb14bc0723da7aa10d81a8e14e5b645) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -1244,7 +1244,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var surfaceLine1 = new PipingSurfaceLine("Surface line 1") @@ -1276,7 +1276,7 @@ surfaceLine1, surfaceLine2 }; - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -1291,7 +1291,7 @@ }); var nodeData = new PipingCalculationGroupContext( - pipingFailureMechanism.CalculationsGroup, + failureMechanism.CalculationsGroup, null, surfaceLines, new[] @@ -1306,7 +1306,7 @@ new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile("B")) }) }, - pipingFailureMechanism, + failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -1336,10 +1336,10 @@ contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); // Then - PipingFailureMechanismSectionResult failureMechanismSectionResult1 = pipingFailureMechanism.SectionResults.First(); - PipingFailureMechanismSectionResult failureMechanismSectionResult2 = pipingFailureMechanism.SectionResults.ElementAt(1); + PipingFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First(); + PipingFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1); - PipingCalculationScenario[] pipingCalculationScenarios = pipingFailureMechanism.Calculations.OfType().ToArray(); + PipingCalculationScenario[] pipingCalculationScenarios = failureMechanism.Calculations.OfType().ToArray(); Assert.AreEqual(2, failureMechanismSectionResult1.GetCalculationScenarios(pipingCalculationScenarios).Count()); foreach (PipingCalculationScenario calculationScenario in failureMechanismSectionResult1.GetCalculationScenarios(pipingCalculationScenarios)) @@ -1360,7 +1360,7 @@ { var group = new CalculationGroup(); - var pipingFailureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var surfaceLine1 = new PipingSurfaceLine("Surface line 1") @@ -1392,7 +1392,7 @@ surfaceLine1, surfaceLine2 }; - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("Section 1", new List { @@ -1417,7 +1417,7 @@ new Point2D(5.0, 0.0) }) }, - pipingFailureMechanism, + failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -1432,9 +1432,9 @@ plugin.Gui = gui; // Precondition - foreach (PipingFailureMechanismSectionResult failureMechanismSectionResult in pipingFailureMechanism.SectionResults) + foreach (PipingFailureMechanismSectionResult failureMechanismSectionResult in failureMechanism.SectionResults) { - CollectionAssert.IsEmpty(failureMechanismSectionResult.GetCalculationScenarios(pipingFailureMechanism.Calculations.OfType())); + CollectionAssert.IsEmpty(failureMechanismSectionResult.GetCalculationScenarios(failureMechanism.Calculations.OfType())); } DialogBoxHandler = (name, wnd) => @@ -1453,9 +1453,9 @@ contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); // Then - foreach (PipingFailureMechanismSectionResult failureMechanismSectionResult in pipingFailureMechanism.SectionResults) + foreach (PipingFailureMechanismSectionResult failureMechanismSectionResult in failureMechanism.SectionResults) { - CollectionAssert.IsEmpty(failureMechanismSectionResult.GetCalculationScenarios(pipingFailureMechanism.Calculations.OfType())); + CollectionAssert.IsEmpty(failureMechanismSectionResult.GetCalculationScenarios(failureMechanism.Calculations.OfType())); } } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rb6b66dd18eb14bc0723da7aa10d81a8e14e5b645 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision b6b66dd18eb14bc0723da7aa10d81a8e14e5b645) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -823,8 +823,8 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new PipingCalculationScenario(new GeneralPipingInput()); - var pipingFailureMechanism = new TestPipingFailureMechanism(); - pipingFailureMechanism.SetSections(new[] + var failureMechanism = new TestPipingFailureMechanism(); + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("A", new[] { @@ -836,7 +836,7 @@ new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanism, + failureMechanism, assessmentSection); var mainWindow = mocks.DynamicMock(); @@ -935,7 +935,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var failureMechanism = new TestPipingFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -945,7 +945,7 @@ }, true); PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); - pipingFailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(failureMechanism, new[] { new FailureMechanismSection("A", new[] { @@ -957,7 +957,7 @@ new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanism, + failureMechanism, assessmentSection); var mainWindow = mocks.DynamicMock(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenariosViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenariosViewTest.cs (.../StabilityPointStructuresScenariosViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenariosViewTest.cs (.../StabilityPointStructuresScenariosViewTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Forms.Views; @@ -210,7 +211,7 @@ view.Data = failureMechanism.CalculationsGroup; view.FailureMechanism = failureMechanism; - view.FailureMechanism.SetSections(new[] + FailureMechanismTestHelper.SetSections(view.FailureMechanism, new[] { new FailureMechanismSection("SectionC", new[] { Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) @@ -87,7 +87,7 @@ .Select(failureMechanismSectionEntity => failureMechanismSectionEntity.Read(collector)) .ToArray(); - FailureMechanismTestHelper.SetSections(failureMechanism, readFailureMechanismSections, string.Empty); + failureMechanism.SetSections(readFailureMechanismSections, string.Empty); } private static void ReadForeshoreProfiles(this FailureMechanismEntity entity,