Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -r361b49b111f552cb7ded1369db9e4b2269733efd -r3d70779c4b1aff2482254bad30078cc94ff73de8 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs (.../AssessmentSectionAssemblyCalculatorStubTest.cs) (revision 361b49b111f552cb7ded1369db9e4b2269733efd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs (.../AssessmentSectionAssemblyCalculatorStubTest.cs) (revision 3d70779c4b1aff2482254bad30078cc94ff73de8) @@ -147,14 +147,14 @@ var random = new Random(21); var calculator = new AssessmentSectionAssemblyCalculatorStub { - AssessmentSectionAssemblyCategoryGroupOutput = random.NextEnumValue() + AssembleFailureMechanismsAssemblyOutput = random.NextEnumValue() }; // Call AssessmentSectionAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty()); // Assert - Assert.AreEqual(calculator.AssessmentSectionAssemblyCategoryGroupOutput, output); + Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyOutput, output); } [Test] @@ -213,7 +213,7 @@ var random = new Random(21); var calculator = new AssessmentSectionAssemblyCalculatorStub { - AssessmentSectionAssemblyCategoryGroupOutput = random.NextEnumValue() + AssembleAssessmentSectionOutput = random.NextEnumValue() }; // Call @@ -223,7 +223,7 @@ random.NextEnumValue())); // Assert - Assert.AreEqual(calculator.AssessmentSectionAssemblyCategoryGroupOutput, output); + Assert.AreEqual(calculator.AssembleAssessmentSectionOutput, output); } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs =================================================================== diff -u -r361b49b111f552cb7ded1369db9e4b2269733efd -r3d70779c4b1aff2482254bad30078cc94ff73de8 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs (.../AssessmentSectionAssemblyCalculatorStub.cs) (revision 361b49b111f552cb7ded1369db9e4b2269733efd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs (.../AssessmentSectionAssemblyCalculatorStub.cs) (revision 3d70779c4b1aff2482254bad30078cc94ff73de8) @@ -72,12 +72,18 @@ public AssessmentSectionAssembly AssessmentSectionAssemblyOutput { get; set; } /// - /// Gets or sets the output of the assessment section assembly category group for failure - /// mechanisms without probability or for assembling the assessment section. + /// Gets or sets the output of the assessment section assembly category group when assembling failure + /// mechanisms without probability. /// - public AssessmentSectionAssemblyCategoryGroup? AssessmentSectionAssemblyCategoryGroupOutput { get; set; } + public AssessmentSectionAssemblyCategoryGroup? AssembleFailureMechanismsAssemblyOutput { get; set; } /// + /// Gets or sets the output of the assessment section assembly category group + /// when assembling an assessment section. + /// + public AssessmentSectionAssemblyCategoryGroup? AssembleAssessmentSectionOutput { get; set; } + + /// /// Sets an indicator whether an exception must be thrown when performing a calculation. /// public bool ThrowExceptionOnCalculate { private get; set; } @@ -108,7 +114,7 @@ FailureMechanismAssemblyCategoryGroupInput = input; - return AssessmentSectionAssemblyCategoryGroupOutput ?? AssessmentSectionAssemblyCategoryGroup.D; + return AssembleFailureMechanismsAssemblyOutput ?? AssessmentSectionAssemblyCategoryGroup.D; } public AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(AssessmentSectionAssemblyCategoryGroup failureMechanismsWithoutProbability, @@ -122,7 +128,7 @@ FailureMechanismsWithoutProbabilityInput = failureMechanismsWithoutProbability; FailureMechanismsWithProbabilityInput = failureMechanismsWithProbability; - return AssessmentSectionAssemblyCategoryGroupOutput ?? AssessmentSectionAssemblyCategoryGroup.C; + return AssembleAssessmentSectionOutput ?? AssessmentSectionAssemblyCategoryGroup.C; } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionAssemblyFactory.cs =================================================================== diff -u -r47633513ef4b8d7f04b175cc5ff8c5ec3702fa22 -r3d70779c4b1aff2482254bad30078cc94ff73de8 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 47633513ef4b8d7f04b175cc5ff8c5ec3702fa22) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 3d70779c4b1aff2482254bad30078cc94ff73de8) @@ -47,7 +47,7 @@ public static class AssessmentSectionAssemblyFactory { /// - /// Assembles the results of the assessment section based on the failure mechanisms with a probability. + /// Assembles the results of the failure mechanisms with probability within the assessment sections. /// /// The assessment section which contains the failure mechanisms to assemble for. /// A . @@ -78,7 +78,7 @@ } /// - /// Assembles the results of the assessment section based on the failure mechanisms without a probability. + /// Assembles the results of failure mechanisms without probability within the assessment section. /// /// The assessment section which contains the failure mechanisms to assemble for. /// A . Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -r47633513ef4b8d7f04b175cc5ff8c5ec3702fa22 -r3d70779c4b1aff2482254bad30078cc94ff73de8 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 47633513ef4b8d7f04b175cc5ff8c5ec3702fa22) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 3d70779c4b1aff2482254bad30078cc94ff73de8) @@ -180,13 +180,13 @@ { var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedAssessmentSectionAssemblyCalculator; - calculator.AssessmentSectionAssemblyCategoryGroupOutput = random.NextEnumValue(); + calculator.AssembleFailureMechanismsAssemblyOutput = random.NextEnumValue(); // Call AssessmentSectionAssemblyCategoryGroup output = AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithoutProbability(assessmentSection); // Assert - Assert.AreEqual(calculator.AssessmentSectionAssemblyCategoryGroupOutput, output); + Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyOutput, output); } }