Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResult.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResult.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -40,15 +40,15 @@
/// Thrown when is null.
public WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
{
- SimpleAssessmentInput = SimpleAssessmentResultType.None;
+ SimpleAssessmentResult = SimpleAssessmentResultType.None;
AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated;
AssessmentLayerThree = RoundedDouble.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 detailed assessment of safety per failure mechanism section, for which
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -56,7 +56,7 @@
calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
try
{
- return calculator.AssembleSimpleAssessment(failureMechanismSectionResult.SimpleAssessmentInput);
+ return calculator.AssembleSimpleAssessment(failureMechanismSectionResult.SimpleAssessmentResult);
}
catch (FailureMechanismSectionAssemblyCalculatorException e)
{
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs
===================================================================
diff -u -r87ad62ce6aca2a109eb0357098687c3a7d95c0b5 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 87ad62ce6aca2a109eb0357098687c3a7d95c0b5)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -75,7 +75,7 @@
.ToArray();
DataGridViewControl.AddComboBoxColumn(
- nameof(WaveImpactAsphaltCoverFailureMechanismSectionResultRow.SimpleAssessmentInput),
+ nameof(WaveImpactAsphaltCoverFailureMechanismSectionResultRow.SimpleAssessmentResult),
RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_ColumnHeader,
simpleAssessmentDataSource,
nameof(EnumDisplayWrapper.Value),
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -46,15 +46,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/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -56,7 +56,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(failureMechanismSection)
{
- SimpleAssessmentInput = random.NextEnumValue()
+ SimpleAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -68,7 +68,7 @@
WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
// Assert
- Assert.AreEqual(sectionResult.SimpleAssessmentInput, calculator.SimpleAssessmentInput);
+ Assert.AreEqual(sectionResult.SimpleAssessmentResult, calculator.SimpleAssessmentInput);
}
}
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -42,7 +42,7 @@
// Assert
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
- Assert.AreEqual(SimpleAssessmentResultType.None, result.SimpleAssessmentInput);
+ Assert.AreEqual(SimpleAssessmentResultType.None, result.SimpleAssessmentResult);
Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.IsNaN(result.AssessmentLayerThree);
}
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -114,25 +114,25 @@
var random = new Random(21);
var result1 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section1)
{
- SimpleAssessmentInput = SimpleAssessmentResultType.None,
+ SimpleAssessmentResult = SimpleAssessmentResultType.None,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result2 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section2)
{
- SimpleAssessmentInput = SimpleAssessmentResultType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result3 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section3)
{
- SimpleAssessmentInput = SimpleAssessmentResultType.ProbabilityNegligible,
+ SimpleAssessmentResult = SimpleAssessmentResultType.ProbabilityNegligible,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result4 = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section4)
{
- SimpleAssessmentInput = SimpleAssessmentResultType.AssessFurther,
+ SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
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);
Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value);
Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
@@ -169,7 +169,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);
@@ -179,7 +179,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);
@@ -189,7 +189,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);
@@ -212,7 +212,7 @@
var random = new Random(21);
var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section)
{
- SimpleAssessmentInput = simpleAssessmentResult,
+ SimpleAssessmentResult = simpleAssessmentResult,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
AssessmentLayerThree = random.NextRoundedDouble()
};
@@ -228,7 +228,7 @@
form.Show();
// When
- result.SimpleAssessmentInput = SimpleAssessmentResultType.ProbabilityNegligible;
+ result.SimpleAssessmentResult = SimpleAssessmentResultType.ProbabilityNegligible;
result.NotifyObservers();
// Then
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -r24264daa736095a5d9b14415ffced9601cb123fe
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision 24264daa736095a5d9b14415ffced9601cb123fe)
@@ -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(row.AssessmentLayerThree, result.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 WaveImpactAsphaltCoverFailureMechanismSectionResultRow(result);
// Call
- row.SimpleAssessmentInput = newValue;
+ row.SimpleAssessmentResult = newValue;
// Assert
- Assert.AreEqual(newValue, result.SimpleAssessmentInput);
+ Assert.AreEqual(newValue, result.SimpleAssessmentResult);
mocks.VerifyAll();
}