Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rf22d5a26a3468052a16f55401f1d06e3ceab9ac2 -r2c456961e1bdf241eddb652aaa1bc0029538ecf4
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision f22d5a26a3468052a16f55401f1d06e3ceab9ac2)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision 2c456961e1bdf241eddb652aaa1bc0029538ecf4)
@@ -286,15 +286,15 @@
}
///
- /// Creates a based on the given .
+ /// Creates a based on the given .
///
/// The tailor made assessment result to create the result for.
/// The created tailor made calculation result.
/// Thrown when
/// is an invalid .
/// Thrown when
/// is a valid but unsupported .
- public static TailorMadeCalculationResult CreateTailorMadeCalculationResult(TailorMadeAssessmentResultType tailorMadeAssessmentResult)
+ public static EAssessmentResultTypeT1 CreateAssessmentResultTypeT1(TailorMadeAssessmentResultType tailorMadeAssessmentResult)
{
if (!Enum.IsDefined(typeof(TailorMadeAssessmentResultType), tailorMadeAssessmentResult))
{
@@ -306,15 +306,15 @@
switch (tailorMadeAssessmentResult)
{
case TailorMadeAssessmentResultType.None:
- return TailorMadeCalculationResult.None;
+ return EAssessmentResultTypeT1.Gr;
case TailorMadeAssessmentResultType.ProbabilityNegligible:
- return TailorMadeCalculationResult.FV;
+ return EAssessmentResultTypeT1.Fv;
case TailorMadeAssessmentResultType.Sufficient:
- return TailorMadeCalculationResult.V;
+ return EAssessmentResultTypeT1.V;
case TailorMadeAssessmentResultType.Insufficient:
- return TailorMadeCalculationResult.VN;
+ return EAssessmentResultTypeT1.Vn;
case TailorMadeAssessmentResultType.NotAssessed:
- return TailorMadeCalculationResult.NGO;
+ return EAssessmentResultTypeT1.Ngo;
default:
throw new NotSupportedException();
}
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rf22d5a26a3468052a16f55401f1d06e3ceab9ac2 -r2c456961e1bdf241eddb652aaa1bc0029538ecf4
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision f22d5a26a3468052a16f55401f1d06e3ceab9ac2)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision 2c456961e1bdf241eddb652aaa1bc0029538ecf4)
@@ -870,10 +870,10 @@
}
[Test]
- public void CreateTailorMadeCalculationResult_InvalidEnumInput_ThrowInvalidEnumArgumentException()
+ public void CreateAssessmentResultTypeT1_InvalidEnumInput_ThrowInvalidEnumArgumentException()
{
// Call
- TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateTailorMadeCalculationResult((TailorMadeAssessmentResultType) 99);
+ TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT1((TailorMadeAssessmentResultType) 99);
// Assert
string expectedMessage = $"The value of argument 'tailorMadeAssessmentResult' (99) is invalid for Enum type '{nameof(TailorMadeAssessmentResultType)}'.";
@@ -886,29 +886,29 @@
[TestCase(TailorMadeAssessmentResultType.Insufficient)]
[TestCase(TailorMadeAssessmentResultType.Sufficient)]
[TestCase(TailorMadeAssessmentResultType.NotAssessed)]
- public void CreateTailorMadeCalculationResult_ValidInput_ReturnsTailorMadeCalculationResult(TailorMadeAssessmentResultType detailedAssessmentResult)
+ public void CreateAssessmentResultTypeT1_ValidInput_ReturnsTailorMadeCalculationResult(TailorMadeAssessmentResultType detailedAssessmentResult)
{
// Call
- TailorMadeCalculationResult result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateTailorMadeCalculationResult(detailedAssessmentResult);
+ EAssessmentResultTypeT1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT1(detailedAssessmentResult);
// Assert
Assert.AreEqual(result, GetTailorMadeCalculationResult(detailedAssessmentResult));
}
- private static TailorMadeCalculationResult GetTailorMadeCalculationResult(TailorMadeAssessmentResultType detailedAssessmentResult)
+ private static EAssessmentResultTypeT1 GetTailorMadeCalculationResult(TailorMadeAssessmentResultType detailedAssessmentResult)
{
switch (detailedAssessmentResult)
{
case TailorMadeAssessmentResultType.None:
- return TailorMadeCalculationResult.None;
+ return EAssessmentResultTypeT1.Gr;
case TailorMadeAssessmentResultType.ProbabilityNegligible:
- return TailorMadeCalculationResult.FV;
+ return EAssessmentResultTypeT1.Fv;
case TailorMadeAssessmentResultType.Sufficient:
- return TailorMadeCalculationResult.V;
+ return EAssessmentResultTypeT1.V;
case TailorMadeAssessmentResultType.Insufficient:
- return TailorMadeCalculationResult.VN;
+ return EAssessmentResultTypeT1.Vn;
case TailorMadeAssessmentResultType.NotAssessed:
- return TailorMadeCalculationResult.NGO;
+ return EAssessmentResultTypeT1.Ngo;
default:
throw new NotSupportedException();
}