Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculatorOld.cs =================================================================== diff -u -r2f660e66788675684eccbdaeeaa7923d332e529e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculatorOld.cs (.../FailureMechanismAssemblyCalculatorOld.cs) (revision 2f660e66788675684eccbdaeeaa7923d332e529e) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculatorOld.cs (.../FailureMechanismAssemblyCalculatorOld.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -35,7 +35,7 @@ /// /// Class representing a failure mechanism assembly calculator. /// - public class FailureMechanismAssemblyCalculatorOld : IFailureMechanismAssemblyCalculator + public class FailureMechanismAssemblyCalculatorOld : IFailureMechanismAssemblyCalculatorOld { private readonly IAssemblyToolKernelFactoryOld factory; Fisheye: Tag becb20be0283702deba5ab628e9150e9c749e130 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculatorOld.cs =================================================================== diff -u --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculatorOld.cs (revision 0) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculatorOld.cs (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -0,0 +1,53 @@ +// 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 . +// +// 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.Collections.Generic; +using Riskeer.AssemblyTool.Data; + +namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly +{ + /// + /// Interface representing a failure mechanism assembly calculator. + /// + public interface IFailureMechanismAssemblyCalculatorOld + { + /// + /// Assembles the failure mechanism using the given . + /// + /// The collection of to assemble for. + /// A . + /// Thrown when + /// an error occurs while assembling. + FailureMechanismAssemblyCategoryGroup Assemble(IEnumerable sectionCategories); + + /// + /// Assembles the failure mechanism with failure probabilities using the given parameters. + /// + /// The collection of to assemble for. + /// The object containing the input parameters for + /// determining the assembly categories. + /// A . + /// Thrown when + /// an error occurs while assembling. + FailureMechanismAssembly Assemble(IEnumerable sectionAssemblies, + AssemblyCategoriesInput assemblyCategoriesInput); + } +} \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactoryOld.cs =================================================================== diff -u -r2f660e66788675684eccbdaeeaa7923d332e529e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactoryOld.cs (.../AssemblyToolCalculatorFactoryOld.cs) (revision 2f660e66788675684eccbdaeeaa7923d332e529e) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactoryOld.cs (.../AssemblyToolCalculatorFactoryOld.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -59,7 +59,7 @@ return new FailureMechanismSectionAssemblyCalculatorOld(factory); } - public IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory) + public IFailureMechanismAssemblyCalculatorOld CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory) { return new FailureMechanismAssemblyCalculatorOld(factory); } Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactoryOld.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactoryOld.cs (.../IAssemblyToolCalculatorFactoryOld.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactoryOld.cs (.../IAssemblyToolCalculatorFactoryOld.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -53,7 +53,7 @@ /// The factory responsible for creating the assembly kernel. /// The failure mechanism assembly calculator. /// Thrown when is null. - IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory); + IFailureMechanismAssemblyCalculatorOld CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory); /// /// Creates an assessment section assembly calculator. Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorOldTest.cs =================================================================== diff -u -r2f660e66788675684eccbdaeeaa7923d332e529e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorOldTest.cs (.../FailureMechanismAssemblyCalculatorOldTest.cs) (revision 2f660e66788675684eccbdaeeaa7923d332e529e) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorOldTest.cs (.../FailureMechanismAssemblyCalculatorOldTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -55,7 +55,7 @@ var calculator = new FailureMechanismAssemblyCalculatorOld(kernelFactory); // Assert - Assert.IsInstanceOf(calculator); + Assert.IsInstanceOf(calculator); mocks.VerifyAll(); } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryOldTest.cs =================================================================== diff -u -r2f660e66788675684eccbdaeeaa7923d332e529e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryOldTest.cs (.../AssemblyToolCalculatorFactoryOldTest.cs) (revision 2f660e66788675684eccbdaeeaa7923d332e529e) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryOldTest.cs (.../AssemblyToolCalculatorFactoryOldTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -113,7 +113,7 @@ using (new AssemblyToolKernelFactoryConfigOld()) { // Call - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = factory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); // Assert Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorOldStub.cs =================================================================== diff -u --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorOldStub.cs (revision 0) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorOldStub.cs (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -0,0 +1,96 @@ +// 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 . +// +// 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 Riskeer.AssemblyTool.Data; +using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly; + +namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly +{ + /// + /// Failure mechanism assembly calculator stub for testing purposes. + /// + public class FailureMechanismAssemblyCalculatorOldStub : IFailureMechanismAssemblyCalculatorOld + { + /// + /// Gets the collection of . + /// + public IEnumerable FailureMechanismSectionAssemblies { get; private set; } + + /// + /// Gets the collection of . + /// + public IEnumerable FailureMechanismSectionCategories { get; private set; } + + /// + /// Gets or sets the output of the failure mechanism assembly without probabilities. + /// + public FailureMechanismAssemblyCategoryGroup? FailureMechanismAssemblyCategoryGroupOutput { get; set; } + + /// + /// Gets or sets the output of the failure mechanism assembly with probabilities. + /// + public FailureMechanismAssembly FailureMechanismAssemblyOutput { get; set; } + + /// + /// Gets the assembly categories input used in the assembly calculation methods. + /// + public AssemblyCategoriesInput AssemblyCategoriesInput { get; private set; } + + /// + /// Sets an indicator whether an exception must be thrown while performing a calculation. + /// + public bool ThrowExceptionOnCalculate { private get; set; } + + public FailureMechanismAssemblyCategoryGroup Assemble(IEnumerable sectionCategories) + { + if (ThrowExceptionOnCalculate) + { + throw new FailureMechanismAssemblyCalculatorException("Message", new Exception()); + } + + FailureMechanismSectionCategories = sectionCategories; + + if (FailureMechanismAssemblyCategoryGroupOutput == null) + { + FailureMechanismAssemblyCategoryGroupOutput = FailureMechanismAssemblyCategoryGroup.IIt; + } + + return FailureMechanismAssemblyCategoryGroupOutput.Value; + } + + public FailureMechanismAssembly Assemble(IEnumerable sectionAssemblies, + AssemblyCategoriesInput assemblyCategoriesInput) + { + if (ThrowExceptionOnCalculate) + { + throw new FailureMechanismAssemblyCalculatorException("Message", new Exception()); + } + + FailureMechanismSectionAssemblies = sectionAssemblies; + AssemblyCategoriesInput = assemblyCategoriesInput; + + return FailureMechanismAssemblyOutput ?? + (FailureMechanismAssemblyOutput = new FailureMechanismAssembly(1.0, FailureMechanismAssemblyCategoryGroup.IIIt)); + } + } +} \ No newline at end of file Fisheye: Tag becb20be0283702deba5ab628e9150e9c749e130 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactoryOld.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactoryOld.cs (.../TestAssemblyToolCalculatorFactoryOld.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactoryOld.cs (.../TestAssemblyToolCalculatorFactoryOld.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -40,7 +40,7 @@ { LastCreatedAssemblyCategoriesCalculator = new AssemblyCategoriesCalculatorStub(); LastCreatedFailureMechanismSectionAssemblyCalculator = new FailureMechanismSectionAssemblyCalculatorOldStub(); - LastCreatedFailureMechanismAssemblyCalculator = new FailureMechanismAssemblyCalculatorStub(); + LastCreatedFailureMechanismAssemblyCalculator = new FailureMechanismAssemblyCalculatorOldStub(); LastCreatedAssessmentSectionAssemblyCalculator = new AssessmentSectionAssemblyCalculatorStub(); } @@ -55,9 +55,9 @@ public FailureMechanismSectionAssemblyCalculatorOldStub LastCreatedFailureMechanismSectionAssemblyCalculator { get; } /// - /// Gets the last created . + /// Gets the last created . /// - public FailureMechanismAssemblyCalculatorStub LastCreatedFailureMechanismAssemblyCalculator { get; } + public FailureMechanismAssemblyCalculatorOldStub LastCreatedFailureMechanismAssemblyCalculator { get; } /// /// Gets the last created . @@ -74,7 +74,7 @@ return LastCreatedFailureMechanismSectionAssemblyCalculator; } - public IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory) + public IFailureMechanismAssemblyCalculatorOld CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory) { return LastCreatedFailureMechanismAssemblyCalculator; } Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs (.../ClosingStructuresFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs (.../ClosingStructuresFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -310,7 +310,7 @@ .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection, useManual)) .ToArray(); - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput); Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -1037,7 +1037,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1072,7 +1072,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1107,7 +1107,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1135,7 +1135,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssembly actualOutput = @@ -1163,7 +1163,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs (.../DuneErosionFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs (.../DuneErosionFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -231,7 +231,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -585,7 +585,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -612,7 +612,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -638,7 +638,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -656,7 +656,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -675,7 +675,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -308,7 +308,7 @@ .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection, useManual)) .ToArray(); - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -977,7 +977,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1012,7 +1012,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1047,7 +1047,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1075,7 +1075,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssembly actualOutput = @@ -1103,7 +1103,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -233,7 +233,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -588,7 +588,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -615,7 +615,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -641,7 +641,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -659,7 +659,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -678,7 +678,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs (.../HeightStructuresFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs (.../HeightStructuresFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -310,7 +310,7 @@ .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection, useManual)) .ToArray(); - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -1037,7 +1037,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1072,7 +1072,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1107,7 +1107,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1135,7 +1135,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssembly actualOutput = @@ -1163,7 +1163,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -239,7 +239,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -239,7 +239,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs (.../MicrostabilityFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs (.../MicrostabilityFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -239,7 +239,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs (.../PipingStructureFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs (.../PipingStructureFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -239,7 +239,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs (.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs (.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -205,7 +205,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -rd614bcd846ea69dd53473fbfd3220d4c327eee59 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision d614bcd846ea69dd53473fbfd3220d4c327eee59) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -74,7 +74,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; failureMechanismAssemblyCalculator.FailureMechanismAssemblyOutput = new FailureMechanismAssembly( random.NextDouble(), random.NextEnumValue()); @@ -148,7 +148,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call @@ -178,7 +178,7 @@ // Assert var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; Assert.AreSame(failureMechanismSectionAssemblyCalculator.ManualAssemblyAssemblyOutput, failureMechanismAssemblyCalculator.FailureMechanismSectionAssemblies.Single()); } } @@ -196,7 +196,7 @@ // Assert var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; Assert.AreSame(failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, failureMechanismAssemblyCalculator.FailureMechanismSectionAssemblies.Single()); } } @@ -229,7 +229,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput = random.NextEnumValue(); AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; @@ -295,7 +295,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call @@ -325,7 +325,7 @@ // Assert var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; AssertFailureMechanismsWithoutProbabilityManualAssemblyCalculatorInput(failureMechanismInAssembly, failureMechanismAssemblyCalculator); } } @@ -342,14 +342,14 @@ // Assert var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; Assert.AreEqual(failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); } } private static void AssertFailureMechanismsWithoutProbabilityManualAssemblyCalculatorInput(IFailureMechanism failureMechanism, - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator) + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator) { var duneErosion = failureMechanism as DuneErosionFailureMechanism; if (duneErosion != null) @@ -453,7 +453,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; assessmentSectionAssemblyCalculator.AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly( @@ -531,7 +531,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call @@ -626,7 +626,7 @@ // Then var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); } } @@ -651,7 +651,7 @@ // Then var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; Assert.AreEqual(failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -594,7 +594,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -621,7 +621,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -648,7 +648,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -666,7 +666,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -685,7 +685,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -594,7 +594,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -621,7 +621,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -648,7 +648,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -666,7 +666,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -685,7 +685,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs (.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs (.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -594,7 +594,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -621,7 +621,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -648,7 +648,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -666,7 +666,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -685,7 +685,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs (.../PipingStructureFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs (.../PipingStructureFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -594,7 +594,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -621,7 +621,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -648,7 +648,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -666,7 +666,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -685,7 +685,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -517,7 +517,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -544,7 +544,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -571,7 +571,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -589,7 +589,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -608,7 +608,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -rd614bcd846ea69dd53473fbfd3220d4c327eee59 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision d614bcd846ea69dd53473fbfd3220d4c327eee59) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -212,7 +212,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; using (AssemblyResultTotalView view = ShowAssemblyResultTotalView()) { @@ -348,7 +348,7 @@ using (AssemblyResultTotalView view = ShowAssemblyResultTotalView()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; ButtonTester buttonTester = GetRefreshAssemblyResultButtonTester(); buttonTester.Properties.Enabled = true; @@ -646,7 +646,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // When using (ShowAssemblyResultTotalView(assessmentSection)) @@ -667,7 +667,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // When using (ShowAssemblyResultTotalView(assessmentSection)) @@ -733,7 +733,7 @@ } private static void AssertFailureMechanismsWithoutProbabilityCalculatorInput(IFailureMechanism failureMechanism, - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator) + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator) { var duneErosion = failureMechanism as DuneErosionFailureMechanism; if (duneErosion != null) Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -re2bbc287f3bac2c9d09c793eb05c93346ec97c47 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision e2bbc287f3bac2c9d09c793eb05c93346ec97c47) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -90,7 +90,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportableAssessmentSection exportableAssessmentSection = ExportableAssessmentSectionFactory.CreateExportableAssessmentSection(assessmentSection); @@ -162,7 +162,7 @@ private static void AssertExportableFailureMechanismsWithProbability( IEnumerable> exportableFailureMechanisms, - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator, + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator, AssessmentSection assessmentSection) { Assert.AreEqual(6, exportableFailureMechanisms.Count()); @@ -228,7 +228,7 @@ private static void AssertExportableFailureMechanismsWithoutProbability( IEnumerable> exportableFailureMechanisms, - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator, + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator, AssessmentSection assessmentSection) { Assert.AreEqual(9, exportableFailureMechanisms.Count()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs (.../ExportableClosingStructuresFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs (.../ExportableClosingStructuresFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -112,7 +112,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -153,7 +153,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportableClosingStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs (.../ExportableDuneErosionFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs (.../ExportableDuneErosionFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -115,7 +115,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -160,7 +160,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -112,7 +112,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -153,7 +153,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -115,7 +115,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -161,7 +161,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -117,7 +117,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -163,7 +163,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -117,7 +117,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -163,7 +163,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs (.../ExportableHeightStructuresFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs (.../ExportableHeightStructuresFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -112,7 +112,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -153,7 +153,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportableHeightStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -112,7 +112,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -153,7 +153,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs (.../ExportableMicrostabilityFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs (.../ExportableMicrostabilityFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -117,7 +117,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -163,7 +163,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -112,7 +112,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -153,7 +153,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs (.../ExportablePipingStructureFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs (.../ExportablePipingStructureFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -115,7 +115,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -161,7 +161,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs (.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs (.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -112,7 +112,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -153,7 +153,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs (.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs (.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -115,7 +115,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -161,7 +161,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -117,7 +117,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -162,7 +162,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -115,7 +115,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -161,7 +161,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -312,7 +312,7 @@ .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection, useManual)) .ToArray(); - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -1101,7 +1101,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1136,7 +1136,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1171,7 +1171,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1199,7 +1199,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssembly actualOutput = @@ -1227,7 +1227,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs (.../PipingFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs (.../PipingFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -313,7 +313,7 @@ .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection, useManual)) .ToArray(); - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput); Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -1105,7 +1105,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1140,7 +1140,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1175,7 +1175,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1203,7 +1203,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssembly actualOutput = @@ -1231,7 +1231,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -309,7 +309,7 @@ .Select(sr => GetSectionAssembly(sr, failureMechanism, assessmentSection, useManual)) .ToArray(); - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -1036,7 +1036,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1071,7 +1071,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1106,7 +1106,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -1134,7 +1134,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssembly actualOutput = @@ -1162,7 +1162,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -232,7 +232,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -585,7 +585,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -612,7 +612,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -638,7 +638,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -656,7 +656,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -675,7 +675,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -233,7 +233,7 @@ failureMechanism.SectionResultsOld.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray(); IAssemblyToolCalculatorFactoryOld calculatorFactory = AssemblyToolCalculatorFactoryOld.Instance; - IFailureMechanismAssemblyCalculator calculator = + IFailureMechanismAssemblyCalculatorOld calculator = calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactoryOld.Instance); return calculator.Assemble(sectionAssemblies); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rbecb20be0283702deba5ab628e9150e9c749e130 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) @@ -588,7 +588,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -615,7 +615,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true); @@ -641,7 +641,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; FailureMechanismSectionAssemblyCalculatorOldStub sectionCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -659,7 +659,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; // Call FailureMechanismAssemblyCategoryGroup actualOutput = @@ -678,7 +678,7 @@ using (new AssemblyToolCalculatorFactoryConfigOld()) { var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; + FailureMechanismAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; // Call