Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -41,14 +41,14 @@ /// Thrown when is null. public PipingFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - SimpleAssessmentInput = SimpleAssessmentResultType.None; + SimpleAssessmentResult = SimpleAssessmentResultType.None; assessmentLayerThree = double.NaN; } /// /// Gets or sets the state of the simple assessment per failure mechanism section. /// - public SimpleAssessmentResultType SimpleAssessmentInput { get; set; } + public SimpleAssessmentResultType SimpleAssessmentResult { get; set; } /// /// Gets or sets the value of the tailored assessment of safety. Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs (.../PipingFailureMechanismSectionResultAssemblyFactory.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs (.../PipingFailureMechanismSectionResultAssemblyFactory.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -57,7 +57,7 @@ try { - return calculator.AssembleSimpleAssessment(failureMechanismSectionResult.SimpleAssessmentInput); + return calculator.AssembleSimpleAssessment(failureMechanismSectionResult.SimpleAssessmentResult); } catch (FailureMechanismSectionAssemblyCalculatorException e) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -r87ad62ce6aca2a109eb0357098687c3a7d95c0b5 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 87ad62ce6aca2a109eb0357098687c3a7d95c0b5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -125,7 +125,7 @@ .ToArray(); DataGridViewControl.AddComboBoxColumn( - nameof(PipingFailureMechanismSectionResultRow.SimpleAssessmentInput), + nameof(PipingFailureMechanismSectionResultRow.SimpleAssessmentResult), RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), @@ -171,8 +171,8 @@ var resultRow = (PipingFailureMechanismSectionResultRow) GetDataAtRow(e.RowIndex); PipingFailureMechanismSectionResult rowObject = resultRow.GetSectionResult; - if (rowObject.SimpleAssessmentInput == SimpleAssessmentResultType.ProbabilityNegligible - || rowObject.SimpleAssessmentInput == SimpleAssessmentResultType.NotApplicable) + if (rowObject.SimpleAssessmentResult == SimpleAssessmentResultType.ProbabilityNegligible + || rowObject.SimpleAssessmentResult == SimpleAssessmentResultType.NotApplicable) { currentDataGridViewCell.ErrorText = string.Empty; return; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -81,15 +81,15 @@ /// /// Gets or sets the value representing the simple assessment result. /// - public SimpleAssessmentResultType SimpleAssessmentInput + public SimpleAssessmentResultType SimpleAssessmentResult { get { - return SectionResult.SimpleAssessmentInput; + return SectionResult.SimpleAssessmentResult; } set { - SectionResult.SimpleAssessmentInput = value; + SectionResult.SimpleAssessmentResult = value; SectionResult.NotifyObservers(); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -56,7 +56,7 @@ FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new PipingFailureMechanismSectionResult(failureMechanismSection) { - SimpleAssessmentInput = random.NextEnumValue() + SimpleAssessmentResult = random.NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -68,7 +68,7 @@ PipingFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult); // Assert - Assert.AreEqual(sectionResult.SimpleAssessmentInput, calculator.SimpleAssessmentInput); + Assert.AreEqual(sectionResult.SimpleAssessmentResult, calculator.SimpleAssessmentInput); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -43,7 +43,7 @@ // Assert Assert.IsInstanceOf(sectionResult); Assert.AreSame(section, sectionResult.Section); - Assert.AreEqual(SimpleAssessmentResultType.None, sectionResult.SimpleAssessmentInput); + Assert.AreEqual(SimpleAssessmentResultType.None, sectionResult.SimpleAssessmentResult); Assert.IsNaN(sectionResult.AssessmentLayerThree); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r2c8012ba40f0290a41ed277712a4eb8fc5ce8431 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 2c8012ba40f0290a41ed277712a4eb8fc5ce8431) @@ -60,7 +60,7 @@ // Assert Assert.IsInstanceOf>(row); - Assert.AreEqual(row.SimpleAssessmentInput, result.SimpleAssessmentInput); + Assert.AreEqual(row.SimpleAssessmentResult, result.SimpleAssessmentResult); Assert.AreEqual(result.GetAssessmentLayerTwoA(Enumerable.Empty(), failureMechanism, assessmentSection), row.AssessmentLayerTwoA); @@ -133,7 +133,7 @@ } [Test] - public void SimpleAssessmentInput_SetNewValue_NotifyObserversAndPropertyChanged() + public void SimpleAssessmentResult_SetNewValue_NotifyObserversAndPropertyChanged() { // Setup var mocks = new MockRepository(); @@ -153,10 +153,10 @@ new PipingFailureMechanism(), assessmentSection); // Call - row.SimpleAssessmentInput = newValue; + row.SimpleAssessmentResult = newValue; // Assert - Assert.AreEqual(newValue, result.SimpleAssessmentInput); + Assert.AreEqual(newValue, result.SimpleAssessmentResult); mocks.VerifyAll(); }