Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs =================================================================== diff -u -r26259e86f36858575c3307e3a97602a899026bbf -r41f473231539e8121cbf2285ae7cd6783d743ce6 --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs (.../ExportablePipingFailureMechanismFactory.cs) (revision 26259e86f36858575c3307e3a97602a899026bbf) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs (.../ExportablePipingFailureMechanismFactory.cs) (revision 41f473231539e8121cbf2285ae7cd6783d743ce6) @@ -21,14 +21,12 @@ using System; using System.Collections.Generic; -using System.Linq; using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Exceptions; using Riskeer.Integration.IO.Assembly; using Riskeer.Integration.IO.Helpers; using Riskeer.Piping.Data; -using Riskeer.Piping.Data.SemiProbabilistic; namespace Riskeer.Integration.IO.Factories { @@ -74,13 +72,13 @@ failureMechanismAssemblyMethod); } - FailureMechanismAssembly failureMechanismAssembly = PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection, false); + var failureMechanismAssembly = new FailureMechanismAssembly(0, FailureMechanismAssemblyCategoryGroup.None); return new ExportableFailureMechanism( new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism), failureMechanismCode, failureMechanismGroup); } @@ -91,40 +89,22 @@ /// /// The to create a /// collection of for. - /// The assessment section the sections belong to. /// A collection of . /// Thrown when assembly results cannot be created. private static IEnumerable CreateExportableFailureMechanismSectionResults( - PipingFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + PipingFailureMechanism failureMechanism) { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld); - IEnumerable pipingCalculationScenarios = failureMechanism.Calculations.OfType(); - var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { - PipingFailureMechanismSectionResultOld failureMechanismSectionResult = failureMechanismSectionPair.Key; + var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None); + var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None); + var tailorMadeAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None); + var combinedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None); - FailureMechanismSectionAssemblyOld simpleAssembly = - PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyOld detailedAssembly = - PipingFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, - pipingCalculationScenarios, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssemblyOld tailorMadeAssembly = - PipingFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(failureMechanismSectionResult, - failureMechanism, - assessmentSection); - FailureMechanismSectionAssemblyOld combinedAssembly = - PipingFailureMechanismAssemblyFactory.AssembleCombinedAssessment(failureMechanismSectionResult, - pipingCalculationScenarios, - failureMechanism, - assessmentSection); - exportableResults.Add( new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability( failureMechanismSectionPair.Value, Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -r41f473231539e8121cbf2285ae7cd6783d743ce6 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 41f473231539e8121cbf2285ae7cd6783d743ce6) @@ -114,7 +114,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI2C1, exportableAssessmentSectionAssemblyResult.AssemblyMethod); AssertExportableFailureMechanismsWithProbability(exportableAssessmentSection.FailureMechanismsWithProbability, - failureMechanismAssemblyCalculator, assessmentSection); AssertExportableFailureMechanismsWithoutProbability(exportableAssessmentSection.FailureMechanismsWithoutProbability, @@ -162,51 +161,42 @@ private static void AssertExportableFailureMechanismsWithProbability( IEnumerable> exportableFailureMechanisms, - FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator, AssessmentSection assessmentSection) { Assert.AreEqual(6, exportableFailureMechanisms.Count()); - FailureMechanismAssembly expectedFailureMechanismAssemblyOutput = failureMechanismAssemblyCalculator.FailureMechanismAssemblyOutput; - AssertExportableFailureMechanismWithProbability(expectedFailureMechanismAssemblyOutput, - ExportableFailureMechanismType.STPH, + AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType.STPH, ExportableFailureMechanismGroup.Group2, - assessmentSection.ClosingStructures, + assessmentSection.Piping, exportableFailureMechanisms.First()); - AssertExportableFailureMechanismWithProbability(expectedFailureMechanismAssemblyOutput, - ExportableFailureMechanismType.STBI, + AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType.STBI, ExportableFailureMechanismGroup.Group2, assessmentSection.MacroStabilityInwards, exportableFailureMechanisms.ElementAt(1)); - AssertExportableFailureMechanismWithProbability(expectedFailureMechanismAssemblyOutput, - ExportableFailureMechanismType.GEKB, + AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType.GEKB, ExportableFailureMechanismGroup.Group1, assessmentSection.GrassCoverErosionInwards, exportableFailureMechanisms.ElementAt(2)); - AssertExportableFailureMechanismWithProbability(expectedFailureMechanismAssemblyOutput, - ExportableFailureMechanismType.HTKW, + AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType.HTKW, ExportableFailureMechanismGroup.Group1, assessmentSection.HeightStructures, exportableFailureMechanisms.ElementAt(3)); - AssertExportableFailureMechanismWithProbability(expectedFailureMechanismAssemblyOutput, - ExportableFailureMechanismType.BSKW, + AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType.BSKW, ExportableFailureMechanismGroup.Group1, assessmentSection.ClosingStructures, exportableFailureMechanisms.ElementAt(4)); - AssertExportableFailureMechanismWithProbability(expectedFailureMechanismAssemblyOutput, - ExportableFailureMechanismType.STKWp, + AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType.STKWp, ExportableFailureMechanismGroup.Group1, assessmentSection.StabilityPointStructures, exportableFailureMechanisms.ElementAt(5)); } - private static void AssertExportableFailureMechanismWithProbability(FailureMechanismAssembly expectedAssemblyOutput, - ExportableFailureMechanismType expectedFailureMechanismCode, + private static void AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType expectedFailureMechanismCode, ExportableFailureMechanismGroup expectedFailureMechanismGroup, IHasSectionResults failureMechanism, ExportableFailureMechanism actualExportableFailureMechanism) @@ -215,8 +205,8 @@ Assert.AreEqual(expectedFailureMechanismGroup, actualExportableFailureMechanism.Group); ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssemblyResult = actualExportableFailureMechanism.FailureMechanismAssembly; - Assert.AreEqual(expectedAssemblyOutput.Group, exportableFailureMechanismAssemblyResult.AssemblyCategory); - Assert.AreEqual(expectedAssemblyOutput.Probability, exportableFailureMechanismAssemblyResult.Probability); + Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssemblyResult.AssemblyCategory); + Assert.AreEqual(0, exportableFailureMechanismAssemblyResult.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(failureMechanism.SectionResultsOld.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs =================================================================== diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -r41f473231539e8121cbf2285ae7cd6783d743ce6 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision becb20be0283702deba5ab628e9150e9c749e130) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision 41f473231539e8121cbf2285ae7cd6783d743ce6) @@ -25,9 +25,6 @@ using NUnit.Framework; using Rhino.Mocks; using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.KernelWrapper.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.IO.Assembly; @@ -40,6 +37,8 @@ [TestFixture] public class ExportablePipingFailureMechanismFactoryTest { + private static readonly FailureMechanismSectionAssemblyOld expectedAssemblyResult = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None); + [Test] public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() { @@ -109,66 +108,27 @@ var assessmentSection = new AssessmentSectionStub(); - using (new AssemblyToolCalculatorFactoryConfigOld()) - { - var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; - FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + // Call + ExportableFailureMechanism exportableFailureMechanism = + ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection); - // Call - ExportableFailureMechanism exportableFailureMechanism = - ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection); + // Assert + Assert.AreEqual(ExportableFailureMechanismType.STPH, exportableFailureMechanism.Code); + Assert.AreEqual(ExportableFailureMechanismGroup.Group2, exportableFailureMechanism.Group); - // Assert - Assert.AreEqual(ExportableFailureMechanismType.STPH, exportableFailureMechanism.Code); - Assert.AreEqual(ExportableFailureMechanismGroup.Group2, exportableFailureMechanism.Group); + ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly; + Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory); + Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability); + Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - FailureMechanismAssembly calculatorOutput = failureMechanismAssemblyCalculator.FailureMechanismAssemblyOutput; - ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly; - Assert.AreEqual(calculatorOutput.Group, exportableFailureMechanismAssembly.AssemblyCategory); - Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); - Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - - IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults - .Select(sar => sar.FailureMechanismSection); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); - AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, - failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, - failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, - failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanismSections, - exportableFailureMechanism.SectionAssemblyResults.Cast()); - } + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); + AssertExportableFailureMechanismSectionResults(exportableFailureMechanismSections, + exportableFailureMechanism.SectionAssemblyResults.Cast()); } - [Test] - public void CreateExportableFailureMechanism_WithFailureMechanismWithManualAssessment_ManualAssemblyIgnored() - { - // Setup - var failureMechanism = new PipingFailureMechanism(); - FailureMechanismTestHelper.AddSections(failureMechanism, 1); - failureMechanism.SectionResultsOld.Single().UseManualAssembly = true; - - using (new AssemblyToolCalculatorFactoryConfigOld()) - { - var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator; - - // Call - ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub()); - - // Assert - Assert.AreSame(failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - failureMechanismAssemblyCalculator.FailureMechanismSectionAssemblies.Single()); - } - } - - private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyOld expectedSimpleAssembly, - FailureMechanismSectionAssemblyOld expectedDetailedAssembly, - FailureMechanismSectionAssemblyOld expectedTailorMadeAssembly, - FailureMechanismSectionAssemblyOld expectedCombinedAssembly, - IEnumerable sections, + private static void AssertExportableFailureMechanismSectionResults(IEnumerable sections, IEnumerable results) { int expectedNrOfResults = sections.Count(); @@ -179,37 +139,29 @@ ExportableFailureMechanismSection section = sections.ElementAt(i); ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability result = results.ElementAt(i); - AssertExportableFailureMechanismSectionResult(expectedSimpleAssembly, - expectedDetailedAssembly, - expectedTailorMadeAssembly, - expectedCombinedAssembly, - section, + AssertExportableFailureMechanismSectionResult(section, result); } } - private static void AssertExportableFailureMechanismSectionResult(FailureMechanismSectionAssemblyOld expectedSimpleAssembly, - FailureMechanismSectionAssemblyOld expectedDetailedAssembly, - FailureMechanismSectionAssemblyOld expectedTailorMadeAssembly, - FailureMechanismSectionAssemblyOld expectedCombinedAssembly, - ExportableFailureMechanismSection expectedSection, + private static void AssertExportableFailureMechanismSectionResult(ExportableFailureMechanismSection expectedSection, ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability actualResult) { Assert.AreSame(expectedSection, actualResult.FailureMechanismSection); - ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSimpleAssembly, + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedAssemblyResult, ExportableAssemblyMethod.WBI0E1, actualResult.SimpleAssembly); - ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedDetailedAssembly, + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedAssemblyResult, ExportableAssemblyMethod.WBI0G5, actualResult.DetailedAssembly); - ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedTailorMadeAssembly, + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedAssemblyResult, ExportableAssemblyMethod.WBI0T5, actualResult.TailorMadeAssembly); - ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedCombinedAssembly, + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedAssemblyResult, ExportableAssemblyMethod.WBI0A1, actualResult.CombinedAssembly); }