Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r388356eeabffd7acc1bf954bdb003acfe302f833 -re1da5ba4a11e6fc62ef365f804ee50c23cf5547f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 388356eeabffd7acc1bf954bdb003acfe302f833) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision e1da5ba4a11e6fc62ef365f804ee50c23cf5547f) @@ -88,11 +88,12 @@ } [Test] - public void Constructor_ValidParameters_ExpectedDefaultValues() + public void Constructor_ValidParameters_ExpectedValues() { - // Call + // Setup var calculation = new MacroStabilityInwardsCalculationScenario(); + // Call using (var view = new MacroStabilityInwardsInputView(calculation, GetTestNormativeAssessmentLevel)) { // Assert Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs =================================================================== diff -u -r19b12b646711dbaefd9ba10a4a4fbf2be05c8b13 -re1da5ba4a11e6fc62ef365f804ee50c23cf5547f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 19b12b646711dbaefd9ba10a4a4fbf2be05c8b13) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision e1da5ba4a11e6fc62ef365f804ee50c23cf5547f) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; @@ -47,35 +48,48 @@ private const int waternetZonesDailyIndex = 15; [Test] - public void Constructor_ExpectedValues() + public void Constructor_DataNull_ThrowsArgumentNullException() { // Call - var control = new MacroStabilityInwardsOutputChartControl(); + TestDelegate test = () => new MacroStabilityInwardsOutputChartControl(null, GetTestNormativeAssessmentLevel); // Assert - Assert.IsInstanceOf(control); - Assert.IsInstanceOf(control); - Assert.IsNull(control.Data); + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("data", paramName); + } - Assert.AreEqual(1, control.Controls.Count); - Assert.IsInstanceOf(control.Controls[0]); + [Test] + public void Constructor_GetNormativeAssessmentLevelFuncNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new MacroStabilityInwardsOutputChartControl(new MacroStabilityInwardsCalculationScenario(), null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("getNormativeAssessmentLevelFunc", paramName); } [Test] - public void DefaultConstructor_Always_AddChartControlWithEmptyChartData() + public void Constructor_ValidParameters_ExpectedValues() { + // Setup + var calculation = new MacroStabilityInwardsCalculationScenario(); + // Call - using (var control = new MacroStabilityInwardsOutputChartControl()) - { - // Assert - IChartControl chartControl = GetChartControl(control); - Assert.IsInstanceOf(chartControl); - Assert.AreEqual(DockStyle.Fill, ((Control) chartControl).Dock); - Assert.AreEqual("Afstand [m]", chartControl.BottomAxisTitle); - Assert.AreEqual("Hoogte [m+NAP]", chartControl.LeftAxisTitle); - Assert.IsNull(chartControl.Data); - Assert.IsNull(chartControl.ChartTitle); - } + var control = new MacroStabilityInwardsOutputChartControl(calculation, GetTestNormativeAssessmentLevel); + + // Assert + Assert.IsInstanceOf(control); + Assert.IsInstanceOf(control); + Assert.AreSame(calculation, control.Data); + Assert.IsNotNull(control.Chart); + Assert.AreEqual(1, control.Controls.Count); + + IChartControl chartControl = GetChartControl(control); + Assert.IsInstanceOf(chartControl); + Assert.AreEqual(DockStyle.Fill, ((Control)chartControl).Dock); + Assert.AreEqual("Afstand [m]", chartControl.BottomAxisTitle); + Assert.AreEqual("Hoogte [m+NAP]", chartControl.LeftAxisTitle); } [Test] @@ -586,5 +600,10 @@ { return ControlTestHelper.GetControls(view, "chartControl").Single(); } + + private static RoundedDouble GetTestNormativeAssessmentLevel() + { + return (RoundedDouble) 1.1; + } } } \ No newline at end of file