Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r2fb856472ed92ee1b51ff65cdb57e1ac751b85a5 -r3b65372a8a5857f063459b759650cb5c76dca16b --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 2fb856472ed92ee1b51ff65cdb57e1ac751b85a5) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 3b65372a8a5857f063459b759650cb5c76dca16b) @@ -258,7 +258,6 @@ assessmentSection); var menuBuilder = mocks.StrictMock(); - using (mocks.Ordered()) { menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder); @@ -301,7 +300,6 @@ var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = mocks.StrictMock(); - using (mocks.Ordered()) { menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -r3b65372a8a5857f063459b759650cb5c76dca16b --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 9383ddebb862ad6d2e18939d544c3710745a7e3f) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 3b65372a8a5857f063459b759650cb5c76dca16b) @@ -267,8 +267,8 @@ .AddSeparator() .AddToggleRelevancyOfFailureMechanismItem(failureMechanismContext, RemoveAllViewsForItem) .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build(); @@ -287,8 +287,8 @@ return builder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContext, RemoveAllViewsForItem) .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .Build(); } @@ -337,39 +337,40 @@ StrictContextMenuItem generateCalculationsItem = CreateGenerateWaveConditionsCalculationsItem(nodeData); - if (!isNestedGroup) - { - builder.AddCustomItem(generateCalculationsItem); - } - builder.AddExportItem() - .AddSeparator() - .AddCreateCalculationGroupItem(group) - .AddCreateCalculationItem(nodeData, AddWaveConditionsCalculation); + .AddSeparator(); if (!isNestedGroup) { - builder.AddSeparator() - .AddRemoveAllChildrenItem(); + builder.AddCustomItem(generateCalculationsItem) + .AddSeparator(); } - builder.AddSeparator() + builder.AddCreateCalculationGroupItem(group) + .AddCreateCalculationItem(nodeData, AddWaveConditionsCalculation) + .AddSeparator() + .AddRenameItem() .AddValidateAllCalculationsInGroupItem(nodeData, ValidateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup) .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup) - .AddClearAllCalculationOutputInGroupItem(group) - .AddSeparator(); + .AddSeparator() + .AddClearAllCalculationOutputInGroupItem(group); + if (!isNestedGroup) + { + builder.AddRemoveAllChildrenItem() + .AddSeparator(); + } + if (isNestedGroup) { - builder.AddRenameItem() - .AddDeleteItem() + builder.AddDeleteItem() .AddSeparator(); } - return builder.AddExpandAllItem() - .AddCollapseAllItem() + return builder.AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build(); @@ -526,17 +527,17 @@ return builder.AddExportItem() .AddSeparator() + .AddRenameItem() .AddValidateCalculationItem(nodeData, Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation, ValidateAllDataAvailableAndGetErrorMessageForCalculation) - .AddClearCalculationOutputItem(calculation) .AddSeparator() - .AddRenameItem() + .AddClearCalculationOutputItem(calculation) .AddDeleteItem() .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6 -r3b65372a8a5857f063459b759650cb5c76dca16b --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 3b65372a8a5857f063459b759650cb5c76dca16b) @@ -278,15 +278,18 @@ assessmentSection); var menuBuilder = mocks.StrictMock(); - 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.AddExpandAllItem()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.Build()).Return(null); + using (mocks.Ordered()) + { + 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.AddCollapseAllItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.Build()).Return(null); + } var gui = mocks.StrictMock(); gui.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); @@ -322,11 +325,14 @@ var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = mocks.StrictMock(); - menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.Build()).Return(null); + using (mocks.Ordered()) + { + menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.Build()).Return(null); + } var gui = mocks.StrictMock(); gui.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r3b65372a8a5857f063459b759650cb5c76dca16b --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 2d006ceaaef282af15090fe5505ffeca58a291e0) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 3b65372a8a5857f063459b759650cb5c76dca16b) @@ -53,9 +53,10 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest { - private const int validateMenuItemIndex = 2; - private const int clearOutputMenuItemIndex = 4; - private const int calculateMenuItemIndex = 3; + private const int validateMenuItemIndex = 3; + private const int calculateMenuItemIndex = 4; + private const int clearOutputMenuItemIndex = 6; + private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private TreeNodeInfo info; @@ -417,21 +418,25 @@ assessmentSection); var menuBuilderMock = mocks.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); + using (mocks.Ordered()) + { + menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + } + using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -r3b65372a8a5857f063459b759650cb5c76dca16b --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2d006ceaaef282af15090fe5505ffeca58a291e0) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 3b65372a8a5857f063459b759650cb5c76dca16b) @@ -54,23 +54,24 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuAddCalculationGroupIndexRootGroup = 3; - private const int contextMenuAddCalculationIndexRootGroup = 4; - private const int contextMenuRemoveAllChildrenIndexRootGroup = 6; + private const int contextMenuAddGenerateCalculationsIndex = 2; + private const int contextMenuAddCalculationGroupIndexRootGroup = 4; + private const int contextMenuAddCalculationIndexRootGroup = 5; private const int contextMenuValidateAllIndexRootGroup = 8; private const int contextMenuCalculateAllIndexRootGroup = 9; - private const int contextMenuClearOutputIndexRootGroup = 10; - private const int contextMenuExpandAllIndexRootGroup = 12; - private const int contextMenuCollapseAllIndexRootGroup = 13; - private const int contextMenuPropertiesIndexRootGroup = 15; + private const int contextMenuClearOutputIndexRootGroup = 11; + private const int contextMenuRemoveAllChildrenIndexRootGroup = 12; + private const int contextMenuCollapseAllIndexRootGroup = 14; + private const int contextMenuExpandAllIndexRootGroup = 15; + private const int contextMenuPropertiesIndexRootGroup = 17; - private const int contextMenuAddGenerateCalculationsIndex = 0; private const int contextMenuAddCalculationGroupIndexNestedGroup = 2; private const int contextMenuAddCalculationIndexNestedGroup = 3; - private const int contextMenuValidateAllIndexNestedGroup = 5; - private const int contextMenuCalculateAllIndexNestedGroup = 6; - private const int contextMenuClearOutputNestedGroupIndex = 7; + private const int contextMenuValidateAllIndexNestedGroup = 6; + private const int contextMenuCalculateAllIndexNestedGroup = 7; + private const int contextMenuClearOutputIndexNestedGroup = 9; + private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private TreeNodeInfo info; @@ -266,13 +267,13 @@ "Er zijn geen berekeningen om uit te voeren.", RingtoetsCommonFormsResources.CalculateAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputNestedGroupIndex, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndexNestedGroup, "&Wis alle uitvoer...", "Er zijn geen berekeningen met uitvoer om te wissen.", RingtoetsCommonFormsResources.ClearIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 9, + TestHelper.AssertContextMenuStripContainsItem(menu, 5, "&Hernoemen", "Wijzig de naam van dit element.", CoreCommonGuiResources.RenameIcon); @@ -282,15 +283,15 @@ CoreCommonGuiResources.DeleteIcon); TestHelper.AssertContextMenuStripContainsItem(menu, 12, - "Alles ui&tklappen", - "Klap dit element en alle onderliggende elementen uit.", - CoreCommonGuiResources.ExpandAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, 13, "Alles i&nklappen", "Klap dit element en alle onderliggende elementen in.", CoreCommonGuiResources.CollapseAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 13, + "Alles ui&tklappen", + "Klap dit element en alle onderliggende elementen uit.", + CoreCommonGuiResources.ExpandAllIcon, + false); TestHelper.AssertContextMenuStripContainsItem(menu, 15, "Ei&genschappen", @@ -346,7 +347,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { // Assert - Assert.AreEqual(16, menu.Items.Count); + Assert.AreEqual(18, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddGenerateCalculationsIndex, "Genereer &berekeningen...", "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de randvoorwaardenberekeningen te genereren.", @@ -379,28 +380,29 @@ "Er zijn geen berekeningen met uitvoer om te wissen.", RingtoetsCommonFormsResources.ClearIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExpandAllIndexRootGroup, - "Alles ui&tklappen", - "Klap dit element en alle onderliggende elementen uit.", - CoreCommonGuiResources.ExpandAllIcon, - false); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCollapseAllIndexRootGroup, "Alles i&nklappen", "Klap dit element en alle onderliggende elementen in.", CoreCommonGuiResources.CollapseAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExpandAllIndexRootGroup, + "Alles ui&tklappen", + "Klap dit element en alle onderliggende elementen uit.", + CoreCommonGuiResources.ExpandAllIcon, + false); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuPropertiesIndexRootGroup, "Ei&genschappen", "Toon de eigenschappen in het Eigenschappenpaneel.", CoreCommonGuiResources.PropertiesHS, false); CollectionAssert.AllItemsAreInstancesOfType(new[] { - menu.Items[2], - menu.Items[5], - menu.Items[7], - menu.Items[11], - menu.Items[14] + menu.Items[1], + menu.Items[3], + menu.Items[6], + menu.Items[10], + menu.Items[13], + menu.Items[16] }, typeof(ToolStripSeparator)); } } @@ -449,7 +451,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { // Assert - Assert.AreEqual(16, menu.Items.Count); + Assert.AreEqual(18, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddGenerateCalculationsIndex, "Genereer &berekeningen...", "Genereer randvoorwaardenberekeningen.", @@ -500,11 +502,12 @@ false); CollectionAssert.AllItemsAreInstancesOfType(new[] { - menu.Items[2], - menu.Items[5], - menu.Items[7], - menu.Items[11], - menu.Items[14] + menu.Items[1], + menu.Items[3], + menu.Items[6], + menu.Items[10], + menu.Items[13], + menu.Items[16] }, typeof(ToolStripSeparator)); } } @@ -831,7 +834,7 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { // Call - var clearAllOutputItem = contextMenu.Items[5]; + var clearAllOutputItem = contextMenu.Items[contextMenuClearOutputIndexNestedGroup]; // Assert Assert.IsFalse(clearAllOutputItem.Enabled); @@ -881,7 +884,7 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { // Call - var clearAllOutputItem = contextMenu.Items[contextMenuClearOutputNestedGroupIndex]; + var clearAllOutputItem = contextMenu.Items[contextMenuClearOutputIndexNestedGroup]; // Assert Assert.IsFalse(clearAllOutputItem.Enabled); @@ -958,7 +961,7 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { // Call - contextMenu.Items[contextMenuClearOutputNestedGroupIndex].PerformClick(); + contextMenu.Items[contextMenuClearOutputIndexNestedGroup].PerformClick(); // Assert if (confirm)