Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -re27d0624c0303ff8b9ff40828abda2fb14200535 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision e27d0624c0303ff8b9ff40828abda2fb14200535) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -162,22 +162,22 @@ } public FailureMechanismSectionAssemblyCategoryGroup AssembleDetailedAssessment( - DetailedAssessmentResultType detailedAssesmentResultForFactorizedSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForFactorizedLowerLimitNorm) + DetailedAssessmentResultType detailedAssessmentResultForFactorizedSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForFactorizedLowerLimitNorm) { try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); CalculationOutput output = kernel.DetailedAssessmentDirectFailureMechanisms( FailureMechanismSectionAssemblyCalculatorInputCreator.CreateDetailedCalculationInputFromCategoryResults( - detailedAssesmentResultForFactorizedSignalingNorm, - detailedAssesmentResultForSignalingNorm, - detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - detailedAssesmentResultForLowerLimitNorm, - detailedAssesmentResultForFactorizedLowerLimitNorm)); + detailedAssessmentResultForFactorizedSignalingNorm, + detailedAssessmentResultForSignalingNorm, + detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + detailedAssessmentResultForLowerLimitNorm, + detailedAssessmentResultForFactorizedLowerLimitNorm)); return FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategoryGroup(output.Result); } Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -r2c04d1e2979c33829feed0f0101879a24b0b9667 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 2c04d1e2979c33829feed0f0101879a24b0b9667) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -85,24 +85,24 @@ /// /// Assembles the detailed assessment based on the input parameters. /// - /// The category Iv - IIv + /// The category Iv - IIv /// to assemble for. - /// The category IIv - IIIv + /// The category IIv - IIIv /// to assemble for. - /// TThe category IIIv - IVv + /// TThe category IIIv - IVv /// to assemble for. - /// The category IVv - Vv + /// The category IVv - Vv /// to assemble for. - /// The category Vv - VIv + /// The category Vv - VIv /// to assemble for. /// A . /// Thrown when /// an error occurs when performing the assembly. - FailureMechanismSectionAssemblyCategoryGroup AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssesmentResultForFactorizedSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForFactorizedLowerLimitNorm); + FailureMechanismSectionAssemblyCategoryGroup AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResultForFactorizedSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForFactorizedLowerLimitNorm); /// /// Assembles the tailor made assessment based on the input parameters. Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs =================================================================== diff -u -r2c04d1e2979c33829feed0f0101879a24b0b9667 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision 2c04d1e2979c33829feed0f0101879a24b0b9667) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -197,34 +197,34 @@ /// /// Creates based on the given parameters. /// - /// The detailed assessment result + /// The detailed assessment result /// for category Iv - IIv. - /// The detailed assessment result for category + /// The detailed assessment result for category /// IIv - IIIv. - /// The detailed assessment + /// The detailed assessment /// result for category IIIv - IVv. - /// The detailed assessment result for category + /// The detailed assessment result for category /// IVv - Vv. - /// The detailed assessment result + /// The detailed assessment result /// for category Vv - VIv. /// The created . /// Thrown when any parameter is an invalid /// . /// Thrown when any parameter is a valid but unsupported /// . public static DetailedCategoryBoundariesCalculationResult CreateDetailedCalculationInputFromCategoryResults( - DetailedAssessmentResultType detailedAssesmentResultForFactorizedSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForFactorizedLowerLimitNorm) + DetailedAssessmentResultType detailedAssessmentResultForFactorizedSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForFactorizedLowerLimitNorm) { return new DetailedCategoryBoundariesCalculationResult( - ConvertDetailedAssessmentResultType(detailedAssesmentResultForFactorizedSignalingNorm), - ConvertDetailedAssessmentResultType(detailedAssesmentResultForSignalingNorm), - ConvertDetailedAssessmentResultType(detailedAssesmentResultForMechanismSpecificLowerLimitNorm), - ConvertDetailedAssessmentResultType(detailedAssesmentResultForLowerLimitNorm), - ConvertDetailedAssessmentResultType(detailedAssesmentResultForFactorizedLowerLimitNorm)); + ConvertDetailedAssessmentResultType(detailedAssessmentResultForFactorizedSignalingNorm), + ConvertDetailedAssessmentResultType(detailedAssessmentResultForSignalingNorm), + ConvertDetailedAssessmentResultType(detailedAssessmentResultForMechanismSpecificLowerLimitNorm), + ConvertDetailedAssessmentResultType(detailedAssessmentResultForLowerLimitNorm), + ConvertDetailedAssessmentResultType(detailedAssessmentResultForFactorizedLowerLimitNorm)); } /// Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r2c04d1e2979c33829feed0f0101879a24b0b9667 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 2c04d1e2979c33829feed0f0101879a24b0b9667) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -799,11 +799,11 @@ { // Setup var random = new Random(39); - var detailedAssesmentResultForFactorizedSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); using (new AssemblyToolKernelFactoryConfig()) { @@ -815,23 +815,23 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - calculator.AssembleDetailedAssessment(detailedAssesmentResultForFactorizedSignalingNorm, - detailedAssesmentResultForSignalingNorm, - detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - detailedAssesmentResultForLowerLimitNorm, - detailedAssesmentResultForFactorizedLowerLimitNorm); + calculator.AssembleDetailedAssessment(detailedAssessmentResultForFactorizedSignalingNorm, + detailedAssessmentResultForSignalingNorm, + detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + detailedAssessmentResultForLowerLimitNorm, + detailedAssessmentResultForFactorizedLowerLimitNorm); // Assert Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultItoII, - GetDetailedCalculationResult(detailedAssesmentResultForFactorizedSignalingNorm)); + GetDetailedCalculationResult(detailedAssessmentResultForFactorizedSignalingNorm)); Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultIItoIII, - GetDetailedCalculationResult(detailedAssesmentResultForSignalingNorm)); + GetDetailedCalculationResult(detailedAssessmentResultForSignalingNorm)); Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultIIItoIV, - GetDetailedCalculationResult(detailedAssesmentResultForMechanismSpecificLowerLimitNorm)); + GetDetailedCalculationResult(detailedAssessmentResultForMechanismSpecificLowerLimitNorm)); Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultIVtoV, - GetDetailedCalculationResult(detailedAssesmentResultForLowerLimitNorm)); + GetDetailedCalculationResult(detailedAssessmentResultForLowerLimitNorm)); Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultVtoVI, - GetDetailedCalculationResult(detailedAssesmentResultForFactorizedLowerLimitNorm)); + GetDetailedCalculationResult(detailedAssessmentResultForFactorizedLowerLimitNorm)); } } @@ -840,11 +840,11 @@ { // Setup var random = new Random(39); - var detailedAssesmentResultForFactorizedSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); using (new AssemblyToolKernelFactoryConfig()) { @@ -857,11 +857,11 @@ // Call TestDelegate test = () => calculator.AssembleDetailedAssessment( - detailedAssesmentResultForFactorizedSignalingNorm, - detailedAssesmentResultForSignalingNorm, - detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - detailedAssesmentResultForLowerLimitNorm, - detailedAssesmentResultForFactorizedLowerLimitNorm); + detailedAssessmentResultForFactorizedSignalingNorm, + detailedAssessmentResultForSignalingNorm, + detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + detailedAssessmentResultForLowerLimitNorm, + detailedAssessmentResultForFactorizedLowerLimitNorm); // Assert var exception = Assert.Throws(test); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs =================================================================== diff -u -r2c04d1e2979c33829feed0f0101879a24b0b9667 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision 2c04d1e2979c33829feed0f0101879a24b0b9667) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -254,19 +254,19 @@ [Test] [TestCaseSource(nameof(InvalidDetailedAssessmentCategoryResults))] public void CreateDetailedCalculationInputFromCategoryResults_InvalidEnumInput_ThrowInvalidEnumerArgumentException( - DetailedAssessmentResultType detailedAssesmentResultForFactorizedSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForFactorizedLowerLimitNorm) + DetailedAssessmentResultType detailedAssessmentResultForFactorizedSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForFactorizedLowerLimitNorm) { // Call TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateDetailedCalculationInputFromCategoryResults( - detailedAssesmentResultForFactorizedSignalingNorm, - detailedAssesmentResultForSignalingNorm, - detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - detailedAssesmentResultForLowerLimitNorm, - detailedAssesmentResultForFactorizedLowerLimitNorm); + detailedAssessmentResultForFactorizedSignalingNorm, + detailedAssessmentResultForSignalingNorm, + detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + detailedAssessmentResultForLowerLimitNorm, + detailedAssessmentResultForFactorizedLowerLimitNorm); // Assert string expectedMessage = $"The value of argument 'detailedAssessmentResult' (99) is invalid for Enum type '{nameof(DetailedAssessmentResultType)}'."; @@ -278,26 +278,26 @@ { // Setup var random = new Random(39); - var detailedAssesmentResultForFactorizedSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); // Call DetailedCategoryBoundariesCalculationResult result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateDetailedCalculationInputFromCategoryResults( - detailedAssesmentResultForFactorizedSignalingNorm, - detailedAssesmentResultForSignalingNorm, - detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - detailedAssesmentResultForLowerLimitNorm, - detailedAssesmentResultForFactorizedLowerLimitNorm); + detailedAssessmentResultForFactorizedSignalingNorm, + detailedAssessmentResultForSignalingNorm, + detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + detailedAssessmentResultForLowerLimitNorm, + detailedAssessmentResultForFactorizedLowerLimitNorm); // Assert - Assert.AreEqual(result.ResultItoII, GetDetailedCalculationResult(detailedAssesmentResultForFactorizedSignalingNorm)); - Assert.AreEqual(result.ResultIItoIII, GetDetailedCalculationResult(detailedAssesmentResultForSignalingNorm)); - Assert.AreEqual(result.ResultIIItoIV, GetDetailedCalculationResult(detailedAssesmentResultForMechanismSpecificLowerLimitNorm)); - Assert.AreEqual(result.ResultIVtoV, GetDetailedCalculationResult(detailedAssesmentResultForLowerLimitNorm)); - Assert.AreEqual(result.ResultVtoVI, GetDetailedCalculationResult(detailedAssesmentResultForFactorizedLowerLimitNorm)); + Assert.AreEqual(result.ResultItoII, GetDetailedCalculationResult(detailedAssessmentResultForFactorizedSignalingNorm)); + Assert.AreEqual(result.ResultIItoIII, GetDetailedCalculationResult(detailedAssessmentResultForSignalingNorm)); + Assert.AreEqual(result.ResultIIItoIV, GetDetailedCalculationResult(detailedAssessmentResultForMechanismSpecificLowerLimitNorm)); + Assert.AreEqual(result.ResultIVtoV, GetDetailedCalculationResult(detailedAssessmentResultForLowerLimitNorm)); + Assert.AreEqual(result.ResultVtoVI, GetDetailedCalculationResult(detailedAssessmentResultForFactorizedLowerLimitNorm)); } private static IEnumerable InvalidDetailedAssessmentCategoryResults Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -r27d496eaae007e7c0be0fe414883cca13aa3db4d -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 27d496eaae007e7c0be0fe414883cca13aa3db4d) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -52,11 +52,11 @@ Assert.AreEqual((DetailedAssessmentProbabilityOnlyResultType) 0, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.IsNull(calculator.DetailedAssessmentAssemblyOutput); - Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssesmentResultForFactorizedSignalingNormInput); - Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssesmentResultForSignalingNormInput); - Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput); - Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssesmentResultForLowerLimitNormInput); - Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssesmentResultForFactorizedLowerLimitNormInput); + Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForFactorizedSignalingNormInput); + Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForSignalingNormInput); + Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput); + Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForLowerLimitNormInput); + Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultForFactorizedLowerLimitNormInput); Assert.IsNull(calculator.DetailedAssessmentAssemblyGroupOutput); Assert.IsNull(calculator.TailorMadeAssessmentCategoriesInput); @@ -427,27 +427,27 @@ { // Setup var random = new Random(39); - var detailedAssesmentResultForFactorizedSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForSignalingNorm = random.NextEnumValue(); - var detailedAssesmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForLowerLimitNorm = random.NextEnumValue(); - var detailedAssesmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForSignalingNorm = random.NextEnumValue(); + var detailedAssessmentResultForMechanismSpecificLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForLowerLimitNorm = random.NextEnumValue(); + var detailedAssessmentResultForFactorizedLowerLimitNorm = random.NextEnumValue(); var calculator = new FailureMechanismSectionAssemblyCalculatorStub(); // Call - calculator.AssembleDetailedAssessment(detailedAssesmentResultForFactorizedSignalingNorm, - detailedAssesmentResultForSignalingNorm, - detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - detailedAssesmentResultForLowerLimitNorm, - detailedAssesmentResultForFactorizedLowerLimitNorm); + calculator.AssembleDetailedAssessment(detailedAssessmentResultForFactorizedSignalingNorm, + detailedAssessmentResultForSignalingNorm, + detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + detailedAssessmentResultForLowerLimitNorm, + detailedAssessmentResultForFactorizedLowerLimitNorm); // Assert - Assert.AreEqual(detailedAssesmentResultForFactorizedSignalingNorm, calculator.DetailedAssesmentResultForFactorizedSignalingNormInput); - Assert.AreEqual(detailedAssesmentResultForSignalingNorm, calculator.DetailedAssesmentResultForSignalingNormInput); - Assert.AreEqual(detailedAssesmentResultForMechanismSpecificLowerLimitNorm, calculator.DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput); - Assert.AreEqual(detailedAssesmentResultForLowerLimitNorm, calculator.DetailedAssesmentResultForLowerLimitNormInput); - Assert.AreEqual(detailedAssesmentResultForFactorizedLowerLimitNorm, calculator.DetailedAssesmentResultForFactorizedLowerLimitNormInput); + Assert.AreEqual(detailedAssessmentResultForFactorizedSignalingNorm, calculator.DetailedAssessmentResultForFactorizedSignalingNormInput); + Assert.AreEqual(detailedAssessmentResultForSignalingNorm, calculator.DetailedAssessmentResultForSignalingNormInput); + Assert.AreEqual(detailedAssessmentResultForMechanismSpecificLowerLimitNorm, calculator.DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput); + Assert.AreEqual(detailedAssessmentResultForLowerLimitNorm, calculator.DetailedAssessmentResultForLowerLimitNormInput); + Assert.AreEqual(detailedAssessmentResultForFactorizedLowerLimitNorm, calculator.DetailedAssessmentResultForFactorizedLowerLimitNormInput); } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs =================================================================== diff -u -r27d496eaae007e7c0be0fe414883cca13aa3db4d -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 27d496eaae007e7c0be0fe414883cca13aa3db4d) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -80,28 +80,28 @@ /// /// Gets the detailed assessment result input for cat Iv - IIv. /// - public DetailedAssessmentResultType DetailedAssesmentResultForFactorizedSignalingNormInput { get; private set; } + public DetailedAssessmentResultType DetailedAssessmentResultForFactorizedSignalingNormInput { get; private set; } /// /// Gets the detailed assessment result input for cat IIv - IIIv. /// - public DetailedAssessmentResultType DetailedAssesmentResultForSignalingNormInput { get; private set; } + public DetailedAssessmentResultType DetailedAssessmentResultForSignalingNormInput { get; private set; } /// /// Gets the detailed assessment result input for cat IIIv - IVv. - /// public DetailedAssessmentResultType DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput { get; private set; } - public DetailedAssessmentResultType DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput { get; private set; } + /// public DetailedAssessmentResultType DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput { get; private set; } + public DetailedAssessmentResultType DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput { get; private set; } /// /// Gets the detailed assessment result input for cat IVv - Vv. - /// public DetailedAssessmentResultType DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput { get; private set; } - public DetailedAssessmentResultType DetailedAssesmentResultForLowerLimitNormInput { get; private set; } + /// public DetailedAssessmentResultType DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput { get; private set; } + public DetailedAssessmentResultType DetailedAssessmentResultForLowerLimitNormInput { get; private set; } /// /// Gets the detailed assessment result input for cat Vv - VIv. /// - public DetailedAssessmentResultType DetailedAssesmentResultForFactorizedLowerLimitNormInput { get; private set; } + public DetailedAssessmentResultType DetailedAssessmentResultForFactorizedLowerLimitNormInput { get; private set; } /// /// Gets or sets the output of the tailor made assessment calculation. @@ -256,22 +256,22 @@ } public FailureMechanismSectionAssemblyCategoryGroup AssembleDetailedAssessment( - DetailedAssessmentResultType detailedAssesmentResultForFactorizedSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForSignalingNorm, - DetailedAssessmentResultType detailedAssesmentResultForMechanismSpecificLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForLowerLimitNorm, - DetailedAssessmentResultType detailedAssesmentResultForFactorizedLowerLimitNorm) + DetailedAssessmentResultType detailedAssessmentResultForFactorizedSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForSignalingNorm, + DetailedAssessmentResultType detailedAssessmentResultForMechanismSpecificLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForLowerLimitNorm, + DetailedAssessmentResultType detailedAssessmentResultForFactorizedLowerLimitNorm) { if (ThrowExceptionOnCalculate) { throw new FailureMechanismSectionAssemblyCalculatorException("Message", new Exception()); } - DetailedAssesmentResultForFactorizedSignalingNormInput = detailedAssesmentResultForFactorizedSignalingNorm; - DetailedAssesmentResultForSignalingNormInput = detailedAssesmentResultForSignalingNorm; - DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput = detailedAssesmentResultForMechanismSpecificLowerLimitNorm; - DetailedAssesmentResultForLowerLimitNormInput = detailedAssesmentResultForLowerLimitNorm; - DetailedAssesmentResultForFactorizedLowerLimitNormInput = detailedAssesmentResultForFactorizedLowerLimitNorm; + DetailedAssessmentResultForFactorizedSignalingNormInput = detailedAssessmentResultForFactorizedSignalingNorm; + DetailedAssessmentResultForSignalingNormInput = detailedAssessmentResultForSignalingNorm; + DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput = detailedAssessmentResultForMechanismSpecificLowerLimitNorm; + DetailedAssessmentResultForLowerLimitNormInput = detailedAssessmentResultForLowerLimitNorm; + DetailedAssessmentResultForFactorizedLowerLimitNormInput = detailedAssessmentResultForFactorizedLowerLimitNorm; if (DetailedAssessmentAssemblyGroupOutput == null) { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rc3a3e2cf9b928ed796d4122ff91d59507f0e6426 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision c3a3e2cf9b928ed796d4122ff91d59507f0e6426) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -158,11 +158,11 @@ StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment(sectionResult); // Assert - Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedSignalingNorm, calculator.DetailedAssesmentResultForFactorizedSignalingNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForSignalingNorm, calculator.DetailedAssesmentResultForSignalingNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, calculator.DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForLowerLimitNorm, calculator.DetailedAssesmentResultForLowerLimitNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedLowerLimitNorm, calculator.DetailedAssesmentResultForFactorizedLowerLimitNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedSignalingNorm, calculator.DetailedAssessmentResultForFactorizedSignalingNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForSignalingNorm, calculator.DetailedAssessmentResultForSignalingNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, calculator.DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForLowerLimitNorm, calculator.DetailedAssessmentResultForLowerLimitNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedLowerLimitNorm, calculator.DetailedAssessmentResultForFactorizedLowerLimitNormInput); } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r7150f912536e96fc66e4c0fb549eb07ae097d4c2 -rae5d5bb9f321fe3a39e8de3a04cc077be9f279d3 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 7150f912536e96fc66e4c0fb549eb07ae097d4c2) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision ae5d5bb9f321fe3a39e8de3a04cc077be9f279d3) @@ -158,11 +158,11 @@ WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.AssembleDetailedAssessment(sectionResult); // Assert - Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedSignalingNorm, calculator.DetailedAssesmentResultForFactorizedSignalingNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForSignalingNorm, calculator.DetailedAssesmentResultForSignalingNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, calculator.DetailedAssesmentResultForMechanismSpecificLowerLimitNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForLowerLimitNorm, calculator.DetailedAssesmentResultForLowerLimitNormInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedLowerLimitNorm, calculator.DetailedAssesmentResultForFactorizedLowerLimitNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedSignalingNorm, calculator.DetailedAssessmentResultForFactorizedSignalingNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForSignalingNorm, calculator.DetailedAssessmentResultForSignalingNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, calculator.DetailedAssessmentResultForMechanismSpecificLowerLimitNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForLowerLimitNorm, calculator.DetailedAssessmentResultForLowerLimitNormInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResultForFactorizedLowerLimitNorm, calculator.DetailedAssessmentResultForFactorizedLowerLimitNormInput); } }