Fisheye: Tag 23555ddacb0d4a0223611d98417fd4106c69a35b refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/MacroStabilityOutwardsAssemblyCategoriesContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rc8df40c654d3cc268ed5e7347943d81637e83b52 -r23555ddacb0d4a0223611d98417fd4106c69a35b --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision c8df40c654d3cc268ed5e7347943d81637e83b52) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 23555ddacb0d4a0223611d98417fd4106c69a35b) @@ -51,7 +51,6 @@ using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.IllustrationPoints; -using Riskeer.Common.Data.Probability; using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.ChangeHandlers; using Riskeer.Common.Forms.Controls; @@ -79,7 +78,6 @@ using Riskeer.Integration.Data; using Riskeer.Integration.Data.FailurePath; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.Input; using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.Integration.Forms.Dialogs; using Riskeer.Integration.Forms.Factories; @@ -1143,17 +1141,6 @@ .Build() }; - yield return new TreeNodeInfo - { - Text = context => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, - Image = context => RiskeerCommonFormsResources.NormsIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .AddSeparator() - .AddPropertiesItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, @@ -2437,12 +2424,8 @@ private static IEnumerable GetMacroStabilityOutwardsFailurePathOutputs(MacroStabilityOutwardsFailureMechanism nodeData, IAssessmentSection assessmentSection) { - MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = nodeData.MacroStabilityOutwardsProbabilityAssessmentInput; return new object[] { - new MacroStabilityOutwardsAssemblyCategoriesContext(nodeData, - assessmentSection, - () => probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length)), new ProbabilityFailureMechanismSectionResultContext( nodeData.SectionResultsOld, nodeData, assessmentSection), nodeData.InAssemblyOutputComments Fisheye: Tag 23555ddacb0d4a0223611d98417fd4106c69a35b refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/StandAlone/MacroStabilityOutwardsAssemblyCategoriesContextTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -rc8df40c654d3cc268ed5e7347943d81637e83b52 -r23555ddacb0d4a0223611d98417fd4106c69a35b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision c8df40c654d3cc268ed5e7347943d81637e83b52) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 23555ddacb0d4a0223611d98417fd4106c69a35b) @@ -596,7 +596,7 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(46, treeNodeInfos.Length); + Assert.AreEqual(45, 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))); @@ -636,7 +636,6 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StructuresOutputContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultTotalContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultPerSectionContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(MacroStabilityOutwardsAssemblyCategoriesContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismAssemblyCategoriesContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultsContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultPerSectionMapContext))); Fisheye: Tag 23555ddacb0d4a0223611d98417fd4106c69a35b refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsAssemblyCategoriesContextTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailurePathContextTreeNodeInfoTest.cs =================================================================== diff -u -rcae86e85207fdc7bbdd45179588f5d3c56bac58f -r23555ddacb0d4a0223611d98417fd4106c69a35b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailurePathContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailurePathContextTreeNodeInfoTest.cs) (revision cae86e85207fdc7bbdd45179588f5d3c56bac58f) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailurePathContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailurePathContextTreeNodeInfoTest.cs) (revision 23555ddacb0d4a0223611d98417fd4106c69a35b) @@ -27,17 +27,12 @@ using Core.Gui.ContextMenu; using NUnit.Framework; using Rhino.Mocks; -using Riskeer.AssemblyTool.KernelWrapper.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories; using Riskeer.Common.Data; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Probability; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Plugin.TestUtil; using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.Input; using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.Integration.Forms.PresentationObjects.StandAlone; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -166,30 +161,16 @@ Assert.AreSame(failureMechanism.InAssemblyInputComments, inAssemblyInputComments); var outputFolder = (CategoryTreeFolder) children[1]; - Assert.AreEqual(3, outputFolder.Contents.Count()); + Assert.AreEqual(2, outputFolder.Contents.Count()); Assert.AreEqual("Oordeel", outputFolder.Name); Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category); - var failureMechanismAssemblyCategoriesContext = (MacroStabilityOutwardsAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData); - Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection); - - using (new AssemblyToolCalculatorFactoryConfigOld()) - { - var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator; - - failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc(); - MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput; - Assert.AreEqual(probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length), calculator.FailureMechanismN); - } - var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext) - outputFolder.Contents.ElementAt(1); + outputFolder.Contents.ElementAt(0); Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); Assert.AreSame(failureMechanism.SectionResultsOld, failureMechanismResultsContext.WrappedData); - var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(2); + var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(1); Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments); }