Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -r945a77ff5c6348980353e968411fcf1296908512 -r5d98c3072517f99bfc6f05a363ea5cf4d6025bd8 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 945a77ff5c6348980353e968411fcf1296908512) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 5d98c3072517f99bfc6f05a363ea5cf4d6025bd8) @@ -52,8 +52,10 @@ private const int waternetZonesDailyIndex = 15; private const int leftGridIndex = 16; private const int rightGridIndex = 17; - private const int slidingCurveIndex = 18; - private const int nrOfChartData = 19; + private const int slipPlaneIndex = 18; + private const int activeCircleRadiusIndex = 19; + private const int passiveCircleRadiusIndex = 20; + private const int nrOfChartData = 21; /// /// Asserts whether corresponds to the input of . @@ -92,8 +94,15 @@ (ChartPointData) actual.Collection.ElementAt(leftGridIndex)); MacroStabilityInwardsViewChartDataAssert.AssertGridChartData(calculationScenario.Output.SlipPlane.RightGrid, (ChartPointData) actual.Collection.ElementAt(rightGridIndex)); - AssertSlidingCurveChartData(calculationScenario.Output.SlidingCurve, - (ChartLineData) actual.Collection.ElementAt(slidingCurveIndex)); + AssertSlipPlaneChartData(calculationScenario.Output.SlidingCurve, + (ChartLineData) actual.Collection.ElementAt(slipPlaneIndex)); + + AssertCircleRadiusChartData(calculationScenario.Output.SlidingCurve.Slices.First().TopLeftPoint, + calculationScenario.Output.SlidingCurve.LeftCircle, + (ChartLineData) actual.Collection.ElementAt(activeCircleRadiusIndex)); + AssertCircleRadiusChartData(calculationScenario.Output.SlidingCurve.Slices.Last().TopRightPoint, + calculationScenario.Output.SlidingCurve.RightCircle, + (ChartLineData) actual.Collection.ElementAt(passiveCircleRadiusIndex)); } /// @@ -109,15 +118,21 @@ Assert.AreEqual(nrOfChartData, chartDataArray.Length); var leftGridData = (ChartPointData) chartDataArray[leftGridIndex]; var rightGridData = (ChartPointData) chartDataArray[rightGridIndex]; - var slidingCurveData = (ChartLineData) chartDataArray[slidingCurveIndex]; + 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(slidingCurveData.Points); + 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("Glijcirkel", slidingCurveData.Name); + Assert.AreEqual("Glijvlak", slipPlaneData.Name); + Assert.AreEqual("Radius actieve cirkel", activeCircleRadiusData.Name); + Assert.AreEqual("Radius passieve cirkel", passiveCircleRadiusData.Name); } /// @@ -177,6 +192,27 @@ } /// + /// Asserts whether corresponds to . + /// + /// The point to use for the start of the line + /// The circle to use for the end of the line. + /// The actual . + /// Thrown when + /// does not correspond to the specified start and end points. + private static void AssertCircleRadiusChartData(Point2D startingPoint, + MacroStabilityInwardsSlidingCircle slidingCircle, + ChartLineData actual) + { + var points = new[] + { + slidingCircle.Center, + startingPoint + }; + + CollectionAssert.AreEqual(points, actual.Points); + } + + /// /// Asserts whether contains empty data and /// empty soil layer chart data. /// @@ -202,7 +238,7 @@ /// The actual . /// Thrown when /// does not correspond to . - private static void AssertSlidingCurveChartData(MacroStabilityInwardsSlidingCurve original, ChartLineData actual) + private static void AssertSlipPlaneChartData(MacroStabilityInwardsSlidingCurve original, ChartLineData actual) { List expectedPoints; if (original.Slices.Any())