Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs =================================================================== diff -u -r616947b29acab4b6384abc1c29a61eaf349c7745 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision 616947b29acab4b6384abc1c29a61eaf349c7745) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -54,6 +54,7 @@ var splitContainer = view.Controls[0] as SplitContainer; Assert.IsNotNull(splitContainer); Assert.AreEqual(1, splitContainer.Panel1.Controls.Count); + Assert.IsEmpty(splitContainer.Panel2.Controls); Assert.IsInstanceOf(splitContainer.Panel1.Controls[0]); } } @@ -98,7 +99,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); @@ -128,7 +129,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); // Precondition Assert.AreSame(calculation, view.Data); @@ -153,7 +154,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile2D(); @@ -180,7 +181,7 @@ calculation.NotifyObservers(); // Then - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(chartData, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(chartData); } } @@ -194,7 +195,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile2D(); @@ -211,7 +212,7 @@ // Precondition ChartDataCollection chartData = GetChartControl(chartControl).Data; - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(chartData, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(chartData); // When calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); @@ -224,6 +225,11 @@ } } + private static MacroStabilityInwardsOutputChartControl GetChartControl(Form form) + { + return ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + } + private static IChartControl GetChartControl(MacroStabilityInwardsOutputChartControl view) { return ControlTestHelper.GetControls(view, "chartControl").Single();