Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -rc81e1e49ed420fe82a877bd1f8b29948ad3ccf0b -r0b9a49c38d6a29225f3d5982337d68c03c2d878f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision c81e1e49ed420fe82a877bd1f8b29948ad3ccf0b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 0b9a49c38d6a29225f3d5982337d68c03c2d878f) @@ -215,7 +215,7 @@ } [Test] - public void Data_WithSurfaceLineAndSoilProfile1D_DataUpdatedToCollectionOfFilledChartData() + public void Data_WithSurfaceLineAndStochasticSoilProfile1D_DataUpdatedToCollectionOfFilledChartData() { // Setup using (var view = new MacroStabilityInwardsInputView()) @@ -244,7 +244,7 @@ } [Test] - public void Data_WithSurfaceLineAndSoilProfile2D_DataUpdatedToCollectionOfFilledChartData() + public void Data_WithSurfaceLineAndStochasticSoilProfile2D_DataUpdatedToCollectionOfFilledChartData() { // Setup using (var view = new MacroStabilityInwardsInputView()) @@ -522,10 +522,9 @@ var surfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; var leftGridData = (ChartPointData) chartDataList[updatedLeftGridIndex]; var rightGridData = (ChartPointData) chartDataList[updatedRightGridIndex]; - var waternetZoneExtremeData = (ChartDataCollection) chartDataList[updatedWaternetZonesExtremeIndex]; - var waternetZoneDailyeData = (ChartDataCollection) chartDataList[updatedWaternetZonesDailyIndex]; + var waternetZonesExtremeData = (ChartDataCollection) chartDataList[updatedWaternetZonesExtremeIndex]; + var waternetZonesDailyData = (ChartDataCollection) chartDataList[updatedWaternetZonesDailyIndex]; - Assert.AreEqual("Profielschematisatie", surfaceLineData.Name); Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name); Assert.AreEqual("Maaiveld binnenwaarts", surfaceLevelInsideData.Name); @@ -542,8 +541,8 @@ Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); Assert.AreEqual("Linker grid", leftGridData.Name); Assert.AreEqual("Rechter grid", rightGridData.Name); - Assert.AreEqual("Zones extreem", waternetZoneExtremeData.Name); - Assert.AreEqual("Zones dagelijks", waternetZoneDailyeData.Name); + Assert.AreEqual("Zones extreem", waternetZonesExtremeData.Name); + Assert.AreEqual("Zones dagelijks", waternetZonesDailyData.Name); MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); calculation.InputParameters.SurfaceLine = surfaceLine; @@ -570,8 +569,8 @@ var actualSurfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; var actualLeftGridData = (ChartPointData) chartDataList[updatedLeftGridIndex]; var actualRightGridData = (ChartPointData) chartDataList[updatedRightGridIndex]; - var actualWaternetZoneExtremeData = (ChartDataCollection) chartDataList[updatedWaternetZonesExtremeIndex]; - var actualWaternetZoneDailyeData = (ChartDataCollection) chartDataList[updatedWaternetZonesDailyIndex]; + var actualWaternetZonesExtremeData = (ChartDataCollection) chartDataList[updatedWaternetZonesExtremeIndex]; + var actualWaternetZonesDailyData = (ChartDataCollection) chartDataList[updatedWaternetZonesDailyIndex]; Assert.AreEqual(surfaceLine.Name, actualSurfaceLineData.Name); Assert.AreEqual("Ondergrondschematisatie", actualSoilProfileData.Name); @@ -589,8 +588,8 @@ Assert.AreEqual("Maaiveld buitenwaarts", actualSurfaceLevelOutsideData.Name); Assert.AreEqual("Linker grid", actualLeftGridData.Name); Assert.AreEqual("Rechter grid", actualRightGridData.Name); - Assert.AreEqual("Zones extreem", actualWaternetZoneExtremeData.Name); - Assert.AreEqual("Zones dagelijks", actualWaternetZoneDailyeData.Name); + Assert.AreEqual("Zones extreem", actualWaternetZonesExtremeData.Name); + Assert.AreEqual("Zones dagelijks", actualWaternetZonesDailyData.Name); } } @@ -859,7 +858,7 @@ private static MacroStabilityInwardsStochasticSoilProfile GetStochasticSoilProfile2D() { - return new MacroStabilityInwardsStochasticSoilProfile(0.5, new MacroStabilityInwardsSoilProfile2D("profile 2D", new[] + var layers = new[] { new MacroStabilityInwardsSoilLayer2D(new Ring(new List { @@ -877,7 +876,29 @@ }), new List()) { Data = new MacroStabilityInwardsSoilLayerData(), - NestedLayers = Enumerable.Empty() + NestedLayers = new[] + { + new MacroStabilityInwardsSoilLayer2D(new Ring(new List + { + new Point2D(4.0, 2.0), + new Point2D(0.0, 2.5) + }), new List()) + { + Data = new MacroStabilityInwardsSoilLayerData(), + NestedLayers = new[] + { + new MacroStabilityInwardsSoilLayer2D(new Ring(new List + { + new Point2D(4.0, 2.0), + new Point2D(0.0, 2.5) + }), new List()) + { + Data = new MacroStabilityInwardsSoilLayerData(), + NestedLayers = Enumerable.Empty() + } + } + } + } }, new MacroStabilityInwardsSoilLayer2D(new Ring(new List { @@ -888,10 +909,14 @@ Data = new MacroStabilityInwardsSoilLayerData(), NestedLayers = Enumerable.Empty() } - }, new List())); + }; + + return new MacroStabilityInwardsStochasticSoilProfile(0.5, new MacroStabilityInwardsSoilProfile2D("profile 2D", + layers, + new List())); } - private static MacroStabilityInwardsSurfaceLine GetSurfaceLineWithGeometry() + MacroStabilityInwardsSurfaceLine GetSurfaceLineWithGeometry() { var points = new[] { @@ -902,7 +927,7 @@ return GetSurfaceLine(points); } - private static MacroStabilityInwardsSurfaceLine GetSecondSurfaceLineWithGeometry() + MacroStabilityInwardsSurfaceLine GetSecondSurfaceLineWithGeometry() { var points = new[] { @@ -913,7 +938,7 @@ return GetSurfaceLine(points); } - private static MacroStabilityInwardsSurfaceLine GetSurfaceLine(Point3D[] points) + MacroStabilityInwardsSurfaceLine GetSurfaceLine(Point3D[] points) { var surfaceLine = new MacroStabilityInwardsSurfaceLine("Surface line name"); surfaceLine.SetGeometry(points);