Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r999ba524ca29111b9474209a11b7aeabf233409f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 999ba524ca29111b9474209a11b7aeabf233409f) @@ -115,25 +115,25 @@ var random = new Random(21); var result1 = new PipingStructureFailureMechanismSectionResult(section1) { - SimpleAssessmentInput = SimpleAssessmentResultType.None, + SimpleAssessmentResult = SimpleAssessmentResultType.None, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new PipingStructureFailureMechanismSectionResult(section2) { - SimpleAssessmentInput = SimpleAssessmentResultType.NotApplicable, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new PipingStructureFailureMechanismSectionResult(section3) { - SimpleAssessmentInput = SimpleAssessmentResultType.ProbabilityNegligible, + SimpleAssessmentResult = SimpleAssessmentResultType.ProbabilityNegligible, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; var result4 = new PipingStructureFailureMechanismSectionResult(section4) { - SimpleAssessmentInput = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; @@ -161,7 +161,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); Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -171,7 +171,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); Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); 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); Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -191,7 +191,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); Assert.AreEqual(result4.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result4.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); @@ -214,7 +214,7 @@ var random = new Random(21); var result = new PipingStructureFailureMechanismSectionResult(section) { - SimpleAssessmentInput = simpleAssessmentResult, + SimpleAssessmentResult = simpleAssessmentResult, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = random.NextRoundedDouble() }; @@ -230,7 +230,7 @@ form.Show(); // When - result.SimpleAssessmentInput = SimpleAssessmentResultType.ProbabilityNegligible; + result.SimpleAssessmentResult = SimpleAssessmentResultType.ProbabilityNegligible; result.NotifyObservers(); // Then