Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -ref9095ff24bfcb2cf6af45f3753a1e4dbef2fe1a -r19c9794450996d215029b443ad6c6ac10d9364c6 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision ef9095ff24bfcb2cf6af45f3753a1e4dbef2fe1a) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 19c9794450996d215029b443ad6c6ac10d9364c6) @@ -485,9 +485,7 @@ new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetCalculationsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input), new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, - failureMechanism, assessmentSection), - new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName, - GetOutputs(failureMechanism, assessmentSection), TreeFolderCategory.Output) + failureMechanism, assessmentSection) }; } @@ -500,17 +498,6 @@ }; } - private static IEnumerable GetOutputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) - { - return new object[] - { - new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N), - new FailureMechanismSectionResultContext( - failureMechanism.SectionResults, failureMechanism), - failureMechanism.OutputComments - }; - } - private ContextMenuStrip CalculationsContextMenuStrip(GrassCoverErosionOutwardsCalculationsContext context, object parentData, TreeViewControl treeViewControl) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -ref9095ff24bfcb2cf6af45f3753a1e4dbef2fe1a -r19c9794450996d215029b443ad6c6ac10d9364c6 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs) (revision ef9095ff24bfcb2cf6af45f3753a1e4dbef2fe1a) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs) (revision 19c9794450996d215029b443ad6c6ac10d9364c6) @@ -35,9 +35,6 @@ using Core.Common.TestUtil; 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.FailureMechanism; @@ -169,7 +166,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); Assert.AreEqual(TreeFolderCategory.Input, inputsFolder.Category); @@ -187,32 +184,6 @@ Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, hydraulicBoundaryDatabaseContext.WrappedData); Assert.AreSame(failureMechanism, hydraulicBoundaryDatabaseContext.FailureMechanism); Assert.AreSame(assessmentSection, hydraulicBoundaryDatabaseContext.AssessmentSection); - - var outputsFolder = (CategoryTreeFolder) children[2]; - Assert.AreEqual("Oordeel", outputsFolder.Name); - Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category); - - Assert.AreEqual(3, 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 failureMechanismResultsContext = (FailureMechanismSectionResultContext) - outputsFolder.Contents.ElementAt(1); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - - var outputComment = (Comment) outputsFolder.Contents.ElementAt(2); - Assert.AreSame(failureMechanism.OutputComments, outputComment); } [Test]