Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs =================================================================== diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision fa6b41745f75625989787406e5bb0001e6a71a2e) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) @@ -226,7 +226,6 @@ WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.WaveImpactAsphaltCover, useManual), GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.GrassCoverErosionOutwards, useManual), DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.DuneErosion, useManual), - MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.MacroStabilityOutwards, assessmentSection, useManual), MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.Microstability, useManual), WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.WaterPressureAsphaltCover, useManual), GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards, useManual), Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) @@ -90,13 +90,6 @@ assessmentSection, MacroStabilityInwardsAssemblyFunc, useManual)); } - MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards; - if (failureMechanisms.Contains(macroStabilityOutwardsFailureMechanism)) - { - inputs.Add(CreateCombinedSections(macroStabilityOutwardsFailureMechanism.SectionResultsOld, - assessmentSection, MacroStabilityOutwardsAssemblyFunc, useManual)); - } - MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability; if (failureMechanisms.Contains(microstabilityFailureMechanism)) { @@ -275,15 +268,6 @@ } } - private static Func MacroStabilityOutwardsAssemblyFunc - { - get - { - return (sectionResult, assessmentSection, useManual) => MacroStabilityOutwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( - sectionResult, assessmentSection.MacroStabilityOutwards, assessmentSection, useManual); - } - } - private static Func MicrostabilityAssemblyFunc { get Fisheye: Tag d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/MacroStabilityOutwardsAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs =================================================================== diff -u -r4075241549b94454a6ad23fc355c69be49aecc17 -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 4075241549b94454a6ad23fc355c69be49aecc17) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) @@ -164,7 +164,6 @@ CreatePipingFailureMechanismAssemblyResultRow(), CreateGrassCoverErosionInwardsFailureMechanismAssemblyResultRow(), CreateMacroStabilityInwardsFailureMechanismAssemblyResultRow(), - CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow(), CreateMicrostabilityFailureMechanismAssemblyResultRow(), CreateStabilityStoneCoverFailureMechanismAssemblyResultRow(), CreateWaveImpactFailureMechanismAssemblyResultRow(), @@ -384,15 +383,6 @@ #region Group 4 - private FailureMechanismAssemblyResultRowBase CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow() - { - MacroStabilityOutwardsFailureMechanism macroStabilityOutwards = AssessmentSection.MacroStabilityOutwards; - return new FailureMechanismAssemblyCategoryGroupResultRow(macroStabilityOutwards, - () => MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(macroStabilityOutwards, - AssessmentSection, - true)); - } - private FailureMechanismAssemblyCategoryGroupResultRow CreateMicrostabilityFailureMechanismAssemblyResultRow() { MicrostabilityFailureMechanism microstability = AssessmentSection.Microstability; Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r404042be44c00e8db7bef3e1a7603c6d3e6597bb -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 404042be44c00e8db7bef3e1a7603c6d3e6597bb) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) @@ -415,15 +415,6 @@ CloseForData = CloseAssessmentSectionViewForData }; - yield return CreateFailureMechanismWithDetailedAssessmentViewInfo( - context => new FailureMechanismWithDetailedAssessmentView( - context.WrappedData, - context.Parent, - () => MacroStabilityOutwardsAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(context.WrappedData), - () => MacroStabilityOutwardsAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(context.WrappedData, context.Parent), - () => MacroStabilityOutwardsAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(context.WrappedData, context.Parent), - () => MacroStabilityOutwardsAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(context.WrappedData, context.Parent))); - yield return CreateFailureMechanismWithDetailedAssessmentViewInfo( context => new FailureMechanismWithDetailedAssessmentView( context.WrappedData, Fisheye: Tag d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/MacroStabilityOutwardsAssemblyMapDataFeaturesFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) @@ -815,14 +815,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) { @@ -923,50 +915,47 @@ MacroStabilityInwardsFailureMechanism macroStabilityInwards = assessmentSection.MacroStabilityInwards; AssertAssemblyCells(macroStabilityInwards, assemblyOutput, rows[2].Cells); - MacroStabilityOutwardsFailureMechanism macroStabilityOutwards = assessmentSection.MacroStabilityOutwards; - AssertAssemblyCells(macroStabilityOutwards, assemblyCategoryGroup, rows[3].Cells); - MicrostabilityFailureMechanism microStability = assessmentSection.Microstability; - AssertAssemblyCells(microStability, assemblyCategoryGroup, rows[4].Cells); + AssertAssemblyCells(microStability, assemblyCategoryGroup, rows[3].Cells); StabilityStoneCoverFailureMechanism stabilityStoneCover = assessmentSection.StabilityStoneCover; - AssertAssemblyCells(stabilityStoneCover, assemblyCategoryGroup, rows[5].Cells); + AssertAssemblyCells(stabilityStoneCover, assemblyCategoryGroup, rows[4].Cells); WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCover = assessmentSection.WaveImpactAsphaltCover; - AssertAssemblyCells(waveImpactAsphaltCover, assemblyCategoryGroup, rows[6].Cells); + AssertAssemblyCells(waveImpactAsphaltCover, assemblyCategoryGroup, rows[5].Cells); WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCover = assessmentSection.WaterPressureAsphaltCover; - AssertAssemblyCells(waterPressureAsphaltCover, assemblyCategoryGroup, rows[7].Cells); + AssertAssemblyCells(waterPressureAsphaltCover, assemblyCategoryGroup, rows[6].Cells); GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwards = assessmentSection.GrassCoverErosionOutwards; - AssertAssemblyCells(grassCoverErosionOutwards, assemblyCategoryGroup, rows[8].Cells); + AssertAssemblyCells(grassCoverErosionOutwards, assemblyCategoryGroup, rows[7].Cells); GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwards = assessmentSection.GrassCoverSlipOffOutwards; - AssertAssemblyCells(grassCoverSlipOffOutwards, assemblyCategoryGroup, rows[9].Cells); + AssertAssemblyCells(grassCoverSlipOffOutwards, assemblyCategoryGroup, rows[8].Cells); GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwards = assessmentSection.GrassCoverSlipOffInwards; - AssertAssemblyCells(grassCoverSlipOffInwards, assemblyCategoryGroup, rows[10].Cells); + AssertAssemblyCells(grassCoverSlipOffInwards, assemblyCategoryGroup, rows[9].Cells); HeightStructuresFailureMechanism heightStructures = assessmentSection.HeightStructures; - AssertAssemblyCells(heightStructures, assemblyOutput, rows[11].Cells); + AssertAssemblyCells(heightStructures, assemblyOutput, rows[10].Cells); ClosingStructuresFailureMechanism closingStructures = assessmentSection.ClosingStructures; - AssertAssemblyCells(closingStructures, assemblyOutput, rows[12].Cells); + AssertAssemblyCells(closingStructures, assemblyOutput, rows[11].Cells); PipingStructureFailureMechanism pipingStructure = assessmentSection.PipingStructure; - AssertAssemblyCells(pipingStructure, assemblyCategoryGroup, rows[13].Cells); + AssertAssemblyCells(pipingStructure, assemblyCategoryGroup, rows[12].Cells); StabilityPointStructuresFailureMechanism stabilityPointStructures = assessmentSection.StabilityPointStructures; - AssertAssemblyCells(stabilityPointStructures, assemblyOutput, rows[14].Cells); + AssertAssemblyCells(stabilityPointStructures, assemblyOutput, rows[13].Cells); StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstruction = assessmentSection.StrengthStabilityLengthwiseConstruction; - AssertAssemblyCells(strengthStabilityLengthwiseConstruction, assemblyCategoryGroup, rows[15].Cells); + AssertAssemblyCells(strengthStabilityLengthwiseConstruction, assemblyCategoryGroup, rows[14].Cells); DuneErosionFailureMechanism duneErosion = assessmentSection.DuneErosion; - AssertAssemblyCells(duneErosion, assemblyCategoryGroup, rows[16].Cells); + AssertAssemblyCells(duneErosion, assemblyCategoryGroup, rows[15].Cells); TechnicalInnovationFailureMechanism technicalInnovation = assessmentSection.TechnicalInnovation; - AssertAssemblyCells(technicalInnovation, assemblyCategoryGroup, rows[17].Cells); + AssertAssemblyCells(technicalInnovation, assemblyCategoryGroup, rows[16].Cells); } private static void AssertAssemblyCells(IFailureMechanism failureMechanism, DataGridViewCellCollection cells) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r404042be44c00e8db7bef3e1a7603c6d3e6597bb -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 404042be44c00e8db7bef3e1a7603c6d3e6597bb) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) @@ -394,7 +394,7 @@ ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray(); // Assert - Assert.AreEqual(30, viewInfos.Length); + Assert.AreEqual(29, viewInfos.Length); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -519,12 +519,6 @@ PluginTestHelper.AssertViewInfoDefined( viewInfos, - typeof(MacroStabilityOutwardsFailurePathContext), - typeof(MacroStabilityOutwardsFailureMechanism), - typeof(FailureMechanismWithDetailedAssessmentView)); - - PluginTestHelper.AssertViewInfoDefined( - viewInfos, typeof(MicrostabilityFailurePathContext), typeof(MicrostabilityFailureMechanism), typeof(FailureMechanismWithDetailedAssessmentView)); Fisheye: Tag d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff?