Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs =================================================================== diff -u -r6cd72dbeda0504db7018b8ee083e120a8fce034f -rcb6bb67915ea2869b2d7b705bdcee757dcdf2ce1 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 6cd72dbeda0504db7018b8ee083e120a8fce034f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision cb6bb67915ea2869b2d7b705bdcee757dcdf2ce1) @@ -128,7 +128,9 @@ control.Data = calculation; // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, GetChartControl(control).Data); + ChartDataCollection chartData = GetChartControl(control).Data; + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertOutputChartData(calculation, chartData); } } @@ -148,14 +150,15 @@ }; // Call - using (var control = new MacroStabilityInwardsOutputChartControl { Data = calculation }) { // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndEmptyWaternetChartData(GetChartControl(control).Data); + ChartDataCollection chartData = GetChartControl(control).Data; + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndEmptyWaternetChartData(chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyOutputChartData(chartData); } } @@ -182,7 +185,9 @@ }) { // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndWithWaternetChartData(GetChartControl(control).Data); + ChartDataCollection chartData = GetChartControl(control).Data; + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndWithWaternetChartData(chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyOutputChartData(chartData); } } @@ -208,7 +213,9 @@ }) { // Precondition - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, GetChartControl(control).Data); + ChartDataCollection chartData = GetChartControl(control).Data; + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertOutputChartData(calculation, chartData); // Call control.Data = null; @@ -243,14 +250,16 @@ // Precondition MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndWithWaternetChartData(chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyOutputChartData(chartData); calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); // Call control.UpdateChartData(); // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertOutputChartData(calculation, chartData); } } @@ -279,7 +288,8 @@ ChartDataCollection chartData = GetChartControl(control).Data; // Precondition - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertOutputChartData(calculation, chartData); calculation.ClearOutput(); @@ -288,6 +298,7 @@ // Assert MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndWithWaternetChartData(chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyOutputChartData(chartData); } } @@ -315,7 +326,8 @@ ChartDataCollection chartData = GetChartControl(control).Data; // Precondition - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertOutputChartData(calculation, chartData); calculation.ClearOutput(); @@ -324,6 +336,7 @@ // Assert MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerAndEmptyWaternetChartData(chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyOutputChartData(chartData); } } @@ -351,7 +364,7 @@ ChartDataCollection chartData = GetChartControl(control).Data; // Precondition - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); MacroStabilityInwardsStochasticSoilProfile newSoilProfile = GetStochasticSoilProfile2D(); @@ -360,7 +373,7 @@ control.UpdateChartData(); // Then - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); } } @@ -387,7 +400,7 @@ control.Data = calculation; // Precondition - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, GetChartControl(control).Data); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, GetChartControl(control).Data); } // Call @@ -430,7 +443,7 @@ control.UpdateChartData(); // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertChartData(calculation, chartData); + MacroStabilityInwardsOutputViewChartDataAssert.AssertInputChartData(calculation, chartData); } } }