Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -r6168b610057e59ea1ae81d7474ec799a494297bd -rcac3045aae8af73cbc3602a1c38b071385aa3581 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 6168b610057e59ea1ae81d7474ec799a494297bd) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision cac3045aae8af73cbc3602a1c38b071385aa3581) @@ -52,10 +52,11 @@ private const int waternetZonesDailyIndex = 15; private const int leftGridIndex = 16; private const int rightGridIndex = 17; - private const int slipPlaneIndex = 18; - private const int activeCircleRadiusIndex = 19; - private const int passiveCircleRadiusIndex = 20; - private const int nrOfChartData = 21; + private const int slicesIndex = 18; + private const int slipPlaneIndex = 19; + private const int activeCircleRadiusIndex = 20; + private const int passiveCircleRadiusIndex = 21; + private const int nrOfChartData = 22; /// /// Asserts whether corresponds to the input of . @@ -94,6 +95,10 @@ (ChartPointData) actual.Collection.ElementAt(leftGridIndex)); MacroStabilityInwardsViewChartDataAssert.AssertGridChartData(calculationScenario.Output.SlipPlane.RightGrid, (ChartPointData) actual.Collection.ElementAt(rightGridIndex)); + + AssertSlicesChartData(calculationScenario.Output.SlidingCurve.Slices, + (ChartMultipleAreaData) actual.Collection.ElementAt(slicesIndex)); + AssertSlipPlaneChartData(calculationScenario.Output.SlidingCurve, (ChartLineData) actual.Collection.ElementAt(slipPlaneIndex)); @@ -118,18 +123,21 @@ Assert.AreEqual(nrOfChartData, chartDataArray.Length); var leftGridData = (ChartPointData) chartDataArray[leftGridIndex]; var rightGridData = (ChartPointData) chartDataArray[rightGridIndex]; + var slicesData = (ChartMultipleAreaData) chartDataArray[slicesIndex]; var slipPlaneData = (ChartLineData) chartDataArray[slipPlaneIndex]; var activeCircleRadiusData = (ChartLineData) chartDataArray[activeCircleRadiusIndex]; var passiveCircleRadiusData = (ChartLineData) chartDataArray[passiveCircleRadiusIndex]; CollectionAssert.IsEmpty(leftGridData.Points); CollectionAssert.IsEmpty(rightGridData.Points); + CollectionAssert.IsEmpty(slicesData.Areas); CollectionAssert.IsEmpty(slipPlaneData.Points); CollectionAssert.IsEmpty(activeCircleRadiusData.Points); CollectionAssert.IsEmpty(passiveCircleRadiusData.Points); Assert.AreEqual("Linker grid", leftGridData.Name); Assert.AreEqual("Rechter grid", rightGridData.Name); + Assert.AreEqual("Lamellen", slicesData.Name); Assert.AreEqual("Glijvlak", slipPlaneData.Name); Assert.AreEqual("Radius actieve cirkel", activeCircleRadiusData.Name); Assert.AreEqual("Radius passieve cirkel", passiveCircleRadiusData.Name); @@ -192,6 +200,31 @@ } /// + /// Asserts whether corresponds to . + /// + /// The original slices. + /// The actual . + /// Thrown when + /// does not correspond to . + private static void AssertSlicesChartData(IEnumerable slices, ChartMultipleAreaData actual) + { + MacroStabilityInwardsSlice[] macroStabilityInwardsSlices = slices.ToArray(); + CollectionAssert.IsNotEmpty(macroStabilityInwardsSlices); + for (var i = 0; i < macroStabilityInwardsSlices.Length; i++) + { + MacroStabilityInwardsSlice slice = macroStabilityInwardsSlices[i]; + var expectedPoints = new[] + { + slice.TopLeftPoint, + slice.TopRightPoint, + slice.BottomRightPoint, + slice.BottomLeftPoint + }; + CollectionAssert.AreEqual(expectedPoints, actual.Areas.ElementAt(i)); + } + } + + /// /// Asserts whether corresponds to /// and . ///