Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r187efa574b622ec8fd7d3f82f367974e17dbf138 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 187efa574b622ec8fd7d3f82f367974e17dbf138) @@ -46,7 +46,9 @@ private const int dikeToeAtRiverIndex = 11; private const int dikeTopAtRiverIndex = 12; private const int surfaceLevelOutsideIndex = 13; - private const int nrOfChartData = 14; + private const int waternetZonesExtremeIndex = 14; + private const int waternetZonesDailyIndex = 15; + private const int nrOfChartData = 16; /// /// Asserts whether corresponds to . @@ -63,28 +65,64 @@ calculationScenario.InputParameters.StochasticSoilProfile.SoilProfile.Name, true, actual.Collection.ElementAt(soilProfileIndex)); + + MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculationScenario.InputParameters.WaternetExtreme, + (ChartDataCollection) actual.Collection.ElementAt(waternetZonesExtremeIndex)); + MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculationScenario.InputParameters.WaternetDaily, + (ChartDataCollection) actual.Collection.ElementAt(waternetZonesDailyIndex)); } /// - /// Asserts whether contains empty data without - /// any soil layer chart data. + /// Asserts whether contains empty data, + /// empty soil layer chart data and empty waternet chart data. /// /// The actual . /// Thrown when: /// /// is not empty; - /// the soil profile chart data contains chart data. + /// a soil layer chart data contains data; + /// a waternet layer chart data contains data. /// /// - public static void AssertEmptyChartDataWithoutSoilLayerData(ChartDataCollection chartDataCollection) + public static void AssertEmptyChartDataWithEmptySoilLayerAndWithWaternetChartData(ChartDataCollection chartDataCollection) { - var soilProfileData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(soilProfileIndex); - CollectionAssert.IsEmpty(soilProfileData.Collection); - AssertEmptyChartData(chartDataCollection); + var waternetExtremeData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(waternetZonesExtremeIndex); + var waternetDailyData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(waternetZonesDailyIndex); + + CollectionAssert.IsNotEmpty(waternetExtremeData.Collection); + CollectionAssert.IsNotEmpty(waternetDailyData.Collection); + + Assert.IsFalse(waternetExtremeData.Collection.Any(c => c.HasData)); + Assert.IsFalse(waternetDailyData.Collection.Any(c => c.HasData)); + + AssertEmptyChartDataWithEmptySoilLayerChartData(chartDataCollection); } /// /// Asserts whether contains empty data and + /// empty soil layer chart data and no waternet chart data. + /// + /// The actual . + /// Thrown when: + /// + /// is not empty; + /// a soil layer chart data contains data; + /// a waternet layer is present. + /// + /// + public static void AssertEmptyChartDataWithEmptySoilLayerAndEmptyWaternetChartData(ChartDataCollection chartDataCollection) + { + var waternetExtremeData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(waternetZonesExtremeIndex); + var waternetDailyData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(waternetZonesDailyIndex); + + CollectionAssert.IsEmpty(waternetExtremeData.Collection); + CollectionAssert.IsEmpty(waternetDailyData.Collection); + + AssertEmptyChartDataWithEmptySoilLayerChartData(chartDataCollection); + } + + /// + /// Asserts whether contains empty data and /// empty soil layer chart data. /// /// The actual . @@ -94,7 +132,7 @@ /// a soil layer chart data contains data. /// /// - public static void AssertEmptyChartDataWithEmptySoilLayerChartData(ChartDataCollection chartDataCollection) + private static void AssertEmptyChartDataWithEmptySoilLayerChartData(ChartDataCollection chartDataCollection) { var soilProfileData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(soilProfileIndex); CollectionAssert.IsNotEmpty(soilProfileData.Collection); @@ -130,6 +168,8 @@ var dikeToeAtRiverData = (ChartPointData) chartDataArray[dikeToeAtRiverIndex]; var dikeTopAtRiverData = (ChartPointData) chartDataArray[dikeTopAtRiverIndex]; var surfaceLevelOutsideData = (ChartPointData) chartDataArray[surfaceLevelOutsideIndex]; + var waternetZonesExtremeData = (ChartDataCollection) chartDataArray[waternetZonesExtremeIndex]; + var waternetZonesDailyData = (ChartDataCollection) chartDataArray[waternetZonesDailyIndex]; CollectionAssert.IsEmpty(surfaceLineData.Points); CollectionAssert.IsEmpty(surfaceLevelInsideData.Points); @@ -159,6 +199,8 @@ Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); Assert.AreEqual("Kruin buitentalud", dikeTopAtRiverData.Name); Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); + Assert.AreEqual("Zones extreem", waternetZonesExtremeData.Name); + Assert.AreEqual("Zones dagelijks", waternetZonesDailyData.Name); } } } \ No newline at end of file