Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -re972fc9c24dc35dc9cb68d73e9f98c4a3e75859e -r25665d46d75ef07e404c0e599e9f1e7b57b1a79b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision e972fc9c24dc35dc9cb68d73e9f98c4a3e75859e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision 25665d46d75ef07e404c0e599e9f1e7b57b1a79b) @@ -83,14 +83,14 @@ } /// - /// Gets the . + /// Gets the value representing the result of the layer 2a assessment. /// [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double AssessmentLayerTwoA { get { - return SectionResult.AssessmentLayerTwoA; + return SectionResult.GetAssessmentLayerTwoA(failureMechanism, assessmentSection); } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -re972fc9c24dc35dc9cb68d73e9f98c4a3e75859e -r25665d46d75ef07e404c0e599e9f1e7b57b1a79b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision e972fc9c24dc35dc9cb68d73e9f98c4a3e75859e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision 25665d46d75ef07e404c0e599e9f1e7b57b1a79b) @@ -505,10 +505,9 @@ // Given using (ClosingStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView()) { - const double probability = 0.56789; var calculation = new StructuresCalculation { - Output = new TestStructuresOutput(probability) + Output = new TestStructuresOutput(0.56789) }; FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new ClosingStructuresFailureMechanismSectionResult(section) @@ -531,7 +530,7 @@ object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. // Then - Assert.AreEqual(ProbabilityFormattingHelper.Format(probability), formattedValue); + Assert.AreEqual(ProbabilityFormattingHelper.Format(0.25), formattedValue); Assert.IsEmpty(dataGridViewCell.ErrorText); } } @@ -571,10 +570,9 @@ // Given using (ClosingStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView()) { - const double probability = 0.56789; var successfulCalculation = new StructuresCalculation { - Output = new TestStructuresOutput(probability) + Output = new TestStructuresOutput(0.56789) }; var failedCalculation = new StructuresCalculation @@ -600,7 +598,7 @@ // Precondition object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. - Assert.AreEqual(ProbabilityFormattingHelper.Format(probability), formattedValue); + Assert.AreEqual(ProbabilityFormattingHelper.Format(0.25), formattedValue); Assert.IsEmpty(dataGridViewCell.ErrorText); // When @@ -682,7 +680,6 @@ private static IEnumerable AssessmentLayerOneStateIsSufficientVariousSections() { FailureMechanismSection section = CreateSimpleFailureMechanismSection(); - const double probability = 0.56789; yield return new TestCaseData(new ClosingStructuresFailureMechanismSectionResult(section) { @@ -706,9 +703,9 @@ AssessmentLayerOne = AssessmentLayerOneState.Sufficient, Calculation = new StructuresCalculation { - Output = new TestStructuresOutput(probability) + Output = new TestStructuresOutput(0.56789) } - }, ProbabilityFormattingHelper.Format(probability)).SetName("SectionWithValidCalculationOutput"); + }, ProbabilityFormattingHelper.Format(0.25)).SetName("SectionWithValidCalculationOutput"); } private static FailureMechanismSection CreateSimpleFailureMechanismSection() Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -re972fc9c24dc35dc9cb68d73e9f98c4a3e75859e -r25665d46d75ef07e404c0e599e9f1e7b57b1a79b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision e972fc9c24dc35dc9cb68d73e9f98c4a3e75859e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision 25665d46d75ef07e404c0e599e9f1e7b57b1a79b) @@ -187,7 +187,7 @@ double assessmentLayerTwoA = resultRow.AssessmentLayerTwoA; // Assert - Assert.AreEqual(reliability, assessmentLayerTwoA); + Assert.AreEqual(0.2786727127146118, assessmentLayerTwoA); mocks.VerifyAll(); }