Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r999ba524ca29111b9474209a11b7aeabf233409f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 999ba524ca29111b9474209a11b7aeabf233409f) @@ -114,25 +114,25 @@ var random = new Random(21); var result1 = new MacroStabilityOutwardsFailureMechanismSectionResult(section1) { - SimpleAssessmentInput = SimpleAssessmentResultType.None, + SimpleAssessmentResult = SimpleAssessmentResultType.None, AssessmentLayerTwoA = random.NextRoundedDouble(), AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new MacroStabilityOutwardsFailureMechanismSectionResult(section2) { - SimpleAssessmentInput = SimpleAssessmentResultType.NotApplicable, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, AssessmentLayerTwoA = random.NextRoundedDouble(), AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new MacroStabilityOutwardsFailureMechanismSectionResult(section3) { - SimpleAssessmentInput = SimpleAssessmentResultType.ProbabilityNegligible, + SimpleAssessmentResult = SimpleAssessmentResultType.ProbabilityNegligible, AssessmentLayerTwoA = random.NextRoundedDouble(), AssessmentLayerThree = random.NextRoundedDouble() }; var result4 = new MacroStabilityOutwardsFailureMechanismSectionResult(section4) { - SimpleAssessmentInput = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, AssessmentLayerTwoA = random.NextRoundedDouble(), AssessmentLayerThree = random.NextRoundedDouble() }; @@ -159,7 +159,7 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result1.SimpleAssessmentInput, cells[simpleAssessmentIndex].Value); + Assert.AreEqual(result1.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); string expectedAssessmentLayer2AString1 = ProbabilityFormattingHelper.Format(result1.AssessmentLayerTwoA); Assert.AreEqual(expectedAssessmentLayer2AString1, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -170,7 +170,7 @@ cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result2.SimpleAssessmentInput, cells[simpleAssessmentIndex].Value); + Assert.AreEqual(result2.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); string expectedAssessmentLayer2AString2 = ProbabilityFormattingHelper.Format(result2.AssessmentLayerTwoA); Assert.AreEqual(expectedAssessmentLayer2AString2, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -181,7 +181,7 @@ cells = rows[2].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result3.SimpleAssessmentInput, cells[simpleAssessmentIndex].Value); + Assert.AreEqual(result3.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); string expectedAssessmentLayer2AString3 = ProbabilityFormattingHelper.Format(result3.AssessmentLayerTwoA); Assert.AreEqual(expectedAssessmentLayer2AString3, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -192,7 +192,7 @@ cells = rows[3].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 4", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result4.SimpleAssessmentInput, cells[simpleAssessmentIndex].Value); + Assert.AreEqual(result4.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); string expectedAssessmentLayer2AString4 = ProbabilityFormattingHelper.Format(result4.AssessmentLayerTwoA); Assert.AreEqual(expectedAssessmentLayer2AString4, cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(result4.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -215,7 +215,7 @@ new Point2D(0, 0) })) { - SimpleAssessmentInput = simpleAssessmentResult, + SimpleAssessmentResult = simpleAssessmentResult, AssessmentLayerTwoA = random.NextRoundedDouble(), AssessmentLayerThree = random.NextRoundedDouble() }; @@ -231,7 +231,7 @@ form.Show(); // When - result.SimpleAssessmentInput = SimpleAssessmentResultType.ProbabilityNegligible; + result.SimpleAssessmentResult = SimpleAssessmentResultType.ProbabilityNegligible; result.NotifyObservers(); // Then