Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -r7d2d3b08afed372bd36d3ab1386274bbaf351237 -rc620a480d44f4099fcf02a2ef9cc1d15c586ab03 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 7d2d3b08afed372bd36d3ab1386274bbaf351237) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision c620a480d44f4099fcf02a2ef9cc1d15c586ab03) @@ -280,7 +280,7 @@ { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); Tuple input = - FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup( + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3WithSectionCategory( tailorMadeAssessmentResult); FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T4(input.Item1, input.Item2); Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs =================================================================== diff -u -ra50d0eecc7a0e966233e3c25c4e4fb3839dbffb1 -rc620a480d44f4099fcf02a2ef9cc1d15c586ab03 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision a50d0eecc7a0e966233e3c25c4e4fb3839dbffb1) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision c620a480d44f4099fcf02a2ef9cc1d15c586ab03) @@ -122,7 +122,7 @@ } return new FmSectionAssemblyDirectResult( - ConvertFailureMechanismSectionAssemblyCategoryGroup(assembly.Group), + CreateFailureMechanismSectionCategory(assembly.Group), assembly.Probability); } @@ -141,7 +141,7 @@ internal static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult( FailureMechanismSectionAssemblyCategoryGroup categoryGroup) { - return new FmSectionAssemblyDirectResult(ConvertFailureMechanismSectionAssemblyCategoryGroup(categoryGroup)); + return new FmSectionAssemblyDirectResult(CreateFailureMechanismSectionCategory(categoryGroup)); } /// @@ -348,33 +348,34 @@ } /// - /// Converts a into a . + /// Creates a from a . /// - /// The to convert. + /// The to create the result for. /// A based on . /// Thrown when /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - internal static Tuple ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup( + internal static Tuple CreateAssessmentResultTypeT3WithSectionCategory( FailureMechanismSectionAssemblyCategoryGroup category) { - EFmSectionCategory result = ConvertFailureMechanismSectionAssemblyCategoryGroup(category); + EFmSectionCategory result = CreateFailureMechanismSectionCategory(category); return result == EFmSectionCategory.Gr ? new Tuple(EAssessmentResultTypeT3.Gr, null) : new Tuple(EAssessmentResultTypeT3.ResultSpecified, result); } /// - /// Converts a into a . + /// Creates a from a . /// - /// The to convert. + /// The to create + /// a . /// A based on . /// Thrown when /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - private static EFmSectionCategory ConvertFailureMechanismSectionAssemblyCategoryGroup( + private static EFmSectionCategory CreateFailureMechanismSectionCategory( FailureMechanismSectionAssemblyCategoryGroup category) { if (!Enum.IsDefined(typeof(FailureMechanismSectionAssemblyCategoryGroup), category)) Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r213fdc287a5ef9a25bcc616454130e8358a851ee -rc620a480d44f4099fcf02a2ef9cc1d15c586ab03 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 213fdc287a5ef9a25bcc616454130e8358a851ee) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision c620a480d44f4099fcf02a2ef9cc1d15c586ab03) @@ -1642,7 +1642,7 @@ // Assert Tuple expectedInput = - FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup(categoryGroupResult); + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3WithSectionCategory(categoryGroupResult); Assert.AreEqual(expectedInput.Item1, kernel.AssessmentResultTypeT3Input); Assert.AreEqual(expectedInput.Item2, kernel.SectionCategoryInput); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs =================================================================== diff -u -r14eb498ee20fd92ff9d447a832d2e24a5979778f -rc620a480d44f4099fcf02a2ef9cc1d15c586ab03 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision 14eb498ee20fd92ff9d447a832d2e24a5979778f) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision c620a480d44f4099fcf02a2ef9cc1d15c586ab03) @@ -350,25 +350,25 @@ [TestCase(FailureMechanismSectionAssemblyCategoryGroup.Vv, EAssessmentResultTypeT3.ResultSpecified, EFmSectionCategory.Vv)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIv, EAssessmentResultTypeT3.ResultSpecified, EFmSectionCategory.VIv)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIIv, EAssessmentResultTypeT3.ResultSpecified, EFmSectionCategory.VIIv)] - public void ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup_ValidGroup_ReturnsExpectedItems( + public void CreateAssessmentResultTypeT3WithSectionCategory_ValidGroup_ReturnsExpectedItems( FailureMechanismSectionAssemblyCategoryGroup originalGroup, EAssessmentResultTypeT3 expectedResult, EFmSectionCategory? expectedGroup) { // Call Tuple actualGroup = - FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup(originalGroup); + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3WithSectionCategory(originalGroup); // Assert Assert.AreEqual(expectedResult, actualGroup.Item1); Assert.AreEqual(expectedGroup, actualGroup.Item2); } [Test] - public void ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup_InvalidGroup_ThrowInvalidEnumArgumentException() + public void CreateAssessmentResultTypeT3WithSectionCategory_InvalidGroup_ThrowInvalidEnumArgumentException() { // Call - TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertTailorMadeFailureMechanismSectionAssemblyCategoryGroup( + TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3WithSectionCategory( (FailureMechanismSectionAssemblyCategoryGroup) 99); // Assert