Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailurePathAssemblyHelper.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailurePathAssemblyHelper.cs	(revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailurePathAssemblyHelper.cs	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -0,0 +1,114 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
+
+namespace Riskeer.Common.Data.AssemblyTool
+{
+    /// <summary>
+    /// Class that contains helper methods for assembling a failure path.
+    /// </summary>
+    public static class FailurePathAssemblyHelper
+    {
+        /// <summary>
+        /// Assembles the failure mechanism section.
+        /// </summary>
+        /// <param name="sectionResult">The section result to assemble.</param>
+        /// <param name="performSectionAssemblyFunc">The <see cref="Func{T1,TResult}"/>to perform the assembly.</param>
+        /// <typeparam name="TSectionResult">The type of section result.</typeparam>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <remarks>When the failure mechanism section cannot be assembled,
+        /// a <see cref="DefaultFailureMechanismSectionAssemblyResult"/> is created.</remarks>
+        public static FailureMechanismSectionAssemblyResult AssembleFailureMechanismSection<TSectionResult>(
+            TSectionResult sectionResult, Func<TSectionResult, FailureMechanismSectionAssemblyResult> performSectionAssemblyFunc)
+            where TSectionResult : FailureMechanismSectionResult
+        {
+            if (sectionResult == null)
+            {
+                throw new ArgumentNullException(nameof(sectionResult));
+            }
+
+            if (performSectionAssemblyFunc == null)
+            {
+                throw new ArgumentNullException(nameof(performSectionAssemblyFunc));
+            }
+
+            try
+            {
+                return performSectionAssemblyFunc(sectionResult);
+            }
+            catch (AssemblyException)
+            {
+                return new DefaultFailureMechanismSectionAssemblyResult();
+            }
+        }
+
+        /// <summary>
+        /// Assembles the failure path.
+        /// </summary>
+        /// <param name="failurePath">The <see cref="IFailurePath"/> to assemble.</param>
+        /// <param name="performSectionAssemblyFunc">The <see cref="Func{T1,TResult}"/> to perform the failure mechanism section assembly.</param>
+        /// <param name="failurePathN">The n value of the <paramref name="failurePath"/>.</param>
+        /// <typeparam name="TSectionResult">The type of section result.</typeparam>
+        /// <returns>The failure path probability.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failurePath"/>
+        /// or <paramref name="performSectionAssemblyFunc"/> is <c>null</c>.</exception>
+        /// <exception cref="AssemblyException">Thrown when the failure mechanism could not be successfully assembled.</exception>
+        public static double AssembleFailurePath<TSectionResult>(
+            IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult> failurePath,
+            Func<TSectionResult, FailureMechanismSectionAssemblyResult> performSectionAssemblyFunc,
+            double failurePathN)
+            where TSectionResult : FailureMechanismSectionResult
+        {
+            if (failurePath == null)
+            {
+                throw new ArgumentNullException(nameof(failurePath));
+            }
+
+            if (performSectionAssemblyFunc == null)
+            {
+                throw new ArgumentNullException(nameof(performSectionAssemblyFunc));
+            }
+
+            if (!failurePath.InAssembly)
+            {
+                return double.NaN;
+            }
+
+            FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult;
+            if (assemblyResult.ProbabilityResultType == FailurePathAssemblyProbabilityResultType.Manual)
+            {
+                return assemblyResult.ManualFailurePathAssemblyProbability;
+            }
+
+            return FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
+                failurePathN, failurePath.SectionResults.Select(sr => AssembleFailureMechanismSection(
+                                                                    sr, performSectionAssemblyFunc))
+                                         .ToArray());
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 3f942d826d774b47dac26a16a96d5acc17a8bc66 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailurePath/FailurePathAssemblyHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailurePathAssemblyHelperTest.cs
===================================================================
diff -u
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailurePathAssemblyHelperTest.cs	(revision 0)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailurePathAssemblyHelperTest.cs	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -0,0 +1,306 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators;
+using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
+using Riskeer.Common.Data.AssemblyTool;
+using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
+using Riskeer.Common.Data.TestUtil;
+
+namespace Riskeer.Common.Data.Test.AssemblyTool
+{
+    [TestFixture]
+    public class FailurePathAssemblyHelperTest
+    {
+        [Test]
+        public void AssembleFailureMechanismSection_SectionResultNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => FailurePathAssemblyHelper.AssembleFailureMechanismSection<FailureMechanismSectionResult>(null, sr => null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("sectionResult", exception.ParamName);
+        }
+
+        [Test]
+        public void AssembleFailureMechanismSection_PerformSectionAssemblyFuncNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var sectionResult = new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+            // Call
+            void Call() => FailurePathAssemblyHelper.AssembleFailureMechanismSection(sectionResult, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("performSectionAssemblyFunc", exception.ParamName);
+        }
+
+        [Test]
+        public void AssembleFailureMechanismSection_WithValidData_ReturnsFailureMechanismSectionAssemblyResult()
+        {
+            // Setup
+            var sectionResult = new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+            var random = new Random(21);
+            var expectedAssemblyResult = new FailureMechanismSectionAssemblyResult(
+                random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
+            // Call
+            FailureMechanismSectionAssemblyResult assemblyResult = FailurePathAssemblyHelper.AssembleFailureMechanismSection(
+                sectionResult, sr => expectedAssemblyResult);
+
+            // Assert
+            Assert.AreSame(expectedAssemblyResult, assemblyResult);
+        }
+
+        [Test]
+        public void AssembleFailureMechanismSection_PerformSectionAssemblyFuncThrowsAssemblyException_ReturnsDefaultFailureMechanismSectionAssemblyResult()
+        {
+            // Setup
+            var sectionResult = new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+            // Call
+            FailureMechanismSectionAssemblyResult assemblyResult = FailurePathAssemblyHelper.AssembleFailureMechanismSection(
+                sectionResult, sr => throw new AssemblyException());
+
+            // Assert
+            Assert.IsInstanceOf<DefaultFailureMechanismSectionAssemblyResult>(assemblyResult);
+        }
+
+        [Test]
+        public void AssembleFailurePath_FailurePathNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => FailurePathAssemblyHelper.AssembleFailurePath<FailureMechanismSectionResult>(
+                null, sr => null, double.NaN);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("failurePath", exception.ParamName);
+        }
+
+        [Test]
+        public void AssembleFailurePath_PerformSectionAssemblyFuncNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            mocks.ReplayAll();
+
+            // Call
+            void Call() => FailurePathAssemblyHelper.AssembleFailurePath(
+                failurePath, null, double.NaN);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("performSectionAssemblyFunc", exception.ParamName);
+        }
+
+        [Test]
+        public void AssembleFailurePath_WithFailureInAssemblyFalse_ReturnsNaN()
+        {
+            // Setup
+            var random = new Random(21);
+
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            mocks.ReplayAll();
+
+            failurePath.InAssembly = false;
+
+            // Call
+            double assemblyResult = FailurePathAssemblyHelper.AssembleFailurePath(
+                failurePath, sr => null, random.NextDouble());
+
+            // Assert
+            Assert.IsNaN(assemblyResult);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AssembleFailurePath_WithFailurePathAssemblyProbabilityResultTypeManual_ReturnsExpectedAssemblyResult()
+        {
+            // Setup
+            var random = new Random(21);
+            double expectedAssemblyResult = random.NextDouble();
+
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            failurePath.Stub(fp => fp.AssemblyResult)
+                       .Return(new FailurePathAssemblyResult
+                       {
+                           ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+                           ManualFailurePathAssemblyProbability = expectedAssemblyResult
+                       });
+            mocks.ReplayAll();
+
+            failurePath.InAssembly = true;
+
+            // Call
+            double assemblyResult = FailurePathAssemblyHelper.AssembleFailurePath(failurePath, sr => null, double.NaN);
+
+            // Assert
+            Assert.AreEqual(expectedAssemblyResult, assemblyResult);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AssembleFailurePath_WithFailurePathAssemblyProbabilityResultTypeAutomatic_InputCorrectlySetOnCalculator()
+        {
+            // Setup
+            var random = new Random(21);
+            double failureMechanismN = random.NextDouble();
+
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            failurePath.Stub(fp => fp.AssemblyResult)
+                       .Return(new FailurePathAssemblyResult
+                       {
+                           ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+                           ManualFailurePathAssemblyProbability = double.NaN
+                       });
+            failurePath.Stub(fp => fp.SectionResults)
+                       .Return(new ObservableList<TestFailureMechanismSectionResult>
+                       {
+                           new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
+                       });
+            mocks.ReplayAll();
+
+            failurePath.InAssembly = true;
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var failureMechanismSectionAssemblyResult = new FailureMechanismSectionAssemblyResult(
+                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
+                // Call
+                FailurePathAssemblyHelper.AssembleFailurePath(failurePath, sr => failureMechanismSectionAssemblyResult, failureMechanismN);
+
+                // Assert
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
+
+                CollectionAssert.AreEqual(new[]
+                {
+                    failureMechanismSectionAssemblyResult
+                }, failureMechanismAssemblyCalculator.SectionAssemblyResultsInput);
+                Assert.AreEqual(failureMechanismN, failureMechanismAssemblyCalculator.FailureMechanismN);
+            }
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AssembleFailurePath_WithFailurePathAssemblyProbabilityResultTypeAutomaticAndFailureMechanismSectionAssemblyThrowsException_InputCorrectlySetOnCalculator()
+        {
+            // Setup
+            var random = new Random(21);
+            double failureMechanismN = random.NextDouble();
+
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            failurePath.Stub(fp => fp.AssemblyResult)
+                       .Return(new FailurePathAssemblyResult
+                       {
+                           ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+                           ManualFailurePathAssemblyProbability = double.NaN
+                       });
+            failurePath.Stub(fp => fp.SectionResults)
+                       .Return(new ObservableList<TestFailureMechanismSectionResult>
+                       {
+                           new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
+                       });
+            mocks.ReplayAll();
+
+            failurePath.InAssembly = true;
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                // Call
+                FailurePathAssemblyHelper.AssembleFailurePath(failurePath, sr => throw new AssemblyException(), failureMechanismN);
+
+                // Assert
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
+
+                Assert.AreEqual(1, failureMechanismAssemblyCalculator.SectionAssemblyResultsInput.Count());
+                Assert.IsInstanceOf<DefaultFailureMechanismSectionAssemblyResult>(failureMechanismAssemblyCalculator.SectionAssemblyResultsInput.First());
+                Assert.AreEqual(failureMechanismN, failureMechanismAssemblyCalculator.FailureMechanismN);
+            }
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AssembleFailurePath_WithFailurePathAssemblyProbabilityResultTypeAutomatic_ReturnsExpectedAssemblyResult()
+        {
+            // Setup
+            var random = new Random(21);
+            double expectedAssemblyResult = random.NextDouble();
+
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            failurePath.Stub(fp => fp.AssemblyResult)
+                       .Return(new FailurePathAssemblyResult
+                       {
+                           ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+                           ManualFailurePathAssemblyProbability = double.NaN
+                       });
+            failurePath.Stub(fp => fp.SectionResults)
+                       .Return(new ObservableList<TestFailureMechanismSectionResult>
+                       {
+                           new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
+                       });
+            mocks.ReplayAll();
+
+            failurePath.InAssembly = true;
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
+                failureMechanismAssemblyCalculator.AssemblyResult = expectedAssemblyResult;
+
+                // Call
+                double assemblyResult = FailurePathAssemblyHelper.AssembleFailurePath(failurePath, sr => null, double.NaN);
+
+                // Assert
+                Assert.AreEqual(expectedAssemblyResult, assemblyResult);
+            }
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 3f942d826d774b47dac26a16a96d5acc17a8bc66 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/FailurePath/FailurePathAssemblyHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -23,7 +23,6 @@
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.DuneErosion.Data
 {
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -26,7 +26,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.GrassCoverErosionInwards.Data
 {
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -25,7 +25,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.GrassCoverErosionOutwards.Data
 {
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs
===================================================================
diff -u -rbc8ab83ed6e858faf1b2e3dc4d8ce51f6cb9188f -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs	(.../CombinedAssemblyFailureMechanismSectionFactory.cs)	(revision bc8ab83ed6e858faf1b2e3dc4d8ce51f6cb9188f)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs	(.../CombinedAssemblyFailureMechanismSectionFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -170,7 +170,9 @@
 
             return sectionResults.Select(sectionResult =>
                                  {
-                                     FailureMechanismSectionAssemblyResult failureMechanismSectionAssemblyResult = getAssemblyFunc(sectionResult, assessmentSection);
+                                     FailureMechanismSectionAssemblyResult failureMechanismSectionAssemblyResult = FailurePathAssemblyHelper.AssembleFailureMechanismSection(
+                                         sectionResult, sr => getAssemblyFunc(sr, assessmentSection));
+
                                      CombinedAssemblyFailureMechanismSection section = CreateSection(
                                          sectionResult, failureMechanismSectionAssemblyResult.AssemblyGroup, totalSectionsLength);
                                      totalSectionsLength = section.SectionEnd;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -23,7 +23,6 @@
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.Integration.Data.StandAlone.AssemblyFactories
 {
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs	(.../StandAloneFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs	(.../StandAloneFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -25,7 +25,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.Integration.Data.StandAlone.AssemblyFactories
 {
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -26,7 +26,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Data.Probability;
 
 namespace Riskeer.MacroStabilityInwards.Data
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -25,7 +25,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Data.Probability;
 
 namespace Riskeer.Piping.Data
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -25,7 +25,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.StabilityStoneCover.Data
 {
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6d08d2a395b4412431bf333b84053b605b896935 -r3f942d826d774b47dac26a16a96d5acc17a8bc66
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 6d08d2a395b4412431bf333b84053b605b896935)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 3f942d826d774b47dac26a16a96d5acc17a8bc66)
@@ -25,7 +25,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.WaveImpactAsphaltCover.Data
 {