Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs (.../DuneErosionFailureMechanismSectionResult.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs (.../DuneErosionFailureMechanismSectionResult.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -40,15 +40,15 @@ /// Thrown when is null. public DuneErosionFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - SimpleAssessmentInput = SimpleAssessmentResultValidityOnlyType.None; + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None; AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated; AssessmentLayerThree = RoundedDouble.NaN; } /// /// Gets or sets the state of the simple assessment per failure mechanism section. /// - public SimpleAssessmentResultValidityOnlyType SimpleAssessmentInput { get; set; } + public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get; set; } /// /// Gets or sets the value of the detailed assessment of safety per failure mechanism section, for which Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs (.../DuneErosionFailureMechanismSectionResultAssemblyFactory.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs (.../DuneErosionFailureMechanismSectionResultAssemblyFactory.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -56,7 +56,7 @@ try { - return calculator.AssembleSimpleAssessment(failureMechanismSectionResult.SimpleAssessmentInput); + return calculator.AssembleSimpleAssessment(failureMechanismSectionResult.SimpleAssessmentResult); } catch (FailureMechanismSectionAssemblyCalculatorException e) { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs =================================================================== diff -u -r87ad62ce6aca2a109eb0357098687c3a7d95c0b5 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision 87ad62ce6aca2a109eb0357098687c3a7d95c0b5) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -73,7 +73,7 @@ .ToArray(); DataGridViewControl.AddComboBoxColumn( - nameof(DuneErosionSectionResultRow.SimpleAssessmentInput), + nameof(DuneErosionSectionResultRow.SimpleAssessmentResult), RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader, simpleAssessmentDataSource, nameof(EnumDisplayWrapper.Value), Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs (.../DuneErosionSectionResultRow.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs (.../DuneErosionSectionResultRow.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -46,15 +46,15 @@ /// /// Gets or sets the value representing the simple assessment result. /// - public SimpleAssessmentResultValidityOnlyType SimpleAssessmentInput + public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get { - return SectionResult.SimpleAssessmentInput; + return SectionResult.SimpleAssessmentResult; } set { - SectionResult.SimpleAssessmentInput = value; + SectionResult.SimpleAssessmentResult = value; SectionResult.NotifyObservers(); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -56,7 +56,7 @@ FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new DuneErosionFailureMechanismSectionResult(failureMechanismSection) { - SimpleAssessmentInput = random.NextEnumValue() + SimpleAssessmentResult = random.NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -68,7 +68,7 @@ DuneErosionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult); // Assert - Assert.AreEqual(sectionResult.SimpleAssessmentInput, calculator.SimpleAssessmentValidityOnlyInput); + Assert.AreEqual(sectionResult.SimpleAssessmentResult, calculator.SimpleAssessmentValidityOnlyInput); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -42,7 +42,7 @@ // Assert Assert.IsInstanceOf(result); Assert.AreSame(section, result.Section); - Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, result.SimpleAssessmentInput); + Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, result.SimpleAssessmentResult); Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA); Assert.IsNaN(result.AssessmentLayerThree); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -110,19 +110,19 @@ var random = new Random(21); var result1 = new DuneErosionFailureMechanismSectionResult(section1) { - SimpleAssessmentInput = SimpleAssessmentResultValidityOnlyType.None, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new DuneErosionFailureMechanismSectionResult(section2) { - SimpleAssessmentInput = SimpleAssessmentResultValidityOnlyType.NotApplicable, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new DuneErosionFailureMechanismSectionResult(section3) { - SimpleAssessmentInput = SimpleAssessmentResultValidityOnlyType.Applicable, + SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; @@ -150,7 +150,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); @@ -160,7 +160,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); @@ -170,7 +170,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); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r7e64235010367ff8791434dfb717150e8f52e3ba --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba) @@ -50,7 +50,7 @@ // Assert Assert.IsInstanceOf>(row); - Assert.AreEqual(result.SimpleAssessmentInput, row.SimpleAssessmentInput); + Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); @@ -59,7 +59,7 @@ } [Test] - public void SimpleAssessmentInput_SetNewValue_NotifyObserversAndPropertyChanged() + public void SimpleAssessmentResult_SetNewValue_NotifyObserversAndPropertyChanged() { // Setup var mocks = new MockRepository(); @@ -77,10 +77,10 @@ var row = new DuneErosionSectionResultRow(result); // Call - row.SimpleAssessmentInput = newValue; + row.SimpleAssessmentResult = newValue; // Assert - Assert.AreEqual(newValue, result.SimpleAssessmentInput); + Assert.AreEqual(newValue, result.SimpleAssessmentResult); mocks.VerifyAll(); }