Fisheye: Tag 411152ca8360a1f0b6ea680314f5771ac4792dc9 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubOld.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubOld.cs	(revision 0)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubOld.cs	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -0,0 +1,187 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
+
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly
+{
+    /// <summary>
+    /// Assessment section assembly calculator stub for testing purposes.
+    /// </summary>
+    public class AssessmentSectionAssemblyCalculatorStubOld : IAssessmentSectionAssemblyCalculatorOld
+    {
+        /// <summary>
+        /// Gets the lower norm input when assembling the assessment section with failure mechanisms
+        /// with probability.
+        /// </summary>
+        public double LowerLimitNormInput { get; private set; }
+
+        /// <summary>
+        /// Gets the lower norm input when assembling the assessment section with failure mechanisms
+        /// with probability.
+        /// </summary>
+        public double SignalingNormInput { get; private set; }
+
+        /// <summary>
+        /// Gets the failure probability margin factory input when assembling the assessment section
+        /// with failure mechanisms with probability.
+        /// </summary>
+        public double FailureProbabilityMarginFactorInput { get; private set; }
+
+        /// <summary>
+        /// Gets the collection of failure mechanism assembly input when assembling the
+        /// assessment section with failure mechanisms with probability.
+        /// </summary>
+        public IEnumerable<FailureMechanismAssembly> FailureMechanismAssemblyInput { get; private set; }
+
+        /// <summary>
+        /// Gets the collection of failure mechanism assembly category group input when assembling the 
+        /// assessment section with failure mechanisms without probability.
+        /// </summary>
+        public IEnumerable<FailureMechanismAssemblyCategoryGroup> FailureMechanismAssemblyCategoryGroupInput { get; private set; }
+
+        /// <summary>
+        /// Gets the failure mechanisms without probability input when assembling the assessment section.
+        /// </summary>
+        public FailureMechanismAssemblyCategoryGroup FailureMechanismsWithoutProbabilityInput { get; private set; }
+
+        /// <summary>
+        /// Gets the failure mechanisms with probability input when assembling the assessment section.
+        /// </summary>
+        public FailureMechanismAssembly FailureMechanismsWithProbabilityInput { get; private set; }
+
+        /// <summary>
+        /// Gets the combined failure mechanism sections input.
+        /// </summary>
+        public IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> CombinedFailureMechanismSectionsInput { get; private set; }
+
+        /// <summary>
+        /// Gets the assessment section length input.
+        /// </summary>
+        public double AssessmentSectionLength { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the output of the assessment section assembly for failure
+        ///  mechanisms with probability.
+        /// </summary>
+        public FailureMechanismAssembly AssembleFailureMechanismsAssemblyOutput { get; set; }
+
+        /// <summary>
+        /// Gets or sets the output of the assessment section assembly category group when assembling failure 
+        /// mechanisms without probability.
+        /// </summary>
+        public FailureMechanismAssemblyCategoryGroup? AssembleFailureMechanismsAssemblyCategoryGroupOutput { get; set; }
+
+        /// <summary>
+        /// Gets or sets the output of the assessment section assembly category group 
+        /// when assembling an assessment section.
+        /// </summary>
+        public AssessmentSectionAssemblyCategoryGroup? AssembleAssessmentSectionCategoryGroupOutput { get; set; }
+
+        /// <summary>
+        /// Gets or sets the output of the combined failure mechanism section assembly.
+        /// </summary>
+        public IEnumerable<CombinedFailureMechanismSectionAssembly> CombinedFailureMechanismSectionAssemblyOutput { get; set; }
+
+        /// <summary>
+        /// Sets an indicator whether an exception must be thrown while performing a calculation.
+        /// </summary>
+        public bool ThrowExceptionOnCalculate { private get; set; }
+
+        public FailureMechanismAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
+                                                                  double signalingNorm,
+                                                                  double lowerLimitNorm,
+                                                                  double failureProbabilityMarginFactor)
+        {
+            if (ThrowExceptionOnCalculate)
+            {
+                throw new AssessmentSectionAssemblyCalculatorException("Message", new Exception());
+            }
+
+            FailureMechanismAssemblyInput = input;
+            LowerLimitNormInput = lowerLimitNorm;
+            SignalingNormInput = signalingNorm;
+            FailureProbabilityMarginFactorInput = failureProbabilityMarginFactor;
+
+            return AssembleFailureMechanismsAssemblyOutput ??
+                   (AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly(0.75, FailureMechanismAssemblyCategoryGroup.IIIt));
+        }
+
+        public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanisms(IEnumerable<FailureMechanismAssemblyCategoryGroup> input)
+        {
+            if (ThrowExceptionOnCalculate)
+            {
+                throw new AssessmentSectionAssemblyCalculatorException("Message", new Exception());
+            }
+
+            FailureMechanismAssemblyCategoryGroupInput = input;
+
+            if (AssembleFailureMechanismsAssemblyCategoryGroupOutput == null)
+            {
+                AssembleFailureMechanismsAssemblyCategoryGroupOutput = FailureMechanismAssemblyCategoryGroup.IIIt;
+            }
+
+            return AssembleFailureMechanismsAssemblyCategoryGroupOutput.Value;
+        }
+
+        public AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(FailureMechanismAssemblyCategoryGroup failureMechanismsWithoutProbability,
+                                                                                FailureMechanismAssembly failureMechanismsWithProbability)
+        {
+            if (ThrowExceptionOnCalculate)
+            {
+                throw new AssessmentSectionAssemblyCalculatorException("Message", new Exception());
+            }
+
+            FailureMechanismsWithoutProbabilityInput = failureMechanismsWithoutProbability;
+            FailureMechanismsWithProbabilityInput = failureMechanismsWithProbability;
+
+            if (AssembleAssessmentSectionCategoryGroupOutput == null)
+            {
+                AssembleAssessmentSectionCategoryGroupOutput = AssessmentSectionAssemblyCategoryGroup.C;
+            }
+
+            return AssembleAssessmentSectionCategoryGroupOutput.Value;
+        }
+
+        public IEnumerable<CombinedFailureMechanismSectionAssembly> AssembleCombinedFailureMechanismSections(IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input,
+                                                                                                             double assessmentSectionLength)
+        {
+            if (ThrowExceptionOnCalculate)
+            {
+                throw new AssessmentSectionAssemblyCalculatorException("Message", new Exception());
+            }
+
+            CombinedFailureMechanismSectionsInput = input;
+            AssessmentSectionLength = assessmentSectionLength;
+
+            return CombinedFailureMechanismSectionAssemblyOutput ?? (CombinedFailureMechanismSectionAssemblyOutput = new[]
+                                                                        {
+                                                                            new CombinedFailureMechanismSectionAssembly(
+                                                                                new CombinedAssemblyFailureMechanismSection(0, 1, FailureMechanismSectionAssemblyCategoryGroup.IIIv),
+                                                                                input.Select(failureMechanism => FailureMechanismSectionAssemblyCategoryGroup.VIv).ToArray())
+                                                                        });
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactoryOld.cs
===================================================================
diff -u -r6c60ef8aa494a4e0ff4a77657a751478162efceb -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactoryOld.cs	(.../TestAssemblyToolCalculatorFactoryOld.cs)	(revision 6c60ef8aa494a4e0ff4a77657a751478162efceb)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactoryOld.cs	(.../TestAssemblyToolCalculatorFactoryOld.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -41,7 +41,7 @@
             LastCreatedAssemblyCategoriesCalculator = new AssemblyCategoriesCalculatorStub();
             LastCreatedFailureMechanismSectionAssemblyCalculator = new FailureMechanismSectionAssemblyCalculatorOldStub();
             LastCreatedFailureMechanismAssemblyCalculator = new FailureMechanismAssemblyCalculatorOldStub();
-            LastCreatedAssessmentSectionAssemblyCalculator = new AssessmentSectionAssemblyCalculatorStub();
+            LastCreatedAssessmentSectionAssemblyCalculator = new AssessmentSectionAssemblyCalculatorStubOld();
         }
 
         /// <summary>
@@ -60,9 +60,9 @@
         public FailureMechanismAssemblyCalculatorOldStub LastCreatedFailureMechanismAssemblyCalculator { get; }
 
         /// <summary>
-        /// Gets the last created <see cref="AssessmentSectionAssemblyCalculatorStub"/>.
+        /// Gets the last created <see cref="AssessmentSectionAssemblyCalculatorStubOld"/>.
         /// </summary>
-        public AssessmentSectionAssemblyCalculatorStub LastCreatedAssessmentSectionAssemblyCalculator { get; }
+        public AssessmentSectionAssemblyCalculatorStubOld LastCreatedAssessmentSectionAssemblyCalculator { get; }
 
         public IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactoryOld factory)
         {
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -78,7 +78,7 @@
                 failureMechanismAssemblyCalculator.FailureMechanismAssemblyOutput = new FailureMechanismAssembly(
                     random.NextDouble(), random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
 
-                AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
 
                 // Call
                 AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithProbability(assessmentSection,
@@ -106,7 +106,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly(
                     random.NextDouble(), random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
 
@@ -126,7 +126,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -232,7 +232,7 @@
                 FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
                 failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput = random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>();
 
-                AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
 
                 // Call
                 AssessmentSectionAssemblyFactory.AssembleFailureMechanismsWithoutProbability(assessmentSection, random.NextBoolean());
@@ -254,7 +254,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>();
 
                 // Call
@@ -273,7 +273,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -455,7 +455,7 @@
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
                 FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
 
-                AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly(
                     random.NextDouble(), random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
                 assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>();
@@ -489,7 +489,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly(
                     random.NextDouble(), random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
                 calculator.AssembleAssessmentSectionCategoryGroupOutput = random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>();
@@ -509,7 +509,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -687,7 +687,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.CombinedFailureMechanismSectionAssemblyOutput = new CombinedFailureMechanismSectionAssembly[0];
 
                 // Call
@@ -725,7 +725,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.CombinedFailureMechanismSectionAssemblyOutput = new[]
                 {
                     CreateCombinedFailureMechanismSectionAssembly(assessmentSection, 20),
@@ -785,7 +785,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -904,7 +904,7 @@
 
         private static void AssertGroup1And2FailureMechanismInputs(AssessmentSection assessmentSection,
                                                                    FailureMechanismAssembly expectedFailureMechanismAssembly,
-                                                                   AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator)
+                                                                   AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator)
         {
             IEnumerable<IFailureMechanism> expectedFailureMechanisms = GetExpectedGroup1And2FailureMechanisms(assessmentSection);
             IEnumerable<FailureMechanismAssembly> failureMechanismAssemblyInput = assessmentSectionAssemblyCalculator.FailureMechanismAssemblyInput;
@@ -918,7 +918,7 @@
 
         private static void AssertGroup3And4FailureMechanismInputs(AssessmentSection assessmentSection,
                                                                    FailureMechanismAssemblyCategoryGroup expectedAssemblyCategoryGroup,
-                                                                   AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator)
+                                                                   AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator)
         {
             IEnumerable<IFailureMechanism> expectedFailureMechanisms = GetExpectedGroup3And4FailureMechanisms(assessmentSection);
             IEnumerable<FailureMechanismAssemblyCategoryGroup> failureMechanismAssemblyInput =
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs	(.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs)	(revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs	(.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -73,7 +73,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 CombinedFailureMechanismSectionAssembly[] failureMechanismSectionAssembly =
                 {
                     CreateCombinedFailureMechanismSectionAssembly(assessmentSection, 20),
@@ -149,7 +149,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -152,7 +152,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 CombinedFailureMechanismSectionAssembly[] failureMechanismSectionAssembly =
                 {
                     CreateCombinedFailureMechanismSectionAssembly(assessmentSection,
@@ -263,7 +263,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.CombinedFailureMechanismSectionAssemblyOutput = new[]
                 {
                     CreateCombinedFailureMechanismSectionAssembly(assessmentSection,
@@ -315,7 +315,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.CombinedFailureMechanismSectionAssemblyOutput = new[]
                 {
                     CreateCombinedFailureMechanismSectionAssembly(assessmentSection,
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs
===================================================================
diff -u -r520b3153840dada327c8bd936a4d6a7a07427331 -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs	(.../AssemblyResultPerSectionViewTest.cs)	(revision 520b3153840dada327c8bd936a4d6a7a07427331)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs	(.../AssemblyResultPerSectionViewTest.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -371,7 +371,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = withError;
 
                 using (AssemblyResultPerSectionView view = ShowAssemblyResultPerSectionView(assessmentSection))
@@ -516,7 +516,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 using (AssemblyResultPerSectionView view = ShowAssemblyResultPerSectionView())
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs	(.../AssemblyResultTotalViewTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs	(.../AssemblyResultTotalViewTest.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -257,7 +257,7 @@
 
                 // When
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.AssembleAssessmentSectionCategoryGroupOutput = AssessmentSectionAssemblyCategoryGroup.A;
                 calculator.AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly(0.5, FailureMechanismAssemblyCategoryGroup.IIt);
                 calculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput = FailureMechanismAssemblyCategoryGroup.IVt;
@@ -288,7 +288,7 @@
 
                 // When
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 buttonTester.Click();
@@ -307,7 +307,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 using (ShowAssemblyResultTotalView())
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs
===================================================================
diff -u -r621e3830c5b750b1e54c761f8f6bb0690a555370 -r411152ca8360a1f0b6ea680314f5771ac4792dc9
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs	(.../AssemblyExporterTest.cs)	(revision 621e3830c5b750b1e54c761f8f6bb0690a555370)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs	(.../AssemblyExporterTest.cs)	(revision 411152ca8360a1f0b6ea680314f5771ac4792dc9)
@@ -96,7 +96,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 assessmentSectionAssemblyCalculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -124,7 +124,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
+                AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator;
                 assessmentSectionAssemblyCalculator.AssembleAssessmentSectionCategoryGroupOutput = invalidAssessmentSectionAssemblyCategoryGroup;
 
                 // Call