Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r7f759a1c2129332093f5d58aef1d397363e2c81e -rb86516992aee91c3db5cf670d2e87dc7b2e60884
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 7f759a1c2129332093f5d58aef1d397363e2c81e)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision b86516992aee91c3db5cf670d2e87dc7b2e60884)
@@ -73,7 +73,7 @@
AssemblyFailureMechanismSectionAssemblyResult output = kernel.TranslateAssessmentResultWbi0A2(
GetInitialMechanismProbabilitySpecification(input),
CreateProbability(input.InitialSectionProbability),
- FailureMechanismAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(
+ FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(
input.FurtherAnalysisType),
CreateProbability(input.RefinedSectionProbability),
categories);
@@ -109,7 +109,7 @@
GetInitialMechanismProbabilitySpecification(input),
CreateProbability(input.InitialProfileProbability),
CreateProbability(input.InitialSectionProbability),
- FailureMechanismAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType),
+ FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType),
CreateProbability(input.RefinedProfileProbability),
CreateProbability(input.RefinedSectionProbability),
categories);
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -r7f759a1c2129332093f5d58aef1d397363e2c81e -rb86516992aee91c3db5cf670d2e87dc7b2e60884
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCalculatorInputCreator.cs (.../FailureMechanismAssemblyCalculatorInputCreator.cs) (revision 7f759a1c2129332093f5d58aef1d397363e2c81e)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCalculatorInputCreator.cs (.../FailureMechanismAssemblyCalculatorInputCreator.cs) (revision b86516992aee91c3db5cf670d2e87dc7b2e60884)
@@ -24,7 +24,6 @@
using Assembly.Kernel.Model;
using Assembly.Kernel.Model.Categories;
using Riskeer.AssemblyTool.Data;
-using Riskeer.Common.Primitives;
using AssemblyFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult;
using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
@@ -59,37 +58,6 @@
}
///
- /// Converts a into an
- /// .
- ///
- /// The to convert.
- /// The converted .
- /// Thrown when is invalid.
- /// Thrown when
- /// is valid but not supported.
- public static ERefinementStatus ConvertFailureMechanismSectionResultFurtherAnalysisType(FailureMechanismSectionResultFurtherAnalysisType furtherAnalysisType)
- {
- if (!Enum.IsDefined(typeof(FailureMechanismSectionResultFurtherAnalysisType), furtherAnalysisType))
- {
- throw new InvalidEnumArgumentException(nameof(furtherAnalysisType),
- (int) furtherAnalysisType,
- typeof(FailureMechanismSectionResultFurtherAnalysisType));
- }
-
- switch (furtherAnalysisType)
- {
- case FailureMechanismSectionResultFurtherAnalysisType.NotNecessary:
- return ERefinementStatus.NotNecessary;
- case FailureMechanismSectionResultFurtherAnalysisType.Necessary:
- return ERefinementStatus.Necessary;
- case FailureMechanismSectionResultFurtherAnalysisType.Executed:
- return ERefinementStatus.Performed;
- default:
- throw new NotSupportedException();
- }
- }
-
- ///
/// Converts a into a .
///
/// The to convert.
Fisheye: Tag f8f881f72469ae5e15299d31eee94e70e3b44fa2 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r39dde22d4fd7ade31327dff84752efd31566f407 -rb86516992aee91c3db5cf670d2e87dc7b2e60884
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 39dde22d4fd7ade31327dff84752efd31566f407)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision b86516992aee91c3db5cf670d2e87dc7b2e60884)
@@ -162,7 +162,7 @@
Assert.AreSame(categoryLimits, failureMechanismSectionAssemblyKernel.Categories);
Assert.AreEqual(expectedInitialMechanismProbabilitySpecification, failureMechanismSectionAssemblyKernel.InitialMechanismProbabilitySpecification);
Assert.AreEqual(input.InitialSectionProbability, failureMechanismSectionAssemblyKernel.ProbabilityInitialMechanismSection);
- Assert.AreEqual(FailureMechanismAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType),
+ Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType),
failureMechanismSectionAssemblyKernel.RefinementStatus);
Assert.AreEqual(input.RefinedSectionProbability, failureMechanismSectionAssemblyKernel.RefinedProbabilitySection);
}
@@ -383,7 +383,7 @@
Assert.AreEqual(expectedInitialMechanismProbabilitySpecification, failureMechanismSectionAssemblyKernel.InitialMechanismProbabilitySpecification);
Assert.AreEqual(input.InitialProfileProbability, failureMechanismSectionAssemblyKernel.ProbabilityInitialMechanismProfile);
Assert.AreEqual(input.InitialSectionProbability, failureMechanismSectionAssemblyKernel.ProbabilityInitialMechanismSection);
- Assert.AreEqual(FailureMechanismAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType),
+ Assert.AreEqual(FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType),
failureMechanismSectionAssemblyKernel.RefinementStatus);
Assert.AreEqual(input.RefinedProfileProbability, failureMechanismSectionAssemblyKernel.RefinedProbabilityProfile);
Assert.AreEqual(input.RefinedSectionProbability, failureMechanismSectionAssemblyKernel.RefinedProbabilitySection);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -r39dde22d4fd7ade31327dff84752efd31566f407 -rb86516992aee91c3db5cf670d2e87dc7b2e60884
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismAssemblyCalculatorInputCreatorTest.cs) (revision 39dde22d4fd7ade31327dff84752efd31566f407)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismAssemblyCalculatorInputCreatorTest.cs) (revision b86516992aee91c3db5cf670d2e87dc7b2e60884)
@@ -21,14 +21,12 @@
using System;
using System.ComponentModel;
-using Assembly.Kernel.Model;
using Assembly.Kernel.Model.Categories;
using Core.Common.TestUtil;
using NUnit.Framework;
using Riskeer.AssemblyTool.Data;
using Riskeer.AssemblyTool.KernelWrapper.Creators;
using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
-using Riskeer.Common.Primitives;
using AssemblyFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult;
using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
@@ -98,33 +96,5 @@
ProbabilityAssert.AreEqual(sectionProbability, createdResult.ProbabilitySection);
Assert.AreEqual(expectedCategory, createdResult.InterpretationCategory);
}
-
- [Test]
- public void ConvertFailureMechanismSectionResultFurtherAnalysisType_InvalidFailureMechanismSectionResultFurtherAnalysisType_ThrowsInvalidEnumArgumentException()
- {
- // Setup
- const FailureMechanismSectionResultFurtherAnalysisType furtherAnalysisType = (FailureMechanismSectionResultFurtherAnalysisType) 99;
-
- // Call
- void Call() => FailureMechanismAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(furtherAnalysisType);
-
- // Assert
- var expectedMessage = $"The value of argument 'furtherAnalysisType' ({furtherAnalysisType}) is invalid for Enum type '{nameof(FailureMechanismSectionResultFurtherAnalysisType)}'.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage);
- }
-
- [Test]
- [TestCase(FailureMechanismSectionResultFurtherAnalysisType.NotNecessary, ERefinementStatus.NotNecessary)]
- [TestCase(FailureMechanismSectionResultFurtherAnalysisType.Necessary, ERefinementStatus.Necessary)]
- [TestCase(FailureMechanismSectionResultFurtherAnalysisType.Executed, ERefinementStatus.Performed)]
- public void ConvertFailureMechanismSectionResultFurtherAnalysisType_ValidFailureMechanismSectionResultFurtherAnalysisType_ReturnsExpectedRefinementStatus(
- FailureMechanismSectionResultFurtherAnalysisType furtherAnalysisType, ERefinementStatus expectedRefinementStatus)
- {
- // Call
- ERefinementStatus refinementStatus = FailureMechanismAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(furtherAnalysisType);
-
- // Assert
- Assert.AreEqual(expectedRefinementStatus, refinementStatus);
- }
}
}
\ No newline at end of file
Fisheye: Tag f8f881f72469ae5e15299d31eee94e70e3b44fa2 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?