Fisheye: Tag ac21dc3cdc606aa866340d4f7795c325d8e8d909 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/AssemblyResultGroupContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rf147b624dadd780d3186ec19c301d9ed1634504e -rac21dc3cdc606aa866340d4f7795c325d8e8d909 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f147b624dadd780d3186ec19c301d9ed1634504e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ac21dc3cdc606aa866340d4f7795c325d8e8d909) @@ -101,6 +101,15 @@ } /// + /// Looks up a localized string similar to Assemblage. + /// + public static string AssemblyResultCategoryTreeFolder_DisplayName { + get { + return ResourceManager.GetString("AssemblyResultCategoryTreeFolder_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to ID van het traject.. /// public static string AssessmentSection_Id_Description { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -rf147b624dadd780d3186ec19c301d9ed1634504e -rac21dc3cdc606aa866340d4f7795c325d8e8d909 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision f147b624dadd780d3186ec19c301d9ed1634504e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision ac21dc3cdc606aa866340d4f7795c325d8e8d909) @@ -363,4 +363,7 @@ Bovengrens [1/jaar] + + Assemblage + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj =================================================================== diff -u -r59d9b1c9e566e1b1ec2b8e21c52284a97d8cc2c1 -rac21dc3cdc606aa866340d4f7795c325d8e8d909 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 59d9b1c9e566e1b1ec2b8e21c52284a97d8cc2c1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision ac21dc3cdc606aa866340d4f7795c325d8e8d909) @@ -29,7 +29,6 @@ - Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r4900ca019e92017629eb7d251d8e28c4a1563414 -rac21dc3cdc606aa866340d4f7795c325d8e8d909 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 4900ca019e92017629eb7d251d8e28c4a1563414) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision ac21dc3cdc606aa866340d4f7795c325d8e8d909) @@ -1355,8 +1355,13 @@ nodeData.Comments }; - IEnumerable failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData); - childNodes.AddRange(failureMechanismContexts); + childNodes.AddRange(WrapFailureMechanismsInContexts(nodeData)); + childNodes.Add(new CategoryTreeFolder(RingtoetsFormsResources.AssemblyResultCategoryTreeFolder_DisplayName, + new object[] + { + new AssemblyResultTotalContext(nodeData), + new AssemblyResultPerSectionContext(nodeData) + })); return childNodes.ToArray(); } Fisheye: Tag ac21dc3cdc606aa866340d4f7795c325d8e8d909 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/AssemblyResultGroupContextTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj =================================================================== diff -u -r99a7f4aa2590377dc446e7e21a4d1b053c8515cd -rac21dc3cdc606aa866340d4f7795c325d8e8d909 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 99a7f4aa2590377dc446e7e21a4d1b053c8515cd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision ac21dc3cdc606aa866340d4f7795c325d8e8d909) @@ -38,7 +38,6 @@ - Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -r37de32e433cd0940e567c8cca7aa79bfe03122ab -rac21dc3cdc606aa866340d4f7795c325d8e8d909 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 37de32e433cd0940e567c8cca7aa79bfe03122ab) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision ac21dc3cdc606aa866340d4f7795c325d8e8d909) @@ -184,7 +184,7 @@ object[] objects = info.ChildNodeObjects(assessmentSection).ToArray(); // Assert - Assert.AreEqual(24, objects.Length); + Assert.AreEqual(25, objects.Length); var referenceLineContext = (ReferenceLineContext) objects[0]; Assert.AreSame(assessmentSection, referenceLineContext.WrappedData); @@ -246,6 +246,7 @@ var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext) objects[15]; Assert.AreSame(assessmentSection.GrassCoverSlipOffOutwards, grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent); + var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext) objects[16]; Assert.AreSame(assessmentSection.GrassCoverSlipOffInwards, grassCoverSlipOffInwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent); @@ -277,6 +278,17 @@ var technicalInnovationFailureMechanismContext = (FailureMechanismContext) objects[23]; Assert.AreSame(assessmentSection.TechnicalInnovation, technicalInnovationFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent); + + var assemblyResultCategoryTreeFolder = (CategoryTreeFolder) objects[24]; + Assert.AreEqual("Assemblage", assemblyResultCategoryTreeFolder.Name); + Assert.AreEqual(TreeFolderCategory.General, assemblyResultCategoryTreeFolder.Category); + Assert.AreEqual(2, assemblyResultCategoryTreeFolder.Contents.Count()); + + var assemblyResultTotalContext = (AssemblyResultTotalContext) assemblyResultCategoryTreeFolder.Contents.ElementAt(0); + Assert.AreSame(assessmentSection, assemblyResultTotalContext.WrappedData); + + var assemblyResultPerSectionContext = (AssemblyResultPerSectionContext) assemblyResultCategoryTreeFolder.Contents.ElementAt(1); + Assert.AreSame(assessmentSection, assemblyResultPerSectionContext.WrappedData); } }