Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs =================================================================== diff -u -r9d7a5bd6246ec71a14f1944516d21e06954243f7 -r0ef0ca56191fb315c32f863ce06198d79be779be --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs (.../FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs) (revision 9d7a5bd6246ec71a14f1944516d21e06954243f7) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs (.../FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs) (revision 0ef0ca56191fb315c32f863ce06198d79be779be) @@ -203,7 +203,7 @@ } [Test] - public void ConvertTo_PositiveInfinityToString_ReturnHyphen() + public void ConvertTo_PositiveInfinityToString_ReturnInfinity() { // Setup var converter = new FailureMechanismSectionResultNoProbabilityValueDoubleConverter(); @@ -216,7 +216,7 @@ } [Test] - public void ConvertTo_NegativeInfinityToString_ReturnHyphen() + public void ConvertTo_NegativeInfinityToString_ReturnNegativeInfinity() { // Setup var converter = new FailureMechanismSectionResultNoProbabilityValueDoubleConverter(); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -r8bb257bcf65291ebc7fc3b913d73bb11f40124d4 -r0ef0ca56191fb315c32f863ce06198d79be779be --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 8bb257bcf65291ebc7fc3b913d73bb11f40124d4) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 0ef0ca56191fb315c32f863ce06198d79be779be) @@ -146,15 +146,15 @@ private void ShowAssementLayerTwoAErrors(object sender, DataGridViewCellFormattingEventArgs e) { - if (e.ColumnIndex <= 0) + if (e.ColumnIndex != assessmentLayerTwoAIndex) { return; } DataGridViewCell currentDataGridViewCell = DataGridViewControl.GetCell(e.RowIndex, e.ColumnIndex); var resultRow = (GrassCoverErosionInwardsFailureMechanismSectionResultRow)GetDataAtRow(e.RowIndex); - if (resultRow != null && e.ColumnIndex == assessmentLayerTwoAIndex) + if (resultRow != null) { GrassCoverErosionInwardsCalculation normativeCalculation = resultRow.GetSectionResultCalculation(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r8bb257bcf65291ebc7fc3b913d73bb11f40124d4 -r0ef0ca56191fb315c32f863ce06198d79be779be --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 8bb257bcf65291ebc7fc3b913d73bb11f40124d4) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 0ef0ca56191fb315c32f863ce06198d79be779be) @@ -81,7 +81,7 @@ } [Test] - public void AssessmentLayerTwoA_CalculationNull_ReturnZero() + public void AssessmentLayerTwoA_CalculationNull_ReturnNaN() { // Setup var section = new FailureMechanismSection("Section", new[] { new Point2D(0, 0) }); @@ -121,7 +121,7 @@ } [Test] - public void AssessmentLayerTwoA_SuccessfulCalculation_ReturnInverseProbability() + public void AssessmentLayerTwoA_SuccessfulCalculation_ReturnProbability() { // Setup var section = new FailureMechanismSection("Section", new[] { new Point2D(0, 0) }); 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; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r8bb257bcf65291ebc7fc3b913d73bb11f40124d4 -r0ef0ca56191fb315c32f863ce06198d79be779be --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 8bb257bcf65291ebc7fc3b913d73bb11f40124d4) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 0ef0ca56191fb315c32f863ce06198d79be779be) @@ -20,6 +20,7 @@ // All rights reserved. using System; + using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; @@ -57,7 +58,7 @@ public void Constructor_WithSectionResult_PropertiesFromSectionAndResult() { // Setup - var section = CreateSection(); + var section = CreateSimpleFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Call @@ -69,11 +70,11 @@ Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); Assert.IsTrue(TypeUtils.HasTypeConverter( - r => r.AssessmentLayerTwoA)); + FailureMechanismSectionResultNoProbabilityValueDoubleConverter>( + r => r.AssessmentLayerTwoA)); Assert.IsTrue(TypeUtils.HasTypeConverter( - r => r.AssessmentLayerThree)); + FailureMechanismSectionResultNoValueRoundedDoubleConverter>( + r => r.AssessmentLayerThree)); } [Test] @@ -87,7 +88,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var section = CreateSection(); + var section = CreateSimpleFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); result.Attach(observer); @@ -98,20 +99,15 @@ // Assert Assert.AreEqual(newValue, result.AssessmentLayerOne); - + mocks.VerifyAll(); } [Test] - public void AssessmentLayerTwoA_NoCalculationSet_ReturnHyphen() + public void AssessmentLayerTwoA_NoCalculationSet_ReturnNaN() { // Setup - var geometryPoints = new [] - { - new Point2D(1.1, 2.2), - new Point2D(3.3, 4.4) - }; - var section = new FailureMechanismSection("A", geometryPoints); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Precondition @@ -129,7 +125,7 @@ [Test] [TestCase(CalculationScenarioStatus.Failed)] [TestCase(CalculationScenarioStatus.NotCalculated)] - public void AssessmentLayerTwoA_CalculationNotDone_ReturnHyphen(CalculationScenarioStatus status) + public void AssessmentLayerTwoA_CalculationNotDone_ReturnNaN(CalculationScenarioStatus status) { // Setup var calculation = new GrassCoverErosionInwardsCalculation(); @@ -139,12 +135,7 @@ calculation.Output = new GrassCoverErosionInwardsOutput(1.1, false, probabilityAssessmentOutput); } - var geometryPoints = new[] - { - new Point2D(1.1, 2.2), - new Point2D(3.3, 4.4) - }; - var section = new FailureMechanismSection("A", geometryPoints); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -169,12 +160,7 @@ Output = new GrassCoverErosionInwardsOutput(0.5, true, probabilityAssessmentOutput) }; - var geometryPoints = new[] - { - new Point2D(1.1, 2.2), - new Point2D(3.3, 4.4) - }; - var section = new FailureMechanismSection("A", geometryPoints); + FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = calculation @@ -195,7 +181,7 @@ // Setup var random = new Random(21); var newValue = random.NextDouble(); - var section = CreateSection(); + var section = CreateSimpleFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); var row = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(result); @@ -210,7 +196,7 @@ public void GetSectionResultCalculation_NoCalculationSetOnSectionResult_ReturnNull() { // Setup - var section = CreateSection(); + var section = CreateSimpleFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Precondition @@ -231,7 +217,7 @@ // Setup var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(); - var section = CreateSection(); + var section = CreateSimpleFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) { Calculation = grassCoverErosionInwardsCalculation @@ -246,11 +232,12 @@ Assert.AreSame(grassCoverErosionInwardsCalculation, calculation); } - private static FailureMechanismSection CreateSection() + private static FailureMechanismSection CreateSimpleFailureMechanismSection() { - return new FailureMechanismSection("name", new[] + return new FailureMechanismSection("A", new[] { - new Point2D(0, 0) + new Point2D(1.1, 2.2), + new Point2D(3.3, 4.4) }); } }