Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -rf563394700bcbcf5eb13615972f0beb72b0a0894 -r862f3474f42601ce86c53884c54a419eb72180cd --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision f563394700bcbcf5eb13615972f0beb72b0a0894) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 862f3474f42601ce86c53884c54a419eb72180cd) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.TestUtil; -using Core.Common.Util.Extensions; using NUnit.Framework; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.KernelWrapper.Calculators; @@ -289,15 +288,9 @@ #region Helpers - private static AssessmentSection CreateAssessmentSectionWithFailureMechanismsNotPartOfAssembly() + private static CombinedFailureMechanismSectionAssembly CreateCombinedFailureMechanismSectionAssembly( + IAssessmentSection assessmentSection, int seed) { - AssessmentSection assessmentSection = CreateAssessmentSection(); - assessmentSection.GetFailureMechanisms().ForEachElementDo(fm => fm.InAssembly = false); - return assessmentSection; - } - - private static CombinedFailureMechanismSectionAssembly CreateCombinedFailureMechanismSectionAssembly(AssessmentSection assessmentSection, int seed) - { var random = new Random(seed); return new CombinedFailureMechanismSectionAssembly( new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(), random.NextEnumValue()), @@ -307,71 +300,12 @@ .ToArray()); } - private static void AssertGroup1And2FailureMechanismInputs(AssessmentSection assessmentSection, - FailureMechanismAssembly expectedFailureMechanismAssembly, - AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator) - { - IEnumerable expectedFailureMechanisms = GetExpectedGroup1And2FailureMechanisms(assessmentSection); - IEnumerable failureMechanismAssemblyInput = assessmentSectionAssemblyCalculator.FailureMechanismAssemblyInput; - Assert.AreEqual(expectedFailureMechanisms.Count(), failureMechanismAssemblyInput.Count()); - foreach (FailureMechanismAssembly failureMechanismAssembly in failureMechanismAssemblyInput) - { - Assert.AreEqual(expectedFailureMechanismAssembly.Group, failureMechanismAssembly.Group); - Assert.AreEqual(expectedFailureMechanismAssembly.Probability, failureMechanismAssembly.Probability); - } - } - - private static void AssertGroup3And4FailureMechanismInputs(AssessmentSection assessmentSection, - FailureMechanismAssemblyCategoryGroup expectedAssemblyCategoryGroup, - AssessmentSectionAssemblyCalculatorStubOld assessmentSectionAssemblyCalculator) - { - IEnumerable expectedFailureMechanisms = GetExpectedGroup3And4FailureMechanisms(assessmentSection); - IEnumerable failureMechanismAssemblyInput = - assessmentSectionAssemblyCalculator.FailureMechanismAssemblyCategoryGroupInput; - Assert.AreEqual(expectedFailureMechanisms.Count(), failureMechanismAssemblyInput.Count()); - Assert.IsTrue(failureMechanismAssemblyInput.All(i => i == expectedAssemblyCategoryGroup)); - } - private static AssessmentSection CreateAssessmentSection() { var random = new Random(21); return new AssessmentSection(random.NextEnumValue()); } - private static IEnumerable GetExpectedGroup1And2FailureMechanisms(AssessmentSection assessmentSection) - { - return new IFailureMechanism[] - { - assessmentSection.GrassCoverErosionInwards, - assessmentSection.HeightStructures, - assessmentSection.ClosingStructures, - assessmentSection.StabilityPointStructures, - assessmentSection.Piping, - assessmentSection.MacroStabilityInwards - }; - } - - private static IEnumerable GetExpectedGroup3And4FailureMechanisms(AssessmentSection assessmentSection) - { - return new IFailureMechanism[] - { - assessmentSection.StabilityStoneCover, - assessmentSection.WaveImpactAsphaltCover, - assessmentSection.GrassCoverErosionOutwards, - assessmentSection.DuneErosion, - assessmentSection.Microstability, - assessmentSection.WaterPressureAsphaltCover, - assessmentSection.GrassCoverSlipOffOutwards, - assessmentSection.GrassCoverSlipOffInwards, - assessmentSection.PipingStructure - }; - } - - private static T GetFailureMechanismSectionResult(IHasSectionResults failureMechanism) where T : FailureMechanismSectionResultOld - { - return failureMechanism.SectionResultsOld.Single(); - } - #endregion } } \ No newline at end of file