Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs
===================================================================
diff -u -r96e8f5b05248c3c687797ff82e6fc7d1c192ed60 -r7885db4a97e95990c5ae997b206f3d32a79fc7ac
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs (.../FailureMechanismAssemblyResultFactory.cs) (revision 96e8f5b05248c3c687797ff82e6fc7d1c192ed60)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs (.../FailureMechanismAssemblyResultFactory.cs) (revision 7885db4a97e95990c5ae997b206f3d32a79fc7ac)
@@ -39,19 +39,16 @@
///
/// Assembles the failure mechanism based on its input arguments.
///
- /// The length effect factor 'N' of the failure mechanism.
/// A collection of .
- /// Indicator whether the failure mechanism section length effect is applied.
/// The .
/// A containing the assembly result of the failure mechanism.>
/// Thrown when
/// or is null.
/// Thrown when the failure mechanism could not be successfully assembled.
/// Thrown when
/// of the failure mechanism is not supported.
- public static FailureMechanismAssemblyResultWrapper AssembleFailureMechanism(
- double failureMechanismN, IEnumerable failureMechanismSectionAssemblyResults,
- bool applyLengthEffect, FailureMechanismAssemblyResult failureMechanismAssemblyResult)
+ public static FailureMechanismAssemblyResultWrapper AssembleFailureMechanism(IEnumerable failureMechanismSectionAssemblyResults,
+ FailureMechanismAssemblyResult failureMechanismAssemblyResult)
{
if (failureMechanismSectionAssemblyResults == null)
{
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs
===================================================================
diff -u -rff1fde00591763a1dd4a6f8162d81a8040982ab0 -r7885db4a97e95990c5ae997b206f3d32a79fc7ac
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs (.../FailureMechanismAssemblyResultFactoryTest.cs) (revision ff1fde00591763a1dd4a6f8162d81a8040982ab0)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs (.../FailureMechanismAssemblyResultFactoryTest.cs) (revision 7885db4a97e95990c5ae997b206f3d32a79fc7ac)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Riskeer.AssemblyTool.Data;
using Riskeer.AssemblyTool.KernelWrapper.Calculators;
@@ -42,7 +41,7 @@
public void AssembleFailureMechanism_FailureMechanismSectionAssemblyResultsNull_ThrowsArgumentNullException()
{
// Call
- void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(0, null, false, new FailureMechanismAssemblyResult());
+ void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(null, new FailureMechanismAssemblyResult());
// Assert
var exception = Assert.Throws(Call);
@@ -53,7 +52,7 @@
public void AssembleFailureMechanism_FailureMechanismAssemblyResultNull_ThrowsArgumentNullException()
{
// Call
- void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(0, Array.Empty(), false, null);
+ void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(Array.Empty(), null);
// Assert
var exception = Assert.Throws(Call);
@@ -64,19 +63,16 @@
public void AssembleFailureMechanism_WithInputWithProbabilityResultTypeAutomaticIndependentSections_SetsInputOnCalculator()
{
// Setup
- var random = new Random(21);
- double n = random.NextDouble();
var failureMechanismResult = new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.P1
};
- bool applyLengthEffect = random.NextBoolean();
IEnumerable sectionResults = Enumerable.Empty();
using (new AssemblyToolCalculatorFactoryConfig())
{
// Call
- FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(n, sectionResults, applyLengthEffect, failureMechanismResult);
+ FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(sectionResults, failureMechanismResult);
// Assert
var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
@@ -92,19 +88,16 @@
public void AssembleFailureMechanism_WithInputWithProbabilityResultTypeAutomaticWorstSection_SetsInputOnCalculator()
{
// Setup
- var random = new Random(21);
- double n = random.NextDouble();
var failureMechanismResult = new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.P2
};
- bool applyLengthEffect = random.NextBoolean();
IEnumerable sectionResults = Enumerable.Empty();
using (new AssemblyToolCalculatorFactoryConfig())
{
// Call
- FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(n, sectionResults, applyLengthEffect, failureMechanismResult);
+ FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(sectionResults, failureMechanismResult);
// Assert
var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
@@ -120,17 +113,14 @@
public void AssembleFailureMechanism_WithInputWithProbabilityResultTypeNone_ThrowsAssemblyException()
{
// Setup
- var random = new Random(21);
- double n = random.NextDouble();
var failureMechanismResult = new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.None
};
- bool applyLengthEffect = random.NextBoolean();
IEnumerable sectionResults = Enumerable.Empty();
// Call
- void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(n, sectionResults, applyLengthEffect, failureMechanismResult);
+ void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(sectionResults, failureMechanismResult);
// Assert
var exception = Assert.Throws(Call);
@@ -151,9 +141,7 @@
using (new AssemblyToolCalculatorFactoryConfig())
{
// Call
- FailureMechanismAssemblyResultWrapper assemblyResult = FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
- random.NextDouble(), Enumerable.Empty(),
- random.NextBoolean(), failureMechanismResult);
+ FailureMechanismAssemblyResultWrapper assemblyResult = FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(Enumerable.Empty(), failureMechanismResult);
// Assert
var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
@@ -185,8 +173,7 @@
};
// Call
- FailureMechanismAssemblyResultWrapper assemblyResult = FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
- 0, Enumerable.Empty(), false, failureMechanismAssemblyResult);
+ FailureMechanismAssemblyResultWrapper assemblyResult = FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(Enumerable.Empty(), failureMechanismAssemblyResult);
// Assert
Assert.AreSame(calculator.AssemblyResultOutput, assemblyResult);
@@ -210,8 +197,7 @@
// Call
void Call() =>
- FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
- 0, Enumerable.Empty(), false, failureMechanismAssemblyResult);
+ FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(Enumerable.Empty(), failureMechanismAssemblyResult);
// Assert
var exception = Assert.Throws(Call);
@@ -231,8 +217,7 @@
};
// Call
- void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
- 0, Enumerable.Empty(), false, failureMechanismAssemblyResult);
+ void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(Enumerable.Empty(), failureMechanismAssemblyResult);
// Assert
Assert.Throws(Call);