Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs =================================================================== diff -u -r67846d2c26e292748851a4ecbee2a050ffffa721 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs (.../FailureMechanismSectionsViewTest.cs) (revision 67846d2c26e292748851a4ecbee2a050ffffa721) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs (.../FailureMechanismSectionsViewTest.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -187,7 +187,7 @@ // When FailureMechanismTestHelper.SetSections(failureMechanism, new[] { - CreateFailureMechanismSection("b") + FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); failureMechanism.NotifyObservers(); Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs =================================================================== diff -u -ra90ecfec7dc128234360d4a55ee646928c133b75 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision a90ecfec7dc128234360d4a55ee646928c133b75) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -47,6 +47,8 @@ [TestFixture] public class TestDataGeneratorTest { + private static string pathToSections = "path/to/sections"; + [Test] public void GetAssessmentSectionWithAllCalculationConfigurations_DefaultComposition_ReturnsWithAllPossibleCalculationConfigurations() { @@ -174,7 +176,7 @@ }, assessmentSection.ReferenceLine.Points); IEnumerable failureMechanisms = assessmentSection.GetFailureMechanisms(); - for (int i = 0; i < failureMechanisms.Count(); i++) + for (var i = 0; i < failureMechanisms.Count(); i++) { AssertHasFailureMechanismSections(failureMechanisms.ElementAt(i), i); } @@ -379,6 +381,7 @@ { IEnumerable sections = failureMechanism.Sections; Assert.AreEqual(2, sections.Count()); + Assert.AreEqual(pathToSections, failureMechanism.FailureMechanismSectionSourcePath); var failureMechanismHasSectionResults = failureMechanism as IHasSectionResults; if (failureMechanismHasSectionResults != null) @@ -391,6 +394,7 @@ { IEnumerable sections = failureMechanism.Sections; Assert.AreEqual(sectionsCount, sections.Count()); + Assert.AreEqual(pathToSections, failureMechanism.FailureMechanismSectionSourcePath); var startPoint = new Point2D(-1, -1); var endPoint = new Point2D(15, 15); Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -ra90ecfec7dc128234360d4a55ee646928c133b75 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision a90ecfec7dc128234360d4a55ee646928c133b75) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -54,6 +54,8 @@ /// public static class TestDataGenerator { + private const string pathToSections = "path/to/sections"; + /// /// Gets a fully configured with a desired and /// with all possible configurations for the parent and nested calculations of the failure mechanisms. @@ -1062,11 +1064,11 @@ new Point2D(5, 5), new Point2D(15, 15) }); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] + failureMechanism.SetSections(new[] { section1, section2 - }); + }, pathToSections); } private static void AddFailureMechanismSections(IFailureMechanism failureMechanism, int numberOfSections) @@ -1089,7 +1091,7 @@ startPoint = endPoint; } - FailureMechanismTestHelper.SetSections(failureMechanism, sections); + failureMechanism.SetSections(sections, pathToSections); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -rc70132b60d5cf87d12af98447ed9b7ebb69b52e1 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision c70132b60d5cf87d12af98447ed9b7ebb69b52e1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -527,11 +527,11 @@ new Point2D(5, 5), new Point2D(15, 15) }); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] + failureMechanism.SetSections(new[] { section1, section2 - }); + }, "path/to/sections"); } /// Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs (.../MacroStabilityInwardsTestDataGeneratorHelper.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs (.../MacroStabilityInwardsTestDataGeneratorHelper.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -101,6 +101,7 @@ int sectionsCount = sections.Count(); Assert.AreEqual(2, sectionsCount); Assert.AreEqual(sectionsCount, failureMechanism.SectionResults.Count()); + Assert.AreEqual("path/to/sections", failureMechanism.FailureMechanismSectionSourcePath); } private static void AssertCalculationGroupWithOutput(IEnumerable children) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r0d301f769dc84d57979a55d902c498afe5d93e19 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsFailureMechanism.cs (.../TestMacroStabilityInwardsFailureMechanism.cs) (revision 0d301f769dc84d57979a55d902c498afe5d93e19) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsFailureMechanism.cs (.../TestMacroStabilityInwardsFailureMechanism.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -21,7 +21,6 @@ using Core.Common.Base.Geometry; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil @@ -67,14 +66,14 @@ MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel() }, "path/to/stochasticSoilModels"); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] + failureMechanism.SetSections(new[] { new FailureMechanismSection("Section", new[] { new Point2D(0.0, 0.0), new Point2D(5.0, 0.0) }) - }); + }, "path/to/sections"); return failureMechanism; } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -25,7 +25,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Geometry; using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.ContextMenu; @@ -39,7 +38,6 @@ using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; using Ringtoets.MacroStabilityInwards.Data; @@ -424,14 +422,6 @@ { var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0) - }) - }); - var assessmentSection = new AssessmentSectionStub(); var calculationContext = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), @@ -547,13 +537,6 @@ }, true); MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(hydraulicBoundaryLocation); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0) - }) - }); var calculationContext = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs =================================================================== diff -u -r775a5c80cac9b66fbfd3cd4c05a54df37632ad7e -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 775a5c80cac9b66fbfd3cd4c05a54df37632ad7e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -412,11 +412,11 @@ new Point2D(5, 5), new Point2D(15, 15) }); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] + failureMechanism.SetSections(new[] { section1, section2 - }); + }, "path/to/sections"); } /// Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs =================================================================== diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs (.../PipingTestDataGeneratorHelper.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs (.../PipingTestDataGeneratorHelper.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -101,6 +101,7 @@ int sectionsCount = sections.Count(); Assert.AreEqual(2, sectionsCount); Assert.AreEqual(sectionsCount, failureMechanism.SectionResults.Count()); + Assert.AreEqual("path/to/sections", failureMechanism.FailureMechanismSectionSourcePath); } private static void AssertPipingCalculationGroupWithOutput(IEnumerable children) Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs =================================================================== diff -u -r0d301f769dc84d57979a55d902c498afe5d93e19 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs (.../TestPipingFailureMechanism.cs) (revision 0d301f769dc84d57979a55d902c498afe5d93e19) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs (.../TestPipingFailureMechanism.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -21,7 +21,6 @@ using Core.Common.Base.Geometry; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Data.TestUtil @@ -67,14 +66,14 @@ PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel() }, "path/to/stochasticSoilModels"); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] + failureMechanism.SetSections(new[] { new FailureMechanismSection("Section", new[] { new Point2D(0.0, 0.0), new Point2D(5.0, 0.0) }) - }); + }, "path/to/sections"); return failureMechanism; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r63cc10a9033c4da20c993fa59ce51c10caca3bd9 -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 63cc10a9033c4da20c993fa59ce51c10caca3bd9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -40,7 +40,6 @@ using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; using Ringtoets.Piping.Data; @@ -824,13 +823,6 @@ { var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new TestPipingFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0) - }) - }); var assessmentSection = new AssessmentSectionStub(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -945,13 +937,6 @@ }, true); PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0) - }) - }); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, new CalculationGroup(), Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -ra100a49622ba13deb720c2c881906e890cb8094e -r255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision a100a49622ba13deb720c2c881906e890cb8094e) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 255c3784c93b4c7a3ecd9d5b5bcdec9aa1ae4f7b) @@ -27,7 +27,6 @@ using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.Commands; @@ -42,7 +41,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; @@ -544,14 +542,6 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0), - new Point2D(1, 1) - }) - }); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); @@ -604,15 +594,6 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0), - new Point2D(1, 1) - }) - }); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); @@ -665,15 +646,6 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0), - new Point2D(1, 1) - }) - }); - var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase { @@ -995,15 +967,6 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0), - new Point2D(1, 1) - }) - }); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); var random = new Random(21); @@ -1373,15 +1336,6 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - FailureMechanismTestHelper.SetSections(failureMechanism, new[] - { - new FailureMechanismSection("A", new[] - { - new Point2D(0, 0), - new Point2D(1, 1) - }) - }); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup();