Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -rb13759ad077f9e2b4104de000b5bdeafa9abe358 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision a20f5008f39cfa4fd6f94572fd07a011f76609f4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision b13759ad077f9e2b4104de000b5bdeafa9abe358) @@ -860,8 +860,10 @@ MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D(); var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile); MacroStabilityInwardsStochasticSoilModel stochasticSoilModel = - MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("StochasticSoilModelName"); - stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("StochasticSoilModelName", new[] + { + stochasticSoilProfile + }); var calculationItem = new MacroStabilityInwardsCalculationScenario { @@ -1087,38 +1089,29 @@ { new Point2D(2, -1), new Point2D(2, 1) - }) + }, new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile( - 0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }, + new MacroStabilityInwardsStochasticSoilProfile( + 0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) + }), new MacroStabilityInwardsStochasticSoilModel("C", new[] { new Point2D(-2, -1), new Point2D(-2, 1) - }) + }, new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile( - 0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }, + new MacroStabilityInwardsStochasticSoilProfile( + 0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) + }), new MacroStabilityInwardsStochasticSoilModel("E", new[] { new Point2D(6, -1), new Point2D(6, 1) - }) + }, new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile( - 0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - } + new MacroStabilityInwardsStochasticSoilProfile( + 0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) + }) }; failureMechanism.StochasticSoilModels.AddRange(soilModels, "path"); var calculation = new MacroStabilityInwardsCalculationScenario @@ -1186,10 +1179,10 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); MacroStabilityInwardsStochasticSoilModel model = - MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A"); - model.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile( - 1.0, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - ); + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A", new[] + { + new MacroStabilityInwardsStochasticSoilProfile(1.0, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) + }); var calculation = new MacroStabilityInwardsCalculationScenario { @@ -1620,13 +1613,15 @@ private static MacroStabilityInwardsStochasticSoilModel ValidStochasticSoilModel(double xMin, double xMax) { + MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D(); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName", new[] { new Point2D(xMin, 1.0), new Point2D(xMax, 0.0) + }, new[] + { + new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile) }); - MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D(); - stochasticSoilModel.StochasticSoilProfiles.Add(new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile)); return stochasticSoilModel; }