Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -r616947b29acab4b6384abc1c29a61eaf349c7745 -r9cb9840fac1e471c77fde363c7aa51121c1f089a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 616947b29acab4b6384abc1c29a61eaf349c7745) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 9cb9840fac1e471c77fde363c7aa51121c1f089a) @@ -29,7 +29,8 @@ namespace Ringtoets.MacroStabilityInwards.Forms.TestUtil { /// - /// Class for asserting chart data. + /// Class for asserting chart data in the macro stability + /// inwards output view. /// public static class MacroStabilityInwardsOutputViewChartDataAssert { @@ -63,8 +64,8 @@ ChartDataCollection actual) { Assert.AreEqual(nrOfChartData, actual.Collection.Count()); - AssertSurfaceLineChartData(surfaceLine, actual.Collection.ElementAt(surfaceLineIndex)); - AssertSoilProfileChartData(stochasticSoilProfile, actual.Collection.ElementAt(soilProfileIndex), true); + MacroStabilityInwardsViewChartDataAssert.AssertSurfaceLineChartData(surfaceLine, actual.Collection.ElementAt(surfaceLineIndex)); + MacroStabilityInwardsViewChartDataAssert.AssertSoilProfileChartData(stochasticSoilProfile, actual.Collection.ElementAt(soilProfileIndex), true); } /// @@ -135,51 +136,5 @@ Assert.AreEqual("Kruin buitentalud", dikeTopAtRiverData.Name); Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); } - - /// - /// Asserts whether corresponds to . - /// - /// The original . - /// The actual . - /// Thrown when - /// does not correspond to . - private static void AssertSurfaceLineChartData(MacroStabilityInwardsSurfaceLine original, ChartData actual) - { - Assert.IsInstanceOf(actual); - var surfaceLineChartData = (ChartLineData) actual; - - Assert.AreEqual(original.Points.Length, surfaceLineChartData.Points.Length); - CollectionAssert.AreEqual(original.LocalGeometry, surfaceLineChartData.Points); - Assert.AreEqual(original.Name, actual.Name); - } - - /// - /// Asserts whether corresponds to . - /// - /// The original . - /// The actual . - /// Indicator whether areas are present. - /// Thrown when - /// does not correspond to . - private static void AssertSoilProfileChartData(MacroStabilityInwardsStochasticSoilProfile original, ChartData actual, bool mapDataShouldContainAreas) - { - Assert.IsInstanceOf(actual); - var soilProfileChartData = (ChartDataCollection) actual; - - int expectedLayerCount = original.SoilProfile.Layers.Count(); - Assert.AreEqual(expectedLayerCount + 1, soilProfileChartData.Collection.Count()); - Assert.AreEqual(original.SoilProfile.Name, soilProfileChartData.Name); - - string[] soilLayers = original.SoilProfile.Layers.Select((l, i) => $"{i + 1} {l.Data.MaterialName}").Reverse().ToArray(); - - for (var i = 0; i < expectedLayerCount; i++) - { - var chartMultipleAreaData = soilProfileChartData.Collection.ElementAt(i) as ChartMultipleAreaData; - - Assert.IsNotNull(chartMultipleAreaData); - Assert.AreEqual(soilLayers[i], chartMultipleAreaData.Name); - Assert.AreEqual(mapDataShouldContainAreas, chartMultipleAreaData.Areas.Any()); - } - } } } \ No newline at end of file