Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rafc241c69adff13529e420efc87ca2b08748b03e -r6caa18ed981739a891762c1dab4e97c0593aedbb --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision afc241c69adff13529e420efc87ca2b08748b03e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 6caa18ed981739a891762c1dab4e97c0593aedbb) @@ -28,7 +28,6 @@ using Ringtoets.Common.Data.AssemblyTool; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Exceptions; -using Ringtoets.Common.Primitives; namespace Ringtoets.ClosingStructures.Data { @@ -114,7 +113,7 @@ failureMechanism.GeneralInput.N); return calculator.AssembleDetailedAssessment( - DetailedAssessmentResultType.Probability, + failureMechanismSectionResult.DetailedAssessmentResult, failureMechanismSectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), categories); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rafc241c69adff13529e420efc87ca2b08748b03e -r6caa18ed981739a891762c1dab4e97c0593aedbb --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision afc241c69adff13529e420efc87ca2b08748b03e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 6caa18ed981739a891762c1dab4e97c0593aedbb) @@ -200,7 +200,10 @@ IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + { + DetailedAssessmentResult = new Random(21).NextEnumValue() + }; using (new AssemblyToolCalculatorFactoryConfig()) { @@ -215,6 +218,7 @@ assessmentSection); // Assert + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); AssertCategoryCalculatorInput(assessmentSection, failureMechanism, categoryCalculator); @@ -376,7 +380,6 @@ } } - [Test] public void AssembleTailorMadeAssembly_AssemblyRan_ReturnsOutput() { @@ -391,7 +394,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorFactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -422,7 +425,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorfactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true;