Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r58f765c1ee18e8debf7c6d3382485650ce67ff78 -r8dffc1176f65b6c14ce7d3f5f91b51404d57b75e --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 58f765c1ee18e8debf7c6d3382485650ce67ff78) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 8dffc1176f65b6c14ce7d3f5f91b51404d57b75e) @@ -507,8 +507,7 @@ return new object[] { new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, assessmentSection), TreeFolderCategory.Input), - new GrassCoverErosionInwardsCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData, assessmentSection), - new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData, assessmentSection), TreeFolderCategory.Output) + new GrassCoverErosionInwardsCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData, assessmentSection) }; } @@ -522,18 +521,6 @@ }; } - private static IEnumerable GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) - { - return new object[] - { - new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N), - new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection), - new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResults, failureMechanism, assessmentSection), - failureMechanism.OutputComments - }; - } - private ContextMenuStrip CalculationsContextMenuStrip(GrassCoverErosionInwardsCalculationsContext context, object parentData, TreeViewControl treeViewControl) Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r58f765c1ee18e8debf7c6d3382485650ce67ff78 -r8dffc1176f65b6c14ce7d3f5f91b51404d57b75e --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 58f765c1ee18e8debf7c6d3382485650ce67ff78) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 8dffc1176f65b6c14ce7d3f5f91b51404d57b75e) @@ -108,7 +108,7 @@ object[] children = info.ChildNodeObjects(context).ToArray(); // Assert - Assert.AreEqual(3, children.Length); + Assert.AreEqual(2, children.Length); var inputsFolder = (CategoryTreeFolder) children[0]; Assert.AreEqual("Invoer", inputsFolder.Name); @@ -131,35 +131,6 @@ Assert.AreSame(failureMechanism.CalculationsGroup, calculationsFolder.WrappedData); Assert.IsNull(calculationsFolder.Parent); Assert.AreSame(failureMechanism, calculationsFolder.FailureMechanism); - - var outputsFolder = (CategoryTreeFolder) children[2]; - Assert.AreEqual("Oordeel", outputsFolder.Name); - Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category); - - Assert.AreEqual(4, outputsFolder.Contents.Count()); - var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData); - Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection); - - using (new AssemblyToolCalculatorFactoryConfig()) - { - var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; - AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator; - - failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc(); - Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N); - } - - var scenariosContext = (GrassCoverErosionInwardsScenariosContext) outputsFolder.Contents.ElementAt(1); - Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData); - Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism); - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - - var outputComment = (Comment) outputsFolder.Contents.ElementAt(3); - Assert.AreSame(failureMechanism.OutputComments, outputComment); } [Test]