Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs =================================================================== diff -u -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5 -rce81e04557d96f67d3bb53ddc3e2215d263fa968 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs (.../AssessmentSectionAssemblyCalculator.cs) (revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs (.../AssessmentSectionAssemblyCalculator.cs) (revision ce81e04557d96f67d3bb53ddc3e2215d263fa968) @@ -26,7 +26,6 @@ using Assembly.Kernel.Interfaces; using Assembly.Kernel.Model; using Assembly.Kernel.Model.Categories; -using Assembly.Kernel.Model.FailureMechanismSections; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.KernelWrapper.Creators; using Riskeer.AssemblyTool.KernelWrapper.Kernels; @@ -92,42 +91,5 @@ throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } - - public CombinedFailureMechanismSectionAssemblyResultWrapper AssembleCombinedFailureMechanismSections( - IEnumerable> input, double assessmentSectionLength) - { - if (input == null) - { - throw new ArgumentNullException(nameof(input)); - } - - try - { - ICommonFailureMechanismSectionAssembler kernel = factory.CreateCombinedFailureMechanismSectionAssemblyKernel(); - - IEnumerable failureMechanismSections = FailureMechanismSectionListCreator.Create(input); - FailureMechanismSectionList commonSections = kernel.FindGreatestCommonDenominatorSectionsBoi3A1( - failureMechanismSections, assessmentSectionLength); - - FailureMechanismSectionList[] failureMechanismResults = failureMechanismSections.Select(fmsl => kernel.TranslateFailureMechanismResultsToCommonSectionsBoi3B1( - fmsl, commonSections)) - .ToArray(); - - IEnumerable combinedSectionResults = - kernel.DetermineCombinedResultPerCommonSectionBoi3C1(failureMechanismResults, false); - - return new CombinedFailureMechanismSectionAssemblyResultWrapper( - CombinedFailureMechanismSectionAssemblyCreator.Create(failureMechanismResults, combinedSectionResults), - AssemblyMethod.BOI3A1, AssemblyMethod.BOI3B1, AssemblyMethod.BOI3C1); - } - catch (AssemblyException e) - { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); - } - catch (Exception e) - { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); - } - } } } \ No newline at end of file Fisheye: Tag ce81e04557d96f67d3bb53ddc3e2215d263fa968 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreator.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rce81e04557d96f67d3bb53ddc3e2215d263fa968 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs (.../IAssemblyToolKernelFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs (.../IAssemblyToolKernelFactory.cs) (revision ce81e04557d96f67d3bb53ddc3e2215d263fa968) @@ -47,12 +47,6 @@ IFailureMechanismResultAssembler CreateFailureMechanismAssemblyKernel(); /// - /// Creates a combined failure mechanism section assembly kernel. - /// - /// A new . - ICommonFailureMechanismSectionAssembler CreateCombinedFailureMechanismSectionAssemblyKernel(); - - /// /// Creates an assessment section assembly kernel. /// /// A new . Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 -rce81e04557d96f67d3bb53ddc3e2215d263fa968 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision ce81e04557d96f67d3bb53ddc3e2215d263fa968) @@ -26,7 +26,6 @@ using Assembly.Kernel.Exceptions; using Assembly.Kernel.Model; using Assembly.Kernel.Model.Categories; -using Assembly.Kernel.Model.FailureMechanismSections; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; @@ -259,220 +258,5 @@ }), exception.Message); } } - - [Test] - public void AssembleCombinedFailureMechanismSections_InputNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var kernelFactory = mocks.Stub(); - mocks.ReplayAll(); - - var calculator = new AssessmentSectionAssemblyCalculator(kernelFactory); - - // Call - void Call() => calculator.AssembleCombinedFailureMechanismSections(null, double.NaN); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("input", exception.ParamName); - } - - [Test] - public void AssembleCombinedFailureMechanismSections_WithInvalidInput_ThrowsAssessmentSectionAssemblyCalculatorException() - { - // Setup - var random = new Random(21); - using (new AssemblyToolKernelFactoryConfig()) - { - var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; - var calculator = new AssessmentSectionAssemblyCalculator(factory); - - // Call - void Call() => - calculator.AssembleCombinedFailureMechanismSections(new[] - { - new[] - { - new CombinedAssemblyFailureMechanismSection(0, 1, (FailureMechanismSectionAssemblyGroup) 99) - } - }, random.Next()); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); - } - } - - [Test] - public void AssembleCombinedFailureMechanismSections_WithValidInput_InputCorrectlySetToKernel() - { - // Setup - var random = new Random(39); - var input = new[] - { - new[] - { - new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue()) - } - }; - double assessmentSectionLength = random.NextDouble(); - - using (new AssemblyToolKernelFactoryConfig()) - { - var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; - CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - - var calculator = new AssessmentSectionAssemblyCalculator(factory); - - // Call - calculator.AssembleCombinedFailureMechanismSections(input, assessmentSectionLength); - - // Assert - CombinedFailureMechanismSectionsInputAssert.AssertCombinedFailureMechanismInput(input, kernel.FailureMechanismSectionLists); - Assert.AreEqual(assessmentSectionLength, kernel.AssessmentSectionLength); - Assert.IsTrue(kernel.CalculatedCommonSections); - - Assert.AreSame(kernel.FailureMechanismSectionLists.Single(), kernel.FailureMechanismSectionList); - Assert.AreSame(kernel.CommonSections, kernel.CommonSectionsInput); - Assert.IsTrue(kernel.CalculatedCommonSectionResults); - - Assert.AreEqual(1, kernel.FailureMechanismResultsInput.Count()); - Assert.AreSame(kernel.FailureMechanismResult, kernel.FailureMechanismResultsInput.First()); - Assert.IsFalse(kernel.PartialAssembly); - Assert.IsTrue(kernel.CalculatedSectionResults); - } - } - - [Test] - public void AssembleCombinedFailureMechanismSections_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator() - { - // Setup - var random = new Random(39); - - using (new AssemblyToolKernelFactoryConfig()) - { - var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; - var calculator = new AssessmentSectionAssemblyCalculator(factory); - - // Call - CombinedFailureMechanismSectionAssemblyResultWrapper output = calculator.AssembleCombinedFailureMechanismSections(new[] - { - new[] - { - new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue()) - } - }, random.NextDouble()); - - // Assert - CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - CombinedFailureMechanismSectionAssemblyAssert.AssertAssembly(new[] - { - kernel.FailureMechanismResult - }, kernel.CombinedSectionResults, output.AssemblyResults); - Assert.AreEqual(AssemblyMethod.BOI3A1, output.CommonSectionAssemblyMethod); - Assert.AreEqual(AssemblyMethod.BOI3B1, output.FailureMechanismResultsAssemblyMethod); - Assert.AreEqual(AssemblyMethod.BOI3C1, output.CombinedSectionResultAssemblyMethod); - } - } - - [Test] - public void AssembleCombinedFailureMechanismSections_KernelWithInvalidOutput_ThrowsAssessmentSectionAssemblyCalculatorException() - { - // Setup - var random = new Random(21); - - using (new AssemblyToolKernelFactoryConfig()) - { - var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; - CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismResult = new FailureMechanismSectionList(new[] - { - new FailureMechanismSectionWithCategory(0, 1, (EInterpretationCategory) 99) - }); - - var calculator = new AssessmentSectionAssemblyCalculator(factory); - - // Call - void Call() => calculator.AssembleCombinedFailureMechanismSections(new[] - { - new[] - { - new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue()) - } - }, random.NextDouble()); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); - } - } - - [Test] - public void AssembleCombinedFailureMechanismSections_KernelThrowsException_ThrowsAssessmentSectionAssemblyCalculatorException() - { - // Setup - var random = new Random(21); - - using (new AssemblyToolKernelFactoryConfig()) - { - var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; - CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - kernel.ThrowExceptionOnCalculate = true; - - var calculator = new AssessmentSectionAssemblyCalculator(factory); - - // Call - void Call() => - calculator.AssembleCombinedFailureMechanismSections(new[] - { - new[] - { - new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue()) - } - }, random.NextDouble()); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); - } - } - - [Test] - public void AssembleCombinedFailureMechanismSections_KernelThrowsAssemblyException_ThrowsAssessmentSectionAssemblyCalculatorException() - { - // Setup - var random = new Random(21); - - using (new AssemblyToolKernelFactoryConfig()) - { - var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; - CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - kernel.ThrowAssemblyExceptionOnCalculate = true; - - var calculator = new AssessmentSectionAssemblyCalculator(factory); - - // Call - void Call() => - calculator.AssembleCombinedFailureMechanismSections(new[] - { - new[] - { - new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue()) - } - }, random.NextDouble()); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] - { - AssemblyErrorMessageTestHelper.Create(string.Empty, EAssemblyErrors.EmptyResultsList) - }), exception.Message); - } - } } } \ No newline at end of file Fisheye: Tag ce81e04557d96f67d3bb53ddc3e2215d263fa968 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/CombinedFailureMechanismSectionAssemblyCreatorTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rce81e04557d96f67d3bb53ddc3e2215d263fa968 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs (.../AssemblyToolKernelFactoryTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs (.../AssemblyToolKernelFactoryTest.cs) (revision ce81e04557d96f67d3bb53ddc3e2215d263fa968) @@ -112,19 +112,6 @@ } [Test] - public void CreateCombinedFailureMechanismSectionAssemblyKernel_Always_ReturnsKernelCommonFailureMechanismSectionAssembler() - { - // Setup - IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance; - - // Call - ICommonFailureMechanismSectionAssembler kernel = factory.CreateCombinedFailureMechanismSectionAssemblyKernel(); - - // Assert - Assert.IsInstanceOf(kernel); - } - - [Test] public void CreateAssessmentSectionAssemblyKernel_Always_ReturnsKernelAssessmentGradeAssembler() { // Setup Fisheye: Tag ce81e04557d96f67d3bb53ddc3e2215d263fa968 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rce81e04557d96f67d3bb53ddc3e2215d263fa968 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs (.../TestAssemblyToolKernelFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs (.../TestAssemblyToolKernelFactory.cs) (revision ce81e04557d96f67d3bb53ddc3e2215d263fa968) @@ -39,7 +39,6 @@ LastCreatedAssemblyCategoryLimitsKernel = new AssemblyCategoryLimitsKernelStub(); LastCreatedFailureMechanismSectionAssemblyKernel = new FailureMechanismSectionAssemblyKernelStub(); LastCreatedFailureMechanismAssemblyKernel = new FailureMechanismAssemblyKernelStub(); - LastCreatedCombinedFailureMechanismSectionAssemblyKernel = new CombinedFailureMechanismSectionAssemblyKernelStub(); LastCreatedAssessmentSectionAssemblyKernel = new AssessmentSectionAssemblyKernelStub(); } @@ -58,11 +57,6 @@ /// public FailureMechanismAssemblyKernelStub LastCreatedFailureMechanismAssemblyKernel { get; } - /// - /// Gets the last created combined failure mechanism section assembly kernel. - /// - public CombinedFailureMechanismSectionAssemblyKernelStub LastCreatedCombinedFailureMechanismSectionAssemblyKernel { get; } - public AssessmentSectionAssemblyKernelStub LastCreatedAssessmentSectionAssemblyKernel { get; } public ICategoryLimitsCalculator CreateAssemblyGroupsKernel() @@ -80,11 +74,6 @@ return LastCreatedFailureMechanismAssemblyKernel; } - public ICommonFailureMechanismSectionAssembler CreateCombinedFailureMechanismSectionAssemblyKernel() - { - return LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - } - public IAssessmentGradeAssembler CreateAssessmentSectionAssemblyKernel() { return LastCreatedAssessmentSectionAssemblyKernel;