Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs
===================================================================
diff -u -rcac3045aae8af73cbc3602a1c38b071385aa3581 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision cac3045aae8af73cbc3602a1c38b071385aa3581)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -61,10 +61,11 @@
/// Create a for a waternet zone.
///
/// The name of the zone.
+ /// The default visibility of the zone.
/// The created .
/// Thrown when
/// is null.
- public static ChartMultipleAreaData CreateWaternetZoneChartData(string name)
+ public static ChartMultipleAreaData CreateWaternetZoneChartData(string name, bool isVisible)
{
if (name == null)
{
@@ -76,17 +77,21 @@
StrokeThickness = 0,
FillColor = Color.FromArgb(60, Color.DeepSkyBlue),
IsEditable = true
- });
+ })
+ {
+ IsVisible = isVisible
+ };
}
///
/// Create a for a phreatic line.
///
/// The name of the line.
+ /// The default visibility of the line.
/// The created .
/// Thrown when
/// is null.
- public static ChartLineData CreatePhreaticLineChartData(string name)
+ public static ChartLineData CreatePhreaticLineChartData(string name, bool isVisible)
{
if (name == null)
{
@@ -98,7 +103,10 @@
Color = Color.Blue,
DashStyle = ChartLineDashStyle.Solid,
Width = 2
- });
+ })
+ {
+ IsVisible = isVisible
+ };
}
///
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs
===================================================================
diff -u -rb2b200315a083c291be715da833f87b0247a4050 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision b2b200315a083c291be715da833f87b0247a4050)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -243,14 +243,14 @@
foreach (MacroStabilityInwardsPhreaticLine phreaticLine in waternet.PhreaticLines)
{
- ChartLineData phreaticLineChartData = MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(phreaticLine.Name);
+ ChartLineData phreaticLineChartData = MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(phreaticLine.Name, true);
phreaticLineChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreatePhreaticLinePoints(phreaticLine);
chartData.Add(phreaticLineChartData);
}
foreach (MacroStabilityInwardsWaternetLine waternetLine in waternet.WaternetLines)
{
- ChartMultipleAreaData waternetLineChartData = MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(waternetLine.Name);
+ ChartMultipleAreaData waternetLineChartData = MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(waternetLine.Name, true);
waternetLineChartData.Areas = MacroStabilityInwardsChartDataPointsFactory.CreateWaternetZonePoints(waternetLine, surfaceLine);
chartData.Add(waternetLineChartData);
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs
===================================================================
diff -u -rcac3045aae8af73cbc3602a1c38b071385aa3581 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision cac3045aae8af73cbc3602a1c38b071385aa3581)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -355,14 +355,14 @@
foreach (MacroStabilityInwardsPhreaticLine phreaticLine in waternet.PhreaticLines)
{
- ChartLineData phreaticLineChartData = MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(phreaticLine.Name);
+ ChartLineData phreaticLineChartData = MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(phreaticLine.Name, false);
chartData.Add(phreaticLineChartData);
phreaticLineLookup.Add(phreaticLine, phreaticLineChartData);
}
foreach (MacroStabilityInwardsWaternetLine waternetLine in waternet.WaternetLines)
{
- ChartMultipleAreaData waternetLineChartData = MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(waternetLine.Name);
+ ChartMultipleAreaData waternetLineChartData = MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(waternetLine.Name, false);
chartData.Add(waternetLineChartData);
waternetLineLookup.Add(waternetLine, waternetLineChartData);
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs
===================================================================
diff -u -rcac3045aae8af73cbc3602a1c38b071385aa3581 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision cac3045aae8af73cbc3602a1c38b071385aa3581)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -21,6 +21,7 @@
using System;
using System.Drawing;
+using Core.Common.TestUtil;
using Core.Components.Chart.Data;
using Core.Components.Chart.Styles;
using NUnit.Framework;
@@ -60,51 +61,57 @@
public void CreateWaternetZoneChartData_NameNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(null);
+ TestDelegate call = () => MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(null, new Random(21).NextBoolean());
// Assert
var exception = Assert.Throws(call);
Assert.AreEqual("name", exception.ParamName);
}
[Test]
- public void CreateWaternetZoneChartData_ReturnsEmptyChartAreaData()
+ [TestCase(true)]
+ [TestCase(false)]
+ public void CreateWaternetZoneChartData_WithVisibility_ReturnsEmptyChartLineDataWithExpectedVisibility(bool isVisible)
{
// Setup
const string name = "zone";
// Call
- ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(name);
+ ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateWaternetZoneChartData(name, isVisible);
// Assert
CollectionAssert.IsEmpty(data.Areas);
Assert.AreEqual(name, data.Name);
+ Assert.AreEqual(isVisible, data.IsVisible);
AssertEqualStyle(data.Style, Color.FromArgb(60, Color.DeepSkyBlue), Color.Empty, 0, true);
}
[Test]
public void CreatePhreaticLineChartData_NameNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(null);
+ TestDelegate call = () => MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(null, new Random(21).NextBoolean());
// Assert
var exception = Assert.Throws(call);
Assert.AreEqual("name", exception.ParamName);
}
[Test]
- public void CreatePhreaticLineChartData_ReturnsEmptyChartLineData()
+ [TestCase(true)]
+ [TestCase(false)]
+ public void CreatePhreaticLineChartData_WithVisibility_ReturnsEmptyChartLineDataWithExpectedVisibility(bool isVisible)
{
// Setup
const string name = "zone";
// Call
- ChartLineData data = MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(name);
+ ChartLineData data = MacroStabilityInwardsChartDataFactory.CreatePhreaticLineChartData(name, isVisible);
// Assert
CollectionAssert.IsEmpty(data.Points);
Assert.AreEqual(name, data.Name);
+ Assert.AreEqual(isVisible, data.IsVisible);
AssertEqualStyle(data.Style, Color.Blue, 2, ChartLineDashStyle.Solid);
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs
===================================================================
diff -u -ree422c0282fbaf9bb64b1661f72910964a8a0737 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision ee422c0282fbaf9bb64b1661f72910964a8a0737)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -244,7 +244,8 @@
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -310,7 +311,8 @@
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -337,7 +339,8 @@
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -352,10 +355,10 @@
// Assert
ChartData[] chartData = view.Chart.Data.Collection.ToArray();
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
- (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
- (ChartDataCollection) chartData[waternetZonesDailyIndex]);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
+ (ChartDataCollection) chartData[waternetZonesDailyIndex]);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
+ (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
}
}
@@ -480,7 +483,8 @@
using (var view = new MacroStabilityInwardsInputView())
{
- MacroStabilityInwardsStochasticSoilProfile originalSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile originalSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
@@ -498,7 +502,8 @@
surfaceLineChartData.Attach(observer);
- MacroStabilityInwardsStochasticSoilProfile newSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile newSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
// When
calculation.InputParameters.StochasticSoilProfile = newSoilProfile;
@@ -811,7 +816,8 @@
using (var view = new MacroStabilityInwardsInputView())
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -853,7 +859,8 @@
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -869,10 +876,10 @@
// Precondition
ChartData[] chartData = view.Chart.Data.Collection.ToArray();
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
- (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
- (ChartDataCollection) chartData[waternetZonesDailyIndex]);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
+ (ChartDataCollection) chartData[waternetZonesDailyIndex]);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
+ (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
}
// Call
@@ -891,7 +898,8 @@
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -912,10 +920,10 @@
// Assert
ChartData[] chartData = view.Chart.Data.Collection.ToArray();
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
- (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
- (ChartDataCollection) chartData[waternetZonesDailyIndex]);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
+ (ChartDataCollection) chartData[waternetZonesDailyIndex]);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
+ (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
}
}
}
@@ -929,7 +937,8 @@
{
MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
- MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile =
+ MacroStabilityInwardsStochasticSoilProfileTestFactory.CreateMacroStabilityInwardsStochasticSoilProfile2D();
var calculation = new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -946,10 +955,10 @@
var waternetExtremeChartDataCollection = (ChartDataCollection) chartData[waternetZonesExtremeIndex];
var waternetDailyChartDataCollection = (ChartDataCollection) chartData[waternetZonesDailyIndex];
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
- waternetExtremeChartDataCollection);
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
- waternetDailyChartDataCollection);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
+ waternetExtremeChartDataCollection);
+ MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
+ waternetDailyChartDataCollection);
IEnumerable waternetExtremeChartData = waternetExtremeChartDataCollection.Collection;
IEnumerable waternetDailyChartData = waternetDailyChartDataCollection.Collection;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs
===================================================================
diff -u -ree422c0282fbaf9bb64b1661f72910964a8a0737 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision ee422c0282fbaf9bb64b1661f72910964a8a0737)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -547,10 +547,10 @@
var waternetExtremeChartDataCollection = (ChartDataCollection) chartData[waternetZonesExtremeIndex];
var waternetDailyChartDataCollection = (ChartDataCollection) chartData[waternetZonesDailyIndex];
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
- waternetExtremeChartDataCollection);
- MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
- waternetDailyChartDataCollection);
+ MacroStabilityInwardsOutputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetExtreme,
+ waternetExtremeChartDataCollection);
+ MacroStabilityInwardsOutputViewChartDataAssert.AssertWaternetChartData(calculation.InputParameters.WaternetDaily,
+ waternetDailyChartDataCollection);
IEnumerable waternetExtremeChartData = waternetExtremeChartDataCollection.Collection;
IEnumerable waternetDailyChartData = waternetDailyChartDataCollection.Collection;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsInputViewChartDataAssert.cs
===================================================================
diff -u -ree422c0282fbaf9bb64b1661f72910964a8a0737 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsInputViewChartDataAssert.cs (.../MacroStabilityInwardsInputViewChartDataAssert.cs) (revision ee422c0282fbaf9bb64b1661f72910964a8a0737)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsInputViewChartDataAssert.cs (.../MacroStabilityInwardsInputViewChartDataAssert.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -23,6 +23,7 @@
using Core.Components.Chart.Data;
using NUnit.Framework;
using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
namespace Ringtoets.MacroStabilityInwards.Forms.TestUtil
{
@@ -83,6 +84,19 @@
}
///
+ /// Asserts whether contains no waternet chart data.
+ ///
+ /// The original .
+ /// The actual .
+ /// Thrown when a waternet layer is present.
+ public static void AssertWaternetChartData(MacroStabilityInwardsWaternet waternet, ChartDataCollection chartDataCollection)
+ {
+ MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(waternet,
+ true,
+ chartDataCollection);
+ }
+
+ ///
/// Asserts whether contains empty data.
///
/// The actual .
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs
===================================================================
diff -u -rcac3045aae8af73cbc3602a1c38b071385aa3581 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision cac3045aae8af73cbc3602a1c38b071385aa3581)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -25,6 +25,7 @@
using Core.Components.Chart.Data;
using NUnit.Framework;
using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
namespace Ringtoets.MacroStabilityInwards.Forms.TestUtil
{
@@ -74,10 +75,10 @@
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));
+ AssertWaternetChartData(calculationScenario.InputParameters.WaternetExtreme,
+ (ChartDataCollection) actual.Collection.ElementAt(waternetZonesExtremeIndex));
+ AssertWaternetChartData(calculationScenario.InputParameters.WaternetDaily,
+ (ChartDataCollection) actual.Collection.ElementAt(waternetZonesDailyIndex));
}
///
@@ -111,6 +112,19 @@
}
///
+ /// Asserts whether contains no waternet chart data.
+ ///
+ /// The original .
+ /// The actual .
+ /// Thrown when a waternet layer is present.
+ public static void AssertWaternetChartData(MacroStabilityInwardsWaternet waternet, ChartDataCollection chartDataCollection)
+ {
+ MacroStabilityInwardsViewChartDataAssert.AssertWaternetChartData(waternet,
+ false,
+ chartDataCollection);
+ }
+
+ ///
/// Asserts whether contains empty output data.
///
/// The actual .
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs
===================================================================
diff -u -ree422c0282fbaf9bb64b1661f72910964a8a0737 -ra371ae048cf582e8a9cad8436a21c2b9b18dc793
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs (.../MacroStabilityInwardsViewChartDataAssert.cs) (revision ee422c0282fbaf9bb64b1661f72910964a8a0737)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs (.../MacroStabilityInwardsViewChartDataAssert.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793)
@@ -92,10 +92,11 @@
/// Asserts whether corresponds to .
///
/// The original .
+ /// The expected visibility of the chart data.
/// The actual .
/// Thrown when
/// does not correspond to .
- public static void AssertWaternetChartData(MacroStabilityInwardsWaternet original, ChartDataCollection actual)
+ public static void AssertWaternetChartData(MacroStabilityInwardsWaternet original, bool expectedVisibility, ChartDataCollection actual)
{
ChartData[] waternetChartData = actual.Collection.ToArray();
MacroStabilityInwardsWaternetLine[] waternetLines = original.WaternetLines.ToArray();
@@ -113,13 +114,15 @@
var phreaticLineChartData = (ChartLineData) waternetChartData[i];
Assert.AreEqual(phreaticLines[i].Name, phreaticLineChartData.Name);
Assert.AreEqual(phreaticLines[i].Geometry, phreaticLineChartData.Points);
+ Assert.AreEqual(expectedVisibility, phreaticLineChartData.IsVisible);
}
else
{
var waternetLineChartData = (ChartMultipleAreaData) waternetChartData[i];
MacroStabilityInwardsWaternetLine waternetLine = waternetLines[i - waternetLines.Length];
Assert.AreEqual(waternetLine.Name, waternetLineChartData.Name);
Assert.IsTrue(waternetLineChartData.HasData);
+ Assert.AreEqual(expectedVisibility, waternetLineChartData.IsVisible);
}
}
}