Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r8bb257bcf65291ebc7fc3b913d73bb11f40124d4 -r0ef0ca56191fb315c32f863ce06198d79be779be --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 8bb257bcf65291ebc7fc3b913d73bb11f40124d4) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 0ef0ca56191fb315c32f863ce06198d79be779be) @@ -24,10 +24,13 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; + using Core.Common.Base.Data; using Core.Common.Base.Geometry; + using NUnit.Extensions.Forms; using NUnit.Framework; + using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Forms.Helpers; @@ -97,13 +100,7 @@ { var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - var points = new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }; - - var section = new FailureMechanismSection("test", points); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); var testData = new List { @@ -300,12 +297,7 @@ // Setup using (var view = ShowFullyConfiguredFailureMechanismResultsView()) { - var section = new FailureMechanismSection("A", - new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); view.Data = new[] { @@ -333,12 +325,7 @@ using (var view = ShowFullyConfiguredFailureMechanismResultsView()) { var calculation = new GrassCoverErosionInwardsCalculation(); - var section = new FailureMechanismSection("A", - new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -374,12 +361,7 @@ { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput) }; - var section = new FailureMechanismSection("A", - new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -416,12 +398,7 @@ { Output = new GrassCoverErosionInwardsOutput(1.1, true, probabilityAssessmentOutput) }; - var section = new FailureMechanismSection("A", - new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -447,7 +424,7 @@ } [Test] - public void GivenSectionResultAndSuccessfulCalculation_WhenCalculation_ThenLayerTwoANoError() + public void GivenSectionResultAndSuccessfulCalculation_WhenChangingCalculationToFailed_ThenLayerTwoAHasError() { // Setup using (var view = ShowFullyConfiguredFailureMechanismResultsView()) @@ -464,12 +441,7 @@ { Output = new GrassCoverErosionInwardsOutput(1.1, true, failedCalculationOutput) }; - var section = new FailureMechanismSection("A", - new[] - { - new Point2D(1, 2), - new Point2D(3, 4) - }); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = successfulCalculation @@ -499,7 +471,18 @@ Assert.AreEqual("De maatgevende berekening voor dit vak heeft geen geldige uitkomst.", dataGridViewCell.ErrorText); } } - + + private static FailureMechanismSection CreateSimpleFailureMechanismSection() + { + var section = new FailureMechanismSection("A", + new[] + { + new Point2D(1, 2), + new Point2D(3, 4) + }); + return section; + } + private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2;