Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -rb13759ad077f9e2b4104de000b5bdeafa9abe358 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision a20f5008f39cfa4fd6f94572fd07a011f76609f4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision b13759ad077f9e2b4104de000b5bdeafa9abe358) @@ -563,28 +563,16 @@ var soilModels = new[] { - new MacroStabilityInwardsStochasticSoilModel("A", new[] + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A", new[] { new Point2D(2, -1), new Point2D(2, 1) - }) + }), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("C", new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }, - new MacroStabilityInwardsStochasticSoilModel("C", new[] - { new Point2D(-2, -1), new Point2D(-2, 1) }) - { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - } }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); @@ -629,39 +617,21 @@ // Setup var soilModels = new[] { - new MacroStabilityInwardsStochasticSoilModel("A", new[] + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A", new[] { new Point2D(2, -1), new Point2D(2, 1) - }) + }), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("C", new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }, - new MacroStabilityInwardsStochasticSoilModel("C", new[] - { new Point2D(-2, -1), new Point2D(-2, 1) - }) + }), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("E", new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }, - new MacroStabilityInwardsStochasticSoilModel("E", new[] - { new Point2D(6, -1), new Point2D(6, 1) }) - { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - } }; MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); @@ -718,13 +688,10 @@ { new Point2D(2, -1), new Point2D(2, 1) - }) + }, new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }; + new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) + }); MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); var calculation = new MacroStabilityInwardsCalculation @@ -733,7 +700,7 @@ { SurfaceLine = surfaceLine, StochasticSoilModel = soilModel, - StochasticSoilProfile = soilModel.StochasticSoilProfiles[0] + StochasticSoilProfile = soilModel.StochasticSoilProfiles.ElementAt(0) } }; @@ -763,18 +730,19 @@ }, affectedObjects); Assert.IsNull(calculationInput.SurfaceLine); Assert.AreSame(soilModel, calculationInput.StochasticSoilModel); - Assert.AreSame(soilModel.StochasticSoilProfiles[0], calculationInput.StochasticSoilProfile); + Assert.AreSame(soilModel.StochasticSoilProfiles.ElementAt(0), calculationInput.StochasticSoilProfile); } [Test] public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilModelInput() { // Setup - var soilModel = new MacroStabilityInwardsStochasticSoilModel("A", new[] - { - new Point2D(2, -1), - new Point2D(2, 1) - }); + MacroStabilityInwardsStochasticSoilModel soilModel = + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A", new[] + { + new Point2D(2, -1), + new Point2D(2, 1) + }); MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); var calculation = new MacroStabilityInwardsCalculation @@ -852,28 +820,16 @@ var soilModels = new[] { - new MacroStabilityInwardsStochasticSoilModel("A", new[] + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A", new[] { new Point2D(2, -1), new Point2D(2, 1) - }) + }), + MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("C", new[] { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.2, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - }, - new MacroStabilityInwardsStochasticSoilModel("C", new[] - { new Point2D(-2, -1), new Point2D(-2, 1) }) - { - StochasticSoilProfiles = - { - new MacroStabilityInwardsStochasticSoilProfile(0.3, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D()) - } - } }; var failureMechanism = new MacroStabilityInwardsFailureMechanism();