Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r9f936b0b29f490a024df02345df182133b1c041a -rda4a311b2ac60defe1a27a61c8d151f47268a941 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 9f936b0b29f490a024df02345df182133b1c041a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision da4a311b2ac60defe1a27a61c8d151f47268a941) @@ -563,25 +563,23 @@ var soilModels = new[] { - new MacroStabilityInwardsStochasticSoilModel("A") + new MacroStabilityInwardsStochasticSoilModel("A", new[] { - Geometry = - { - new Point2D(2, -1), - new Point2D(2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) } }, - new MacroStabilityInwardsStochasticSoilModel("C") + new MacroStabilityInwardsStochasticSoilModel("C", new[] { - Geometry = - { - new Point2D(-2, -1), - new Point2D(-2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) @@ -631,37 +629,34 @@ // Setup var soilModels = new[] { - new MacroStabilityInwardsStochasticSoilModel("A") + new MacroStabilityInwardsStochasticSoilModel("A", new[] { - Geometry = - { - new Point2D(2, -1), - new Point2D(2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) } }, - new MacroStabilityInwardsStochasticSoilModel("C") + new MacroStabilityInwardsStochasticSoilModel("C", new[] { - Geometry = - { - new Point2D(-2, -1), - new Point2D(-2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) } }, - new MacroStabilityInwardsStochasticSoilModel("E") + new MacroStabilityInwardsStochasticSoilModel("E", new[] { - Geometry = - { - new Point2D(6, -1), - new Point2D(6, 1) - }, + new Point2D(6, -1), + new Point2D(6, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) @@ -719,13 +714,12 @@ public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilInputs() { // Setup - var soilModel = new MacroStabilityInwardsStochasticSoilModel("A") + var soilModel = new MacroStabilityInwardsStochasticSoilModel("A", new[] { - Geometry = - { - new Point2D(2, -1), - new Point2D(2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) @@ -776,14 +770,11 @@ public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilModelInput() { // Setup - var soilModel = new MacroStabilityInwardsStochasticSoilModel("A") + var soilModel = new MacroStabilityInwardsStochasticSoilModel("A", new[] { - Geometry = - { - new Point2D(2, -1), - new Point2D(2, 1) - } - }; + new Point2D(2, -1), + new Point2D(2, 1) + }); MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); var calculation = new MacroStabilityInwardsCalculation @@ -861,25 +852,23 @@ var soilModels = new[] { - new MacroStabilityInwardsStochasticSoilModel("A") + new MacroStabilityInwardsStochasticSoilModel("A", new[] { - Geometry = - { - new Point2D(2, -1), - new Point2D(2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) } }, - new MacroStabilityInwardsStochasticSoilModel("C") + new MacroStabilityInwardsStochasticSoilModel("C", new[] { - Geometry = - { - new Point2D(-2, -1), - new Point2D(-2, 1) - }, + new Point2D(2, -1), + new Point2D(2, 1) + }) + { StochasticSoilProfiles = { new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D())