Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -rdc138bac15a08e6bc4c3ec78d32574f7552d05aa -rd85530401d40e769244e163e9953d54ec604cf34 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision dc138bac15a08e6bc4c3ec78d32574f7552d05aa) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision d85530401d40e769244e163e9953d54ec604cf34) @@ -431,14 +431,6 @@ return; } - var macroStabilityOutwards = failureMechanism as MacroStabilityOutwardsFailureMechanism; - if (macroStabilityOutwards != null) - { - Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(GetFailureMechanismSectionResult(macroStabilityOutwards).ManualAssemblyCategoryGroup), - failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single()); - return; - } - var waterPressureAsphaltCover = failureMechanism as WaterPressureAsphaltCoverFailureMechanism; if (waterPressureAsphaltCover != null) { @@ -980,7 +972,6 @@ assessmentSection.WaveImpactAsphaltCover, assessmentSection.GrassCoverErosionOutwards, assessmentSection.DuneErosion, - assessmentSection.MacroStabilityOutwards, assessmentSection.Microstability, assessmentSection.WaterPressureAsphaltCover, assessmentSection.GrassCoverSlipOffOutwards, Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionHelperTest.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rd85530401d40e769244e163e9953d54ec604cf34 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision d85530401d40e769244e163e9953d54ec604cf34) @@ -94,7 +94,6 @@ assessmentSection => assessmentSection.StabilityStoneCover, assessmentSection => assessmentSection.GrassCoverSlipOffInwards, assessmentSection => assessmentSection.GrassCoverSlipOffOutwards, - assessmentSection => assessmentSection.MacroStabilityOutwards, assessmentSection => assessmentSection.Microstability, assessmentSection => assessmentSection.PipingStructure, assessmentSection => assessmentSection.StrengthStabilityLengthwiseConstruction, @@ -127,7 +126,6 @@ FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverErosionOutwards, nrOfSections); FailureMechanismTestHelper.AddSections(assessmentSection.DuneErosion, nrOfSections); - FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityOutwards, nrOfSections); FailureMechanismTestHelper.AddSections(assessmentSection.Microstability, nrOfSections); FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffOutwards, nrOfSections); FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverSlipOffInwards, nrOfSections); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rd85530401d40e769244e163e9953d54ec604cf34 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision d85530401d40e769244e163e9953d54ec604cf34) @@ -90,26 +90,25 @@ assessmentSection, assessmentSection.GetFailureMechanisms(), random.NextBoolean()); // Assert - Assert.AreEqual(18, inputs.Count()); + Assert.AreEqual(17, inputs.Count()); AssertSections(assessmentSection.Piping.SectionResultsOld, inputs.ElementAt(0)); AssertSections(assessmentSection.GrassCoverErosionInwards.SectionResultsOld, inputs.ElementAt(1)); AssertSections(assessmentSection.MacroStabilityInwards.SectionResultsOld, inputs.ElementAt(2)); - AssertSections(assessmentSection.MacroStabilityOutwards.SectionResultsOld, inputs.ElementAt(3)); - AssertSections(assessmentSection.Microstability.SectionResultsOld, inputs.ElementAt(4)); - AssertSections(assessmentSection.StabilityStoneCover.SectionResultsOld, inputs.ElementAt(5)); - AssertSections(assessmentSection.WaveImpactAsphaltCover.SectionResultsOld, inputs.ElementAt(6)); - AssertSections(assessmentSection.WaterPressureAsphaltCover.SectionResultsOld, inputs.ElementAt(7)); - AssertSections(assessmentSection.GrassCoverErosionOutwards.SectionResultsOld, inputs.ElementAt(8)); - AssertSections(assessmentSection.GrassCoverSlipOffOutwards.SectionResultsOld, inputs.ElementAt(9)); - AssertSections(assessmentSection.GrassCoverSlipOffInwards.SectionResultsOld, inputs.ElementAt(10)); - AssertSections(assessmentSection.HeightStructures.SectionResultsOld, inputs.ElementAt(11)); - AssertSections(assessmentSection.ClosingStructures.SectionResultsOld, inputs.ElementAt(12)); - AssertSections(assessmentSection.PipingStructure.SectionResultsOld, inputs.ElementAt(13)); - AssertSections(assessmentSection.StabilityPointStructures.SectionResultsOld, inputs.ElementAt(14)); - AssertSections(assessmentSection.StrengthStabilityLengthwiseConstruction.SectionResultsOld, inputs.ElementAt(15)); - AssertSections(assessmentSection.DuneErosion.SectionResultsOld, inputs.ElementAt(16)); - AssertSections(assessmentSection.TechnicalInnovation.SectionResultsOld, inputs.ElementAt(17)); + AssertSections(assessmentSection.Microstability.SectionResultsOld, inputs.ElementAt(3)); + AssertSections(assessmentSection.StabilityStoneCover.SectionResultsOld, inputs.ElementAt(4)); + AssertSections(assessmentSection.WaveImpactAsphaltCover.SectionResultsOld, inputs.ElementAt(5)); + AssertSections(assessmentSection.WaterPressureAsphaltCover.SectionResultsOld, inputs.ElementAt(6)); + AssertSections(assessmentSection.GrassCoverErosionOutwards.SectionResultsOld, inputs.ElementAt(7)); + AssertSections(assessmentSection.GrassCoverSlipOffOutwards.SectionResultsOld, inputs.ElementAt(8)); + AssertSections(assessmentSection.GrassCoverSlipOffInwards.SectionResultsOld, inputs.ElementAt(9)); + AssertSections(assessmentSection.HeightStructures.SectionResultsOld, inputs.ElementAt(10)); + AssertSections(assessmentSection.ClosingStructures.SectionResultsOld, inputs.ElementAt(11)); + AssertSections(assessmentSection.PipingStructure.SectionResultsOld, inputs.ElementAt(12)); + AssertSections(assessmentSection.StabilityPointStructures.SectionResultsOld, inputs.ElementAt(13)); + AssertSections(assessmentSection.StrengthStabilityLengthwiseConstruction.SectionResultsOld, inputs.ElementAt(14)); + AssertSections(assessmentSection.DuneErosion.SectionResultsOld, inputs.ElementAt(15)); + AssertSections(assessmentSection.TechnicalInnovation.SectionResultsOld, inputs.ElementAt(16)); } } @@ -142,7 +141,6 @@ yield return new TestCaseData(assessmentSection, assessmentSection.Piping); yield return new TestCaseData(assessmentSection, assessmentSection.GrassCoverErosionInwards); yield return new TestCaseData(assessmentSection, assessmentSection.MacroStabilityInwards); - yield return new TestCaseData(assessmentSection, assessmentSection.MacroStabilityOutwards); yield return new TestCaseData(assessmentSection, assessmentSection.Microstability); yield return new TestCaseData(assessmentSection, assessmentSection.StabilityStoneCover); yield return new TestCaseData(assessmentSection, assessmentSection.WaveImpactAsphaltCover); @@ -377,15 +375,6 @@ return; } - var macroStabilityOutwards = failureMechanism as MacroStabilityOutwardsFailureMechanism; - if (macroStabilityOutwards != null) - { - AssertSectionsWithResult(macroStabilityOutwards.SectionResultsOld, - ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(GetFailureMechanismSectionResult(macroStabilityOutwards).ManualAssemblyCategoryGroup), - actualInput.Single()); - return; - } - var waterPressureAsphaltCover = failureMechanism as WaterPressureAsphaltCoverFailureMechanism; if (waterPressureAsphaltCover != null) { Index: Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/AssessmentSectionAssemblyTestHelper.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rd85530401d40e769244e163e9953d54ec604cf34 --- Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/AssessmentSectionAssemblyTestHelper.cs (.../AssessmentSectionAssemblyTestHelper.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/AssessmentSectionAssemblyTestHelper.cs (.../AssessmentSectionAssemblyTestHelper.cs) (revision d85530401d40e769244e163e9953d54ec604cf34) @@ -324,17 +324,6 @@ sectionResult.ManualAssemblyCategoryGroup = manualSectionAssemblyCategoryGroup; }, assessmentSection => assessmentSection.Microstability); - yield return new AssessmentSectionConfiguration(assessmentSection => - { - MacroStabilityOutwardsFailureMechanism failureMechanism = assessmentSection.MacroStabilityOutwards; - failureMechanism.InAssembly = true; - FailureMechanismTestHelper.AddSections(failureMechanism, 1); - - MacroStabilityOutwardsFailureMechanismSectionResultOld sectionResult = failureMechanism.SectionResultsOld.Single(); - sectionResult.UseManualAssembly = true; - sectionResult.ManualAssemblyCategoryGroup = manualSectionAssemblyCategoryGroup; - }, assessmentSection => assessmentSection.MacroStabilityOutwards); - yield return new AssessmentSectionConfiguration(section => { WaterPressureAsphaltCoverFailureMechanism failureMechanism = section.WaterPressureAsphaltCover;