Index: Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs =================================================================== diff -u -r5bdfe106fefb36f7e677da7e75afec1eba7eedd3 -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs (.../ContextMenuBuilder.cs) (revision 5bdfe106fefb36f7e677da7e75afec1eba7eedd3) +++ Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs (.../ContextMenuBuilder.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -35,6 +35,16 @@ } /// + /// Adds an item to the , which deletes the . + /// + /// The itself, so that operations can be easily chained. + public ContextMenuBuilder AddDeleteItem() + { + AddItem(treeViewItemsFactory.CreateDeleteItem()); + return this; + } + + /// /// Adds an item to the , which expands the . /// /// The itself, so that operations can be easily chained. Index: Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs =================================================================== diff -u -r97989f272e0b9aadccf3a444a90e61879616a0ab -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs (.../TreeViewContextMenuItemFactory.cs) (revision 97989f272e0b9aadccf3a444a90e61879616a0ab) +++ Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs (.../TreeViewContextMenuItemFactory.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -59,5 +59,21 @@ toolStripMenuItem.Click += (s, e) => treeNode.TreeView.CollapseAll(treeNode); return toolStripMenuItem; } + + /// + /// Creates a which is bound to the action of deleting + /// the current . + /// + /// The created . + public ToolStripItem CreateDeleteItem() + { + var toolStripMenuItem = new ToolStripMenuItem(Resources.Delete) + { + ToolTipText = Resources.Delete_ToolTip, + Image = Resources.DeleteIcon + }; + toolStripMenuItem.Click += (s, e) => treeNode.TreeView.TryDeleteSelectedNodeData(); + return toolStripMenuItem; + } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -r66c1d9f2620a134d459aca4d428b48b62ddbae23 -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 66c1d9f2620a134d459aca4d428b48b62ddbae23) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -455,7 +455,6 @@ - Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r46a0af591207211cdc9949098422b9ce9e87c0ac -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18063 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -707,21 +707,29 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Looks up a localized string similar to Verwij&deren. /// - public static System.Drawing.Bitmap delete { + public static string Delete { get { - object obj = ResourceManager.GetObject("delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ResourceManager.GetString("Delete", resourceCulture); } } /// + /// Looks up a localized string similar to Verwijder de knoop uit de boom.. + /// + public static string Delete_ToolTip { + get { + return ResourceManager.GetString("Delete_ToolTip", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap DeleteHS { + public static System.Drawing.Bitmap DeleteIcon { get { - object obj = ResourceManager.GetObject("DeleteHS", resourceCulture); + object obj = ResourceManager.GetObject("DeleteIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -2388,6 +2396,15 @@ } /// + /// Looks up a localized string similar to . + /// + public static string String1 { + get { + return ResourceManager.GetString("String1", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Grafiek. /// public static string ToolWindow_Name_Chart { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r46a0af591207211cdc9949098422b9ce9e87c0ac -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -182,9 +182,6 @@ ..\Resources\brick_active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ../Resources/edit-undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -323,7 +320,7 @@ Project kan niet worden geopend. - + ../Resources/DeleteHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -890,4 +887,13 @@ ..\Resources\arrow-000-medium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Verwij&deren + + + Verwijder de knoop uit de boom. + + + + \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Resources/delete.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a Binary files differ Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs =================================================================== diff -u -r5bdfe106fefb36f7e677da7e75afec1eba7eedd3 -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 5bdfe106fefb36f7e677da7e75afec1eba7eedd3) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -67,6 +67,22 @@ } [Test] + public void AddDeleteItem_WhenBuild_ItemAddedToContextMenu() + { + // Setup + var builder = new ContextMenuBuilder(null, MockRepository.GenerateMock()); + + // Call + var result = builder.AddDeleteItem().Build(); + + // Assert + Assert.IsInstanceOf(result); + Assert.AreEqual(1, result.Items.Count); + + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Delete, Resources.Delete_ToolTip, Resources.DeleteIcon); + } + + [Test] public void AddExpandAllItem_WhenBuild_ItemAddedToContextMenu() { // Setup @@ -79,10 +95,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - var expandAllItem = result.Items[0]; - Assert.AreEqual(Resources.Expand_all, expandAllItem.Text); - Assert.AreEqual(Resources.Expand_all_ToolTip, expandAllItem.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.ExpandAllIcon, expandAllItem.Image); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Expand_all, Resources.Expand_all_ToolTip, Resources.ExpandAllIcon); } [Test] @@ -98,10 +111,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - var collapseAll = result.Items[0]; - Assert.AreEqual(Resources.Collapse_all, collapseAll.Text); - Assert.AreEqual(Resources.Collapse_all_ToolTip, collapseAll.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.CollapseAllIcon, collapseAll.Image); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Collapse_all, Resources.Collapse_all_ToolTip, Resources.CollapseAllIcon); } [Test] @@ -119,11 +129,13 @@ } [Test] - public void AddOpenItem_WithGuiWhenBuild_ItemAddedToContextMenu() + [TestCase(true)] + [TestCase(false)] + public void AddOpenItem_WithGuiWhenBuild_ItemAddedToContextMenu(bool enabled) { // Setup var commandHandlerMock = mocks.StrictMock(); - commandHandlerMock.Expect(ch => ch.CanOpenDefaultViewForSelection()).Return(true); + commandHandlerMock.Expect(ch => ch.CanOpenDefaultViewForSelection()).Return(enabled); var builder = new ContextMenuBuilder(commandHandlerMock, MockRepository.GenerateMock()); mocks.ReplayAll(); @@ -135,10 +147,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - var export = result.Items[0]; - Assert.AreEqual(Resources.Open, export.Text); - Assert.AreEqual(Resources.Open_ToolTip, export.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.OpenIcon, export.Image); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Open, Resources.Open_ToolTip, Resources.OpenIcon, enabled); mocks.VerifyAll(); } @@ -155,14 +164,16 @@ // Assert Assert.IsInstanceOf(result); Assert.IsEmpty(result.Items); - } + } [Test] - public void AddExportItem_WithGuiWhenBuild_ItemAddedToContextMenu() + [TestCase(true)] + [TestCase(false)] + public void AddExportItem_WithGuiWhenBuild_ItemAddedToContextMenu(bool enabled) { // Setup var commandHandlerMock = mocks.StrictMock(); - commandHandlerMock.Expect(ch => ch.CanExportFromGuiSelection()).Return(true); + commandHandlerMock.Expect(ch => ch.CanExportFromGuiSelection()).Return(enabled); var builder = new ContextMenuBuilder(commandHandlerMock, MockRepository.GenerateMock()); mocks.ReplayAll(); @@ -174,10 +185,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - var export = result.Items[0]; - Assert.AreEqual(Resources.Export, export.Text); - Assert.AreEqual(Resources.Export_ToolTip, export.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.ExportIcon, export.Image); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Export, Resources.Export_ToolTip, Resources.ExportIcon, enabled); mocks.VerifyAll(); } @@ -194,14 +202,16 @@ // Assert Assert.IsInstanceOf(result); Assert.IsEmpty(result.Items); - } + } [Test] - public void AddImportItem_WithGuiWhenBuild_ItemAddedToContextMenu() + [TestCase(true)] + [TestCase(false)] + public void AddImportItem_WithGuiWhenBuild_ItemAddedToContextMenu(bool enabled) { // Setup var commandHandlerMock = mocks.StrictMock(); - commandHandlerMock.Expect(ch => ch.CanImportToGuiSelection()).Return(true); + commandHandlerMock.Expect(ch => ch.CanImportToGuiSelection()).Return(enabled); var builder = new ContextMenuBuilder(commandHandlerMock, MockRepository.GenerateMock()); mocks.ReplayAll(); @@ -213,10 +223,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - var import = result.Items[0]; - Assert.AreEqual(Resources.Import, import.Text); - Assert.AreEqual(Resources.Import_ToolTip, import.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.ImportIcon, import.Image); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Import, Resources.Import_ToolTip, Resources.ImportIcon, enabled); mocks.VerifyAll(); } @@ -236,11 +243,13 @@ } [Test] - public void AddPropertiesItem_WithGuiWhenBuild_ItemAddedToContextMenu() + [TestCase(true)] + [TestCase(false)] + public void AddPropertiesItem_WithGuiWhenBuild_ItemAddedToContextMenu(bool enabled) { // Setup var commandHandlerMock = mocks.StrictMock(); - commandHandlerMock.Expect(ch => ch.CanShowPropertiesForGuiSelection()).Return(true); + commandHandlerMock.Expect(ch => ch.CanShowPropertiesForGuiSelection()).Return(enabled); var builder = new ContextMenuBuilder(commandHandlerMock, MockRepository.GenerateMock()); mocks.ReplayAll(); @@ -252,10 +261,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - var properties = result.Items[0]; - Assert.AreEqual(Resources.Properties, properties.Text); - Assert.AreEqual(Resources.Properties_ToolTip, properties.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.PropertiesIcon, properties.Image); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Properties, Resources.Properties_ToolTip, Resources.PropertiesIcon, enabled); mocks.VerifyAll(); } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/NodePresenters/ProjectNodePresenter.cs =================================================================== diff -u -r8a7fedc540b20939054fb148247f213a7b013916 -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Core/Plugins/src/Core.Plugins.ProjectExplorer/NodePresenters/ProjectNodePresenter.cs (.../ProjectNodePresenter.cs) (revision 8a7fedc540b20939054fb148247f213a7b013916) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/NodePresenters/ProjectNodePresenter.cs (.../ProjectNodePresenter.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -56,8 +56,8 @@ .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() - .AddExportItem() .AddImportItem() + .AddExportItem() .AddSeparator() .AddPropertiesItem() .Build(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs =================================================================== diff -u -rb1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs (.../AssessmentSectionBaseNodePresenter.cs) (revision b1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs (.../AssessmentSectionBaseNodePresenter.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -77,6 +77,8 @@ } return ContextMenuBuilderProvider .Get(sender) + .AddDeleteItem() + .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs =================================================================== diff -u -rb1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs (.../AssessmentSectionBaseNodePresenterTest.cs) (revision b1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs (.../AssessmentSectionBaseNodePresenterTest.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -408,16 +408,18 @@ var contextMenu = nodePresenter.GetContextMenu(nodeMock, new DikeAssessmentSection()); // Assert - Assert.AreEqual(7, contextMenu.Items.Count); + Assert.AreEqual(9, contextMenu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 4, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 6, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, CoreCommonGuiResources.Delete, CoreCommonGuiResources.Delete_ToolTip, CoreCommonGuiResources.DeleteIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 5, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 6, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 8, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesIcon); - Assert.IsInstanceOf(contextMenu.Items[2]); - Assert.IsInstanceOf(contextMenu.Items[5]); + Assert.IsInstanceOf(contextMenu.Items[1]); + Assert.IsInstanceOf(contextMenu.Items[4]); + Assert.IsInstanceOf(contextMenu.Items[7]); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs =================================================================== diff -u -r6917dbadda57c0b4b3e4f679e229585b584c8579 -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (.../PipingCalculationContextNodePresenter.cs) (revision 6917dbadda57c0b4b3e4f679e229585b584c8579) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (.../PipingCalculationContextNodePresenter.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -144,6 +144,8 @@ .AddCustomItem(calculateItem) .AddCustomItem(clearOutputItem) .AddSeparator() + .AddDeleteItem() + .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs =================================================================== diff -u -rb459e67e645683509bed0eb854c2157e1ca12bba -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a) @@ -30,11 +30,12 @@ private const int contextMenuValidateIndex = 0; private const int contextMenuCalculateIndex = 1; private const int contextMenuClearIndex = 2; - private const int contextMenuExpandIndex = 4; - private const int contextMenuCollapseIndex = 5; - private const int contextMenuImportIndex = 7; - private const int contextMenuExportIndex = 8; - private const int contextMenuPropertiesIndex = 10; + private const int contextMenuDeleteIndex = 4; + private const int contextMenuExpandIndex = 6; + private const int contextMenuCollapseIndex = 7; + private const int contextMenuImportIndex = 9; + private const int contextMenuExportIndex = 10; + private const int contextMenuPropertiesIndex = 12; [SetUp] public void SetUp() @@ -355,19 +356,22 @@ // Assert Assert.IsNotNull(contextMenu); - Assert.AreEqual(11, contextMenu.Items.Count); + Assert.AreEqual(13, contextMenu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, PipingFormsResources.Validate, null, PipingFormsResources.ValidationIcon); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, PipingFormsResources.Calculate, null, PipingFormsResources.Play); + + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuDeleteIndex, CoreCommonGuiResources.Delete, CoreCommonGuiResources.Delete_ToolTip, CoreCommonGuiResources.DeleteIcon); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuExpandIndex, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCollapseIndex, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuImportIndex, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, commonItemsEnabled); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuExportIndex, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, commonItemsEnabled); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuPropertiesIndex, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesIcon, commonItemsEnabled); Assert.IsInstanceOf(contextMenu.Items[3]); - Assert.IsInstanceOf(contextMenu.Items[6]); - Assert.IsInstanceOf(contextMenu.Items[9]); + Assert.IsInstanceOf(contextMenu.Items[5]); + Assert.IsInstanceOf(contextMenu.Items[8]); + Assert.IsInstanceOf(contextMenu.Items[11]); mockRepository.VerifyAll(); } @@ -419,7 +423,7 @@ // Assert Assert.IsNotNull(contextMenu); - Assert.AreEqual(11, contextMenu.Items.Count); + Assert.AreEqual(13, contextMenu.Items.Count); ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; Assert.IsFalse(clearOutputItem.Enabled); @@ -453,7 +457,7 @@ // Assert Assert.IsNotNull(contextMenu); - Assert.AreEqual(11, contextMenu.Items.Count); + Assert.AreEqual(13, contextMenu.Items.Count); ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; Assert.IsTrue(clearOutputItem.Enabled);