Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -r5845c5ccca1cf904694a71f51492fdf596b3c0eb -r2c1499125b98e1487d567a3be7af63bf550192d0 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 5845c5ccca1cf904694a71f51492fdf596b3c0eb) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 2c1499125b98e1487d567a3be7af63bf550192d0) @@ -141,8 +141,6 @@ { var factory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub assessmentSectionCalculator = factory.LastCreatedAssessmentSectionAssemblyCalculator; - assessmentSectionCalculator.CombinedFailureMechanismSectionAssemblyOutput = new CombinedFailureMechanismSectionAssemblyResultWrapper( - Enumerable.Empty(), AssemblyMethod.BOI3A1, AssemblyMethod.BOI3B1, AssemblyMethod.BOI3C1); // Call ExportableAssessmentSection exportableAssessmentSection = ExportableAssessmentSectionFactory.CreateExportableAssessmentSection(idGenerator, assessmentSection); @@ -152,10 +150,6 @@ CollectionAssert.IsEmpty(exportableAssessmentSection.FailureMechanisms); CollectionAssert.IsEmpty(exportableAssessmentSection.FailureMechanismSectionCollections); - - AssertExportableCombinedFailureMechanismSectionAssemblyOutput( - assessmentSectionCalculator.CombinedFailureMechanismSectionAssemblyOutput, - exportableAssessmentSection.FailureMechanisms, exportableAssessmentSection.CombinedSectionAssemblies); } } @@ -223,30 +217,6 @@ Assert.AreEqual(assessmentSectionAssemblyResult.AssemblyResult.Probability, exportableAssessmentSectionAssemblyResult.Probability); } - private static void AssertExportableFailureMechanismSectionCollections( - IAssessmentSection assessmentSection, int nrOfCombinedSectionAssemblyResults, - IEnumerable failureMechanismSectionCollections) - { - IEnumerable failureMechanismsInAssembly = assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) - .Where(fm => fm.InAssembly); - - int nrOfFailureMechanismsInAssembly = failureMechanismsInAssembly.Count(); - int nrOfExpectedCollections = nrOfFailureMechanismsInAssembly + 1; - Assert.AreEqual(nrOfExpectedCollections, failureMechanismSectionCollections.Count()); - - for (var i = 0; i < nrOfFailureMechanismsInAssembly; i++) - { - int nrOfExpectedSections = failureMechanismsInAssembly.ElementAt(i).Sections.Count(); - Assert.AreEqual(nrOfExpectedSections, failureMechanismSectionCollections.ElementAt(i).Sections.Count()); - } - - ExportableFailureMechanismSectionCollection combinedFailureMechanismSectionCollection = failureMechanismSectionCollections.Last(); - IEnumerable exportableCombinedFailureMechanismSections = combinedFailureMechanismSectionCollection.Sections; - CollectionAssert.AllItemsAreInstancesOfType(exportableCombinedFailureMechanismSections, typeof(ExportableCombinedFailureMechanismSection)); - Assert.AreEqual(nrOfCombinedSectionAssemblyResults, exportableCombinedFailureMechanismSections.Count()); - } - private static void AssertExportableFailureMechanisms(IEnumerable> failureMechanisms, FailureMechanismAssemblyResultWrapper failureMechanismAssemblyResult, IEnumerable exportableFailureMechanisms) @@ -299,81 +269,5 @@ Assert.AreEqual(failureMechanism.SectionResults.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); } - - private static void AssertExportableCombinedFailureMechanismSectionAssemblyOutput( - CombinedFailureMechanismSectionAssemblyResultWrapper calculatorCombinedFailureMechanismSectionAssemblyOutput, - IEnumerable exportableFailureMechanisms, - IEnumerable exportableCombinedSectionAssemblies) - { - Assert.AreEqual(calculatorCombinedFailureMechanismSectionAssemblyOutput.AssemblyResults.Count(), - exportableCombinedSectionAssemblies.Count()); - - for (var i = 0; i < exportableCombinedSectionAssemblies.Count(); i++) - { - CombinedFailureMechanismSectionAssembly calculatorAssemblyResult = calculatorCombinedFailureMechanismSectionAssemblyOutput.AssemblyResults.ElementAt(i); - ExportableCombinedSectionAssembly exportableCombinedSectionAssembly = exportableCombinedSectionAssemblies.ElementAt(i); - - Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(calculatorCombinedFailureMechanismSectionAssemblyOutput.CombinedSectionResultAssemblyMethod), - exportableCombinedSectionAssembly.AssemblyGroupAssemblyMethod); - Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(calculatorCombinedFailureMechanismSectionAssemblyOutput.CommonSectionAssemblyMethod), - exportableCombinedSectionAssembly.Section.AssemblyMethod); - Assert.IsTrue(exportableCombinedSectionAssembly.FailureMechanismResults.All( - fmr => fmr.AssemblyMethod == ExportableAssemblyMethodConverter.ConvertTo( - calculatorCombinedFailureMechanismSectionAssemblyOutput.FailureMechanismResultsAssemblyMethod))); - - Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(calculatorAssemblyResult.Section.FailureMechanismSectionAssemblyGroup), - exportableCombinedSectionAssembly.AssemblyGroup); - - AssertExportableFailureMechanismCombinedSectionAssemblyResults(exportableCombinedSectionAssembly.Section, - exportableFailureMechanisms, - exportableCombinedSectionAssembly.FailureMechanismResults, - calculatorAssemblyResult.FailureMechanismSectionAssemblyGroupResults); - - Assert.AreEqual(calculatorAssemblyResult.Section.SectionStart, exportableCombinedSectionAssembly.Section.StartDistance); - Assert.AreEqual(calculatorAssemblyResult.Section.SectionEnd, exportableCombinedSectionAssembly.Section.EndDistance); - } - } - - private static void AssertExportableFailureMechanismCombinedSectionAssemblyResults( - ExportableFailureMechanismSection combinedFailureMechanismSection, IEnumerable exportableFailureMechanisms, - IEnumerable exportableFailureMechanismCombinedSectionAssemblyResults, - IEnumerable failureMechanismSectionAssemblyGroupResults) - { - const int expectedNrOfFailureMechanisms = 17; - Assert.AreEqual(expectedNrOfFailureMechanisms, exportableFailureMechanismCombinedSectionAssemblyResults.Count()); - - for (var i = 0; i < expectedNrOfFailureMechanisms; i++) - { - AssertExportableFailureMechanismCombinedSectionAssemblyResult( - combinedFailureMechanismSection, exportableFailureMechanisms.ElementAt(i).SectionAssemblyResults, - failureMechanismSectionAssemblyGroupResults.ElementAt(i), exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(i)); - } - } - - private static void AssertExportableFailureMechanismCombinedSectionAssemblyResult( - ExportableFailureMechanismSection combinedFailureMechanismSectionAssembly, - IEnumerable failureMechanismSectionAssemblyResults, - FailureMechanismSectionAssemblyGroup failureMechanismSectionAssemblyGroup, - ExportableFailureMechanismCombinedSectionAssemblyResult actualExportableFailureMechanismCombinedSectionAssemblyResult) - { - ExportableFailureMechanismSectionAssemblyResult associatedAssemblyResult = GetCorrespondingSectionAssemblyResultResult( - combinedFailureMechanismSectionAssembly, failureMechanismSectionAssemblyResults); - Assert.AreSame(associatedAssemblyResult, actualExportableFailureMechanismCombinedSectionAssemblyResult.FailureMechanismSectionResult); - Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(failureMechanismSectionAssemblyGroup), - actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyGroup); - } - - private static ExportableFailureMechanismSectionAssemblyResult GetCorrespondingSectionAssemblyResultResult( - ExportableFailureMechanismSection combinedFailureMechanismSection, - IEnumerable sectionAssemblyResults) - { - return sectionAssemblyResults.FirstOrDefault(assemblyResult => - { - ExportableFailureMechanismSection exportableFailureMechanismSection = assemblyResult.FailureMechanismSection; - - return combinedFailureMechanismSection.StartDistance >= exportableFailureMechanismSection.StartDistance - && combinedFailureMechanismSection.EndDistance <= exportableFailureMechanismSection.EndDistance; - }); - } } } \ No newline at end of file