Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs =================================================================== diff -u -rb14340510bf8a1e46a23be4dd82da57372eabc66 -r8216fb7d5dda9be6480e80ea322bc84d98ddcd6f --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs (.../AssemblyToolKernelFactory.cs) (revision b14340510bf8a1e46a23be4dd82da57372eabc66) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs (.../AssemblyToolKernelFactory.cs) (revision 8216fb7d5dda9be6480e80ea322bc84d98ddcd6f) @@ -64,5 +64,10 @@ { return new AssessmentGradeAssembler(); } + + public ICommonFailureMechanismSectionAssembler CreateCombinedFailureMechanismSectionAssemblyKernel() + { + return new CommonFailureMechanismSectionAssembler(); + } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs =================================================================== diff -u -rb14340510bf8a1e46a23be4dd82da57372eabc66 -r8216fb7d5dda9be6480e80ea322bc84d98ddcd6f --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs (.../IAssemblyToolKernelFactory.cs) (revision b14340510bf8a1e46a23be4dd82da57372eabc66) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs (.../IAssemblyToolKernelFactory.cs) (revision 8216fb7d5dda9be6480e80ea322bc84d98ddcd6f) @@ -51,5 +51,11 @@ /// /// A new . IAssessmentGradeAssembler CreateAssessmentSectionAssemblyKernel(); + + /// + /// Creates a combined failure mechanism section assembly kernel. + /// + /// A new . + ICommonFailureMechanismSectionAssembler CreateCombinedFailureMechanismSectionAssemblyKernel(); } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs =================================================================== diff -u -rb14340510bf8a1e46a23be4dd82da57372eabc66 -r8216fb7d5dda9be6480e80ea322bc84d98ddcd6f --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs (.../AssemblyToolKernelFactoryTest.cs) (revision b14340510bf8a1e46a23be4dd82da57372eabc66) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs (.../AssemblyToolKernelFactoryTest.cs) (revision 8216fb7d5dda9be6480e80ea322bc84d98ddcd6f) @@ -69,7 +69,7 @@ } [Test] - public void CreateAssemblyCategoriesKernel_Always_ReturnsKernelCategoriesCalculator() + public void CreateAssemblyCategoriesKernel_Always_ReturnsKernelCategoryLimitsCalculator() { // Setup IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance; @@ -82,7 +82,7 @@ } [Test] - public void CreateFailureMechanismSectionAssemblyKernel_Always_ReturnsKernelFailureMechanismSectionAssemblyCalculator() + public void CreateFailureMechanismSectionAssemblyKernel_Always_ReturnsKernelAssessmentResultsTranslator() { // Setup IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance; @@ -95,7 +95,7 @@ } [Test] - public void CreateFailureMechanismAssemblyKernel_Always_ReturnsKernelFailureMechanismAssemblyCalculator() + public void CreateFailureMechanismAssemblyKernel_Always_ReturnsKernelFailureMechanismResultAssembler() { // Setup IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance; @@ -108,7 +108,7 @@ } [Test] - public void CreateAssessmentSectionAssemblyKernel_Always_ReturnsKernelAssessmentSectionAssemblyCalculator() + public void CreateAssessmentSectionAssemblyKernel_Always_ReturnsKernelAssessmentGradeAssembler() { // Setup IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance; @@ -119,5 +119,18 @@ // Assert Assert.IsInstanceOf(kernel); } + + [Test] + public void CreateCombinedFailureMechanismSectionAssemblyKernel_Always_ReturnsKernelCommonFailureMechanismSectionAssembler() + { + // Setup + IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance; + + // Call + ICommonFailureMechanismSectionAssembler kernel = factory.CreateCombinedFailureMechanismSectionAssemblyKernel(); + + // Assert + Assert.IsInstanceOf(kernel); + } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/TestAssemblyToolKernelFactoryTest.cs =================================================================== diff -u -rb14340510bf8a1e46a23be4dd82da57372eabc66 -r8216fb7d5dda9be6480e80ea322bc84d98ddcd6f --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/TestAssemblyToolKernelFactoryTest.cs (.../TestAssemblyToolKernelFactoryTest.cs) (revision b14340510bf8a1e46a23be4dd82da57372eabc66) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/TestAssemblyToolKernelFactoryTest.cs (.../TestAssemblyToolKernelFactoryTest.cs) (revision 8216fb7d5dda9be6480e80ea322bc84d98ddcd6f) @@ -41,6 +41,7 @@ Assert.IsNotNull(factory.LastCreatedFailureMechanismSectionAssemblyKernel); Assert.IsNotNull(factory.LastCreatedFailureMechanismAssemblyKernel); Assert.IsNotNull(factory.LastCreatedAssessmentSectionAssemblyKernel); + Assert.IsNotNull(factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel); } [Test] @@ -94,5 +95,18 @@ // Assert Assert.AreSame(factory.LastCreatedAssessmentSectionAssemblyKernel, kernel); } + + [Test] + public void CreateCombinedFailureMechanismSectionAssemblyKernel_Always_ReturnLastCreatedCombinedFailureMechanismSectionAssemblyKernel() + { + // Setup + var factory = new TestAssemblyToolKernelFactory(); + + // Call + ICommonFailureMechanismSectionAssembler kernel = factory.CreateCombinedFailureMechanismSectionAssemblyKernel(); + + // Assert + Assert.AreSame(factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel, kernel); + } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs =================================================================== diff -u -r73961743fdbd1f57320393a37d4b551dc56ff47d -r8216fb7d5dda9be6480e80ea322bc84d98ddcd6f --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs (.../TestAssemblyToolKernelFactory.cs) (revision 73961743fdbd1f57320393a37d4b551dc56ff47d) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs (.../TestAssemblyToolKernelFactory.cs) (revision 8216fb7d5dda9be6480e80ea322bc84d98ddcd6f) @@ -40,6 +40,7 @@ LastCreatedFailureMechanismSectionAssemblyKernel = new FailureMechanismSectionAssemblyKernelStub(); LastCreatedFailureMechanismAssemblyKernel = new FailureMechanismAssemblyKernelStub(); LastCreatedAssessmentSectionAssemblyKernel = new AssessmentSectionAssemblyKernelStub(); + LastCreatedCombinedFailureMechanismSectionAssemblyKernel = new CombinedFailureMechanismSectionAssemblyKernelStub(); } /// @@ -62,6 +63,11 @@ /// public AssessmentSectionAssemblyKernelStub LastCreatedAssessmentSectionAssemblyKernel { get; } + /// + /// Gets the last created combined failure mechanism section assembly kernel. + /// + public CombinedFailureMechanismSectionAssemblyKernelStub LastCreatedCombinedFailureMechanismSectionAssemblyKernel { get; } + public ICategoryLimitsCalculator CreateAssemblyCategoriesKernel() { return LastCreatedAssemblyCategoriesKernel; @@ -81,5 +87,10 @@ { return LastCreatedAssessmentSectionAssemblyKernel; } + + public ICommonFailureMechanismSectionAssembler CreateCombinedFailureMechanismSectionAssemblyKernel() + { + return LastCreatedCombinedFailureMechanismSectionAssemblyKernel; + } } } \ No newline at end of file