Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rc12ec2c75e00573ac835211b3cef5576c00d8783 -rc0a172c8a0f17029ac6cd74e9eb2d62120aff35c --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision c12ec2c75e00573ac835211b3cef5576c00d8783) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision c0a172c8a0f17029ac6cd74e9eb2d62120aff35c) @@ -840,12 +840,6 @@ StandAloneFailurePathEnabledContextMenuStrip, StandAloneFailurePathDisabledContextMenuStrip); - yield return RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo( - StrengthStabilityLengthwiseConstructionFailurePathEnabledChildNodeObjects, - StandAloneFailurePathDisabledChildNodeObjects, - StandAloneFailurePathEnabledContextMenuStrip, - StandAloneFailurePathDisabledContextMenuStrip); - yield return RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo( TechnicalInnovationFailurePathEnabledChildNodeObjects, StandAloneFailurePathDisabledChildNodeObjects, @@ -1021,7 +1015,6 @@ yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultOldTreeNodeInfo(); - yield return CreateFailureMechanismSectionResultOldTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return new TreeNodeInfo @@ -1986,7 +1979,6 @@ new ClosingStructuresFailurePathContext(assessmentSection.ClosingStructures, assessmentSection), new PipingStructureFailurePathContext(assessmentSection.PipingStructure, assessmentSection), new StabilityPointStructuresFailurePathContext(assessmentSection.StabilityPointStructures, assessmentSection), - new StrengthStabilityLengthwiseConstructionFailurePathContext(assessmentSection.StrengthStabilityLengthwiseConstruction, assessmentSection), new DuneErosionFailurePathContext(assessmentSection.DuneErosion, assessmentSection), new TechnicalInnovationFailurePathContext(assessmentSection.TechnicalInnovation, assessmentSection) }; @@ -2381,43 +2373,6 @@ #endregion - #region StrengthStabilityLengthwiseConstructionFailurePathContext TreeNodeInfo - - private static object[] StrengthStabilityLengthwiseConstructionFailurePathEnabledChildNodeObjects( - StrengthStabilityLengthwiseConstructionFailurePathContext nodeData) - { - return new object[] - { - new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, - GetStrengthStabilityLengthwiseConstructionFailurePathInputs(nodeData.WrappedData, nodeData.Parent), - TreeFolderCategory.Input), - new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName, - GetStrengthStabilityLengthwiseConstructionFailurePathOutputs(nodeData.WrappedData), - TreeFolderCategory.Output) - }; - } - - private static IEnumerable GetStrengthStabilityLengthwiseConstructionFailurePathInputs(StrengthStabilityLengthwiseConstructionFailureMechanism nodeData, IAssessmentSection assessmentSection) - { - return new object[] - { - new StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext(nodeData, assessmentSection), - nodeData.InAssemblyInputComments - }; - } - - private static IEnumerable GetStrengthStabilityLengthwiseConstructionFailurePathOutputs(StrengthStabilityLengthwiseConstructionFailureMechanism nodeData) - { - return new object[] - { - new FailureMechanismSectionResultContext( - nodeData.SectionResultsOld, nodeData), - nodeData.InAssemblyOutputComments - }; - } - - #endregion - #region TechnicalInnovationFailurePathContext TreeNodeInfo private static object[] TechnicalInnovationFailurePathEnabledChildNodeObjects(TechnicalInnovationFailurePathContext nodeData) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -rc12ec2c75e00573ac835211b3cef5576c00d8783 -rc0a172c8a0f17029ac6cd74e9eb2d62120aff35c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision c12ec2c75e00573ac835211b3cef5576c00d8783) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision c0a172c8a0f17029ac6cd74e9eb2d62120aff35c) @@ -562,7 +562,7 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(42, treeNodeInfos.Length); + Assert.AreEqual(40, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSectionStateRootContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HydraulicLoadsStateRootContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CalculationsStateRootContext))); @@ -574,7 +574,6 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverSlipOffOutwardsFailurePathContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(MicrostabilityFailurePathContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStructureFailurePathContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StrengthStabilityLengthwiseConstructionFailurePathContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(TechnicalInnovationFailurePathContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaterPressureAsphaltCoverFailurePathContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CategoryTreeFolder))); @@ -594,7 +593,6 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(MicrostabilityFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStructureFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(Comment))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StructuresOutputContext))); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GenericFailurePathsContextTreeNodeInfoTest.cs =================================================================== diff -u -r5e84f9d512d38330a48088943f34a17147890f75 -rc0a172c8a0f17029ac6cd74e9eb2d62120aff35c --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GenericFailurePathsContextTreeNodeInfoTest.cs (.../GenericFailurePathsContextTreeNodeInfoTest.cs) (revision 5e84f9d512d38330a48088943f34a17147890f75) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GenericFailurePathsContextTreeNodeInfoTest.cs (.../GenericFailurePathsContextTreeNodeInfoTest.cs) (revision c0a172c8a0f17029ac6cd74e9eb2d62120aff35c) @@ -175,7 +175,7 @@ object[] objects = info.ChildNodeObjects(context).ToArray(); // Assert - Assert.AreEqual(17, objects.Length); + Assert.AreEqual(16, objects.Length); var pipingFailurePathContext = (PipingFailurePathContext) objects[0]; Assert.AreSame(assessmentSection.Piping, pipingFailurePathContext.WrappedData); Assert.AreSame(assessmentSection, pipingFailurePathContext.Parent); @@ -232,15 +232,11 @@ Assert.AreSame(assessmentSection.StabilityPointStructures, stabilityPointStructuresFailurePathContext.WrappedData); Assert.AreSame(assessmentSection, stabilityPointStructuresFailurePathContext.Parent); - var strengthStabilityLengthwiseConstructionFailurePathContext = (StrengthStabilityLengthwiseConstructionFailurePathContext) objects[14]; - Assert.AreSame(assessmentSection.StrengthStabilityLengthwiseConstruction, strengthStabilityLengthwiseConstructionFailurePathContext.WrappedData); - Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailurePathContext.Parent); - - var duneErosionFailurePathContext = (DuneErosionFailurePathContext) objects[15]; + var duneErosionFailurePathContext = (DuneErosionFailurePathContext) objects[14]; Assert.AreSame(assessmentSection.DuneErosion, duneErosionFailurePathContext.WrappedData); Assert.AreSame(assessmentSection, duneErosionFailurePathContext.Parent); - var technicalInnovationFailurePathContext = (TechnicalInnovationFailurePathContext) objects[16]; + var technicalInnovationFailurePathContext = (TechnicalInnovationFailurePathContext) objects[15]; Assert.AreSame(assessmentSection.TechnicalInnovation, technicalInnovationFailurePathContext.WrappedData); Assert.AreSame(assessmentSection, technicalInnovationFailurePathContext.Parent); } Fisheye: Tag c0a172c8a0f17029ac6cd74e9eb2d62120aff35c refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c0a172c8a0f17029ac6cd74e9eb2d62120aff35c refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailurePathContextTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff?