Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r6c9f224492d0b35e5d2dedb46de8171d9b1e4db1 -r58f765c1ee18e8debf7c6d3382485650ce67ff78 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 6c9f224492d0b35e5d2dedb46de8171d9b1e4db1) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 58f765c1ee18e8debf7c6d3382485650ce67ff78) @@ -547,8 +547,6 @@ return builder .AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) - .AddSeparator() .AddValidateAllCalculationsInFailureMechanismItem( context, ValidateAllInFailureMechanism, @@ -570,11 +568,6 @@ .Build(); } - private void RemoveAllViewsForItem(GrassCoverErosionInwardsCalculationsContext context) - { - Gui.ViewCommands.RemoveAllViewsForItem(context); - } - private static string EnableValidateAndCalculateMenuItemForFailureMechanism(GrassCoverErosionInwardsCalculationsContext context) { return EnableValidateAndCalculateMenuItem(context.Parent); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r6c9f224492d0b35e5d2dedb46de8171d9b1e4db1 -r58f765c1ee18e8debf7c6d3382485650ce67ff78 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 6c9f224492d0b35e5d2dedb46de8171d9b1e4db1) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 58f765c1ee18e8debf7c6d3382485650ce67ff78) @@ -28,7 +28,6 @@ using Core.Common.Controls.TreeView; using Core.Common.TestUtil; using Core.Gui; -using Core.Gui.Commands; using Core.Gui.ContextMenu; using Core.Gui.Forms.MainWindow; using Core.Gui.TestUtil.ContextMenu; @@ -58,14 +57,11 @@ [TestFixture] public class GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuRelevancyIndexWhenRelevant = 2; - private const int contextMenuRelevancyIndexWhenNotRelevant = 0; + private const int contextMenuValidateAllIndex = 2; + private const int contextMenuCalculateAllIndex = 3; + private const int contextMenuClearAllIndex = 5; + private const int contextMenuClearIllustrationPointsIndex = 6; - private const int contextMenuValidateAllIndex = 4; - private const int contextMenuCalculateAllIndex = 5; - private const int contextMenuClearAllIndex = 7; - private const int contextMenuClearIllustrationPointsIndex = 8; - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)); private MockRepository mocksRepository; @@ -180,9 +176,7 @@ menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder); menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); @@ -235,13 +229,8 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(context, assessmentSection, treeView)) { // Assert - Assert.AreEqual(14, menu.Items.Count); + Assert.AreEqual(12, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, - "I&s relevant", - "Geeft aan of dit toetsspoor relevant is of niet.", - RiskeerCommonFormsResources.Checkbox_ticked); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, "Alles &valideren", "Er zijn geen berekeningen om te valideren.",