Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -r73bb4932d13d36d1cd3cd30d8151f2adf49646f2 -rb050816435baf537ed7e77072c3db76cfac8aeca --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 73bb4932d13d36d1cd3cd30d8151f2adf49646f2) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision b050816435baf537ed7e77072c3db76cfac8aeca) @@ -357,11 +357,13 @@ private static object[] FailureMechanismEnabledChildNodeObjects(ClosingStructuresFailureMechanismContext context) { ClosingStructuresFailureMechanism wrappedData = context.WrappedData; + IAssessmentSection assessmentSection = context.Parent; + return new object[] { - new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, context.Parent), TreeFolderCategory.Input), - new ClosingStructuresCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData, context.Parent), - new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData, context.Parent), TreeFolderCategory.Output) + new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, assessmentSection), TreeFolderCategory.Input), + new ClosingStructuresCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData, assessmentSection), + new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData, assessmentSection), TreeFolderCategory.Output) }; } @@ -388,6 +390,7 @@ { return new object[] { + new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N), new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new ProbabilityFailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism, assessmentSection), Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r4fd4b13639f6d6f3657c02916f60571bf940ee9c -rb050816435baf537ed7e77072c3db76cfac8aeca --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 4fd4b13639f6d6f3657c02916f60571bf940ee9c) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision b050816435baf537ed7e77072c3db76cfac8aeca) @@ -141,17 +141,23 @@ Assert.AreEqual("Oordeel", outputsFolder.Name); Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category); - Assert.AreEqual(3, outputsFolder.Contents.Count()); - var scenariosContext = (ClosingStructuresScenariosContext) outputsFolder.Contents.ElementAt(0); + Assert.AreEqual(4, outputsFolder.Contents.Count()); + + var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0); + Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData); + Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection); + Assert.AreEqual(failureMechanism.GeneralInput.N, failureMechanismAssemblyCategoriesContext.GetNFunc()); + + var scenariosContext = (ClosingStructuresScenariosContext) outputsFolder.Contents.ElementAt(1); Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData); Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism); - var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1); + var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2); Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection); - var outputComment = (Comment) outputsFolder.Contents.ElementAt(2); + var outputComment = (Comment) outputsFolder.Contents.ElementAt(3); Assert.AreSame(failureMechanism.OutputComments, outputComment); }