Index: Core/Common/test/Core.Common.TestUtils/TestHelper.cs
===================================================================
diff -u -r7048e49c8495475c25ceb9deb35edd8a2addafca -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Core/Common/test/Core.Common.TestUtils/TestHelper.cs (.../TestHelper.cs) (revision 7048e49c8495475c25ceb9deb35edd8a2addafca)
+++ Core/Common/test/Core.Common.TestUtils/TestHelper.cs (.../TestHelper.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -307,18 +307,20 @@
/// The text expected for the menu item.
/// The tooltip expected for the menu item.
/// The image expected for the menu item.
+ /// Optional: the expected enabled state of the menu item. Default: true.
/// When does not contain a menu item at
/// position with the right , or .
///
- public static void AssertContextMenuStripContainsItem(ContextMenuStrip menu, int position, string text, string toolTip, Image icon)
+ public static void AssertContextMenuStripContainsItem(ContextMenuStrip menu, int position, string text, string toolTip, Image icon, bool enabled = true)
{
Assert.IsNotNull(menu);
- Assert.IsNotNull(menu.Items[position]);
+ Assert.Less(position, menu.Items.Count);
var item = menu.Items[position];
Assert.AreEqual(text, item.Text);
Assert.AreEqual(toolTip, item.ToolTipText);
+ Assert.AreEqual(enabled, item.Enabled);
AssertImagesAreEqual(icon, item.Image);
}
Index: Core/Common/test/Core.Common.Utils.Tests/Core.Common.Utils.Tests.csproj
===================================================================
diff -u -r3aa69a0ff858d591479a1b33ef1ad36ae76a5052 -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Core/Common/test/Core.Common.Utils.Tests/Core.Common.Utils.Tests.csproj (.../Core.Common.Utils.Tests.csproj) (revision 3aa69a0ff858d591479a1b33ef1ad36ae76a5052)
+++ Core/Common/test/Core.Common.Utils.Tests/Core.Common.Utils.Tests.csproj (.../Core.Common.Utils.Tests.csproj) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -124,10 +124,6 @@
-
- {CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB}
- Ringtoets.Piping.Data
-
{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}
Core.Common.Utils
Index: Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs
===================================================================
diff -u -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6 -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs (.../TestHelperTests.cs) (revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
+++ Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs (.../TestHelperTests.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -2,6 +2,7 @@
using System.Globalization;
using System.IO;
using System.Reflection;
+using System.Windows.Forms;
using Core.Common.TestUtils;
using Core.Common.Utils.IO;
using Core.Common.Utils.Tests.Properties;
@@ -162,5 +163,122 @@
// Assert
Assert.Throws(call);
}
+
+ [Test]
+ public void AssertContextMenuStripContainsItem_MenuNull_ThrowsAssertionException()
+ {
+ // Call
+ TestDelegate call = () => TestHelper.AssertContextMenuStripContainsItem(null, 0, "", "", null);
+
+ // Assert
+ Assert.Throws(call);
+ }
+
+ [Test]
+ public void AssertContextMenuStripContainsItem_NoMenuItemAtPosition_ThrowsAssertionException()
+ {
+ // Call
+ TestDelegate call = () => TestHelper.AssertContextMenuStripContainsItem(new ContextMenuStrip(), 0, "", "", null);
+
+ // Assert
+ Assert.Throws(call);
+ }
+
+ [Test]
+ public void AssertContextMenuStripContainsItem_MenuItemWithDifferentText_ThrowsAssertionException()
+ {
+ // Setup
+ var contextMenuStrip = new ContextMenuStrip();
+ var testItem = CreateContextMenuItem();
+ contextMenuStrip.Items.Add(testItem);
+
+ // Call
+ TestDelegate call = () =>
+ {
+ TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text + "someThing", testItem.ToolTipText, testItem.Image);
+ };
+
+ // Assert
+ Assert.Throws(call);
+ }
+
+ [Test]
+ public void AssertContextMenuStripContainsItem_MenuItemWithDifferentToolTip_ThrowsAssertionException()
+ {
+ // Setup
+ var contextMenuStrip = new ContextMenuStrip();
+ var testItem = CreateContextMenuItem();
+ contextMenuStrip.Items.Add(testItem);
+
+ // Call
+ TestDelegate call = () =>
+ {
+ TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText + "someThing", testItem.Image);
+ };
+
+ // Assert
+ Assert.Throws(call);
+ }
+
+ [Test]
+ public void AssertContextMenuStripContainsItem_MenuItemWithDifferentImage_ThrowsAssertionException()
+ {
+ // Setup
+ var contextMenuStrip = new ContextMenuStrip();
+ var testItem = CreateContextMenuItem();
+ contextMenuStrip.Items.Add(testItem);
+
+ // Call
+ TestDelegate call = () =>
+ {
+ TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, Resources.acorn);
+ };
+
+ // Assert
+ Assert.Throws(call);
+ }
+
+ [Test]
+ [TestCase(true)]
+ [TestCase(false)]
+ public void AssertContextMenuStripContainsItem_MenuItemWithDifferentEnabeldState_NoExceptions(bool enabled)
+ {
+ // Setup
+ var contextMenuStrip = new ContextMenuStrip();
+ var testItem = CreateContextMenuItem();
+ testItem.Enabled = enabled;
+ contextMenuStrip.Items.Add(testItem);
+
+ // Call
+ TestDelegate call = () =>
+ {
+ TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, testItem.Image, !enabled);
+ };
+
+ // Assert
+ Assert.Throws(call);
+ }
+
+ [Test]
+ public void AssertContextMenuStripContainsItem_SameMenuItemProperties_NoExceptions()
+ {
+ // Setup
+ var contextMenuStrip = new ContextMenuStrip();
+ var testItem = CreateContextMenuItem();
+ contextMenuStrip.Items.Add(testItem);
+
+ // Call & Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, testItem.Image);
+ }
+
+ private static ToolStripMenuItem CreateContextMenuItem()
+ {
+ return new ToolStripMenuItem
+ {
+ Text = @"aText",
+ ToolTipText = @"aToolTipText",
+ Image = Resources.abacus
+ };
+ }
}
}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.Designer.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.Designer.cs (.../ProjectTreeView.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.Designer.cs (.../ProjectTreeView.Designer.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -33,36 +33,36 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectTreeView));
this.contextMenuProject = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.buttonFolderAdd = new ClonableToolStripMenuItem();
- this.buttonFolderAddNewItem = new ClonableToolStripMenuItem();
+ this.buttonFolderAdd = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.buttonFolderAddNewItem = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.buttonFolderImportFolder = new ClonableToolStripMenuItem();
+ this.buttonFolderImportFolder = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
this.buttonFolderExportFolder = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
this.buttonFolderDelete = new System.Windows.Forms.ToolStripMenuItem();
this.buttonFolderRename = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.buttonFolderExpandAll = new ClonableToolStripMenuItem();
- this.buttonFolderCollapseAll = new ClonableToolStripMenuItem();
+ this.buttonFolderExpandAll = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
+ this.buttonFolderCollapseAll = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
- this.buttonFolderProperties = new ClonableToolStripMenuItem();
+ this.buttonFolderProperties = new Core.Common.Controls.Swf.ClonableToolStripMenuItem();
this.contextMenuProject.SuspendLayout();
this.SuspendLayout();
//
// contextMenuProject
//
this.contextMenuProject.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.buttonFolderAdd,
- this.toolStripSeparator4,
- this.buttonFolderImportFolder,
- this.buttonFolderExportFolder,
this.toolStripSeparator18,
this.buttonFolderDelete,
this.buttonFolderRename,
this.toolStripSeparator5,
this.buttonFolderExpandAll,
this.buttonFolderCollapseAll,
this.toolStripSeparator7,
+ this.buttonFolderImportFolder,
+ this.buttonFolderExportFolder,
+ this.toolStripSeparator4,
this.buttonFolderProperties});
this.contextMenuProject.Name = "contextMenuProject";
resources.ApplyResources(this.contextMenuProject, "contextMenuProject");
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.resx
===================================================================
diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.resx (.../ProjectTreeView.resx) (revision 67e117952bef2b1524aebb434c654c2c9be77dbd)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.resx (.../ProjectTreeView.resx) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -122,40 +122,25 @@
- 98, 22
+ 144, 22
Nieuw &Item...
- 152, 22
+ 158, 22
T&oevoegen
-
- 149, 6
-
-
- 152, 22
-
-
- I&mporteren...
-
-
- 152, 22
-
-
- E&xporteren...
-
- 149, 6
+ 155, 6
- 152, 22
+ 158, 22
&Verwijderen
@@ -164,37 +149,52 @@
- 152, 22
+ 158, 22
&Hernoemen
- 149, 6
+ 155, 6
- 152, 22
+ 158, 22
Alles &uitklappen
- 152, 22
+ 158, 22
Alles &inklappen
- 149, 6
+ 155, 6
+
+ 158, 22
+
+
+ I&mporteren...
+
+
+ 158, 22
+
+
+ E&xporteren...
+
+
+ 155, 6
+
- 152, 22
+ 158, 22
&Eigenschappen
- 153, 226
+ 159, 226
contextMenuProject
@@ -218,13 +218,13 @@
buttonFolderAdd
- Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.938, Culture=neutral, PublicKeyToken=null
buttonFolderAddNewItem
- Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.938, Culture=neutral, PublicKeyToken=null
toolStripSeparator4
@@ -236,7 +236,7 @@
buttonFolderImportFolder
- Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.938, Culture=neutral, PublicKeyToken=null
buttonFolderExportFolder
@@ -272,13 +272,13 @@
buttonFolderExpandAll
- Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.938, Culture=neutral, PublicKeyToken=null
buttonFolderCollapseAll
- Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.938, Culture=neutral, PublicKeyToken=null
toolStripSeparator7
@@ -290,192 +290,12 @@
buttonFolderProperties
- Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null
+ Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.938, Culture=neutral, PublicKeyToken=null
ProjectTreeView
System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- &Nieuw Model toevoegen...
-
-
- Modeluitvoer wissen
-
-
- Alles &inklappen
-
-
- CTRL + C
-
-
- &Kopiëren
-
-
- CTRL + X
-
-
- &Knippen
-
-
- &Verwijderen
-
-
- Alles &Uitklappen
-
-
- E&xporteren...
-
-
- I&mporteren...
-
-
- &Open
-
-
- Open &met
-
-
- CTRL + V
-
-
- &Plakken
-
-
- &Eigenschappen
-
-
- &Hernoemen
-
-
- &Model berekenen
-
-
- &Stop berekenen model
-
-
- &Kopiëren
-
-
- &Knippen
-
-
- &Verwijderen
-
-
- E&xporteren...
-
-
- I&mporteren...
-
-
- E&xporteren...
-
-
- I&mporteren...
-
-
- &Koppelen
-
-
- &Open
-
-
- Openen &met...
-
-
- Plakken
-
-
- &Eigenschappen
-
-
- &Hernoemen
-
-
- &Ontkoppelen
-
-
- Nieuwe &Folder
-
-
- &Nieuw Model...
-
-
- Alle modeluitvoer wissen
-
-
- CTRL + C
-
-
- &Kopiëren
-
-
- CTRL + X
-
-
- &Knippen
-
-
- CTRL + V
-
-
- Plakken
-
-
- &Alle modellen berekenen
-
-
- &Stop berekenen van alle modellen
-
-
- Modeluitvoer wissen
-
-
- Alles &inklappen
-
-
- &Kopiëren
-
-
- &Knippen
-
-
- &Verwijderen
-
-
- Alles &uitklappen
-
-
- &Open
-
-
- Openen &met...
-
-
- &Eigenschappen
-
-
- &Hernoemen
-
-
- &Model berekenen
-
-
- &Stop berekenen model
-
-
- Koppelen
-
-
- Ontkoppelen
-
-
- E&xporteren...
-
-
- I&mporteren...
-
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismNodePresenter.cs
===================================================================
diff -u -rfc37d02640f08334ab1ddce79ceca36c2f0cff17 -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismNodePresenter.cs (.../FailureMechanismNodePresenter.cs) (revision fc37d02640f08334ab1ddce79ceca36c2f0cff17)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismNodePresenter.cs (.../FailureMechanismNodePresenter.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -43,11 +43,11 @@
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.Calculate_all,
RingtoetsCommonFormsResources.Calculate_all_ToolTip,
- RingtoetsCommonFormsResources.CalculateAllIcon, null);
+ RingtoetsCommonFormsResources.CalculateAllIcon, null).Enabled = false;
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.Clear_all_output,
RingtoetsCommonFormsResources.Clear_all_output_ToolTip,
- RingtoetsCommonFormsResources.ClearIcon, null);
+ RingtoetsCommonFormsResources.ClearIcon, null).Enabled = false;
contextMenu.AddSeperator();
contextMenu.AddMenuItem(
@@ -63,7 +63,7 @@
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.FailureMechanism_Export,
RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip,
- RingtoetsCommonFormsResources.ExportIcon, null);
+ RingtoetsCommonFormsResources.ExportIcon, null).Enabled = false;
contextMenu.AddSeperator();
contextMenu.AddMenuItem(
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/PlaceholderWithReadonlyNameNodePresenter.cs
===================================================================
diff -u -rfc37d02640f08334ab1ddce79ceca36c2f0cff17 -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/PlaceholderWithReadonlyNameNodePresenter.cs (.../PlaceholderWithReadonlyNameNodePresenter.cs) (revision fc37d02640f08334ab1ddce79ceca36c2f0cff17)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/PlaceholderWithReadonlyNameNodePresenter.cs (.../PlaceholderWithReadonlyNameNodePresenter.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -49,13 +49,13 @@
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open,
RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open_ToolTip,
- RingtoetsCommonFormsResources.OpenIcon, null);
+ RingtoetsCommonFormsResources.OpenIcon, null).Enabled = false;
contextMenu.AddSeperator();
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase,
RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip,
- RingtoetsCommonFormsResources.ClearIcon, null);
+ RingtoetsCommonFormsResources.ClearIcon, null).Enabled = false;
contextMenu.AddSeperator();
}
@@ -64,15 +64,15 @@
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Import,
RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Import_ToolTip,
- RingtoetsCommonFormsResources.ImportIcon, null);
+ RingtoetsCommonFormsResources.ImportIcon, null).Enabled = false;
}
if (nodeData is InputPlaceholder || nodeData is OutputPlaceholder)
{
contextMenu.AddMenuItem(
RingtoetsCommonFormsResources.FailureMechanism_Export,
RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip,
- RingtoetsCommonFormsResources.ExportIcon, null);
+ RingtoetsCommonFormsResources.ExportIcon, null).Enabled = false;
contextMenu.AddSeperator();
contextMenu.AddMenuItem(
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs
===================================================================
diff -u -rfc37d02640f08334ab1ddce79ceca36c2f0cff17 -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs (.../FailureMechanismNodePresenterTest.cs) (revision fc37d02640f08334ab1ddce79ceca36c2f0cff17)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs (.../FailureMechanismNodePresenterTest.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -138,11 +138,11 @@
// Assert
Assert.AreEqual(9, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 1, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon, false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 1, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon, false);
TestHelper.AssertContextMenuStripContainsItem(menu, 3, RingtoetsCommonFormsResources.FailureMechanism_Expand_all, RingtoetsCommonFormsResources.FailureMechanism_Expand_all_ToolTip, RingtoetsCommonFormsResources.ExpandAllIcon);
TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.FailureMechanism_Collapse_all, RingtoetsCommonFormsResources.FailureMechanism_Collapse_all_ToolTip, RingtoetsCommonFormsResources.CollapseAllIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon, false);
TestHelper.AssertContextMenuStripContainsItem(menu, 8, RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon);
CollectionAssert.AllItemsAreInstancesOfType(new []{menu.Items[2], menu.Items[5],menu.Items[7]}, typeof(ToolStripSeparator));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/PlaceholderWithReadonlyNameNodePresenterTest.cs
===================================================================
diff -u -rfc37d02640f08334ab1ddce79ceca36c2f0cff17 -r7299ddaaafe53e58adef80f0e05a0576f66e1edf
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/PlaceholderWithReadonlyNameNodePresenterTest.cs (.../PlaceholderWithReadonlyNameNodePresenterTest.cs) (revision fc37d02640f08334ab1ddce79ceca36c2f0cff17)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/PlaceholderWithReadonlyNameNodePresenterTest.cs (.../PlaceholderWithReadonlyNameNodePresenterTest.cs) (revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
@@ -185,10 +185,10 @@
// Assert
Assert.AreEqual(8, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open_ToolTip, RingtoetsCommonFormsResources.OpenIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip, RingtoetsCommonFormsResources.ClearIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Import, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Import_ToolTip, RingtoetsCommonFormsResources.ImportIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open_ToolTip, RingtoetsCommonFormsResources.OpenIcon, false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip, RingtoetsCommonFormsResources.ClearIcon, false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Import, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Import_ToolTip, RingtoetsCommonFormsResources.ImportIcon, false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon, false);
TestHelper.AssertContextMenuStripContainsItem(menu, 7, RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon);
CollectionAssert.AllItemsAreInstancesOfType(new[] { menu.Items[1], menu.Items[3], menu.Items[6] }, typeof(ToolStripSeparator));
@@ -210,9 +210,9 @@
// Assert
Assert.AreEqual(7, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open_ToolTip, RingtoetsCommonFormsResources.OpenIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip, RingtoetsCommonFormsResources.ClearIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open_ToolTip, RingtoetsCommonFormsResources.OpenIcon, false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase, RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip, RingtoetsCommonFormsResources.ClearIcon, false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon, false);
TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon);
CollectionAssert.AllItemsAreInstancesOfType(new[] { menu.Items[1], menu.Items[3], menu.Items[5] }, typeof(ToolStripSeparator));