Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -rbb80820ff4a4e09793da242cb7b36ca2bce59c32 -rb7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision bb80820ff4a4e09793da242cb7b36ca2bce59c32) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision b7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688) @@ -263,8 +263,8 @@ .AddSeparator() .AddToggleRelevancyOfFailureMechanismItem(failureMechanismContext, RemoveAllViewsForItem) .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build(); @@ -283,8 +283,8 @@ return builder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContext, RemoveAllViewsForItem) .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .Build(); } @@ -330,39 +330,40 @@ var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); var isNestedGroup = parentData is StabilityStoneCoverWaveConditionsCalculationGroupContext; - if (!isNestedGroup) - { - builder.AddCustomItem(CreateGenerateWaveConditionsCalculationsItem(nodeData)); - } - builder.AddExportItem() - .AddSeparator() - .AddCreateCalculationGroupItem(group) - .AddCreateCalculationItem(nodeData, AddWaveConditionsCalculation); + .AddSeparator(); if (!isNestedGroup) { - builder.AddSeparator() - .AddRemoveAllChildrenItem(); + builder.AddCustomItem(CreateGenerateWaveConditionsCalculationsItem(nodeData)) + .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(); @@ -520,17 +521,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/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 2d006ceaaef282af15090fe5505ffeca58a291e0) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision b7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688) @@ -256,15 +256,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); @@ -295,11 +298,14 @@ var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(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/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 2d006ceaaef282af15090fe5505ffeca58a291e0) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision b7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688) @@ -52,9 +52,9 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest { - private const int validateMenuItemIndex = 2; - private const int calculateMenuItemIndex = 3; - private const int clearOutputMenuItemIndex = 4; + private const int validateMenuItemIndex = 3; + private const int calculateMenuItemIndex = 4; + private const int clearOutputMenuItemIndex = 6; private MockRepository mocks; private StabilityStoneCoverPlugin plugin; @@ -423,20 +423,23 @@ 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()) { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -rb7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2d006ceaaef282af15090fe5505ffeca58a291e0) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision b7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688) @@ -54,22 +54,39 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuAddCalculationGroupIndexRootGroup = 3; - private const int contextMenuAddCalculationIndexRootGroup = 4; - private const int contextMenuRemoveAllChildrenIndexRootGroup = 6; + // private const int contextMenuAddCalculationGroupIndexRootGroup = 3; + // private const int contextMenuAddCalculationIndexRootGroup = 4; + // private const int contextMenuRemoveAllChildrenIndexRootGroup = 6; + // 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 customOnlyContextMenuAddGenerateCalculationsIndex = 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 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 customOnlyContextMenuAddGenerateCalculationsIndex = 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 contextMenuClearOutputIndedxNestedGroup = 9; private MockRepository mocks; private StabilityStoneCoverPlugin plugin; @@ -266,13 +283,13 @@ "Er zijn geen berekeningen om uit te voeren.", RingtoetsCommonFormsResources.CalculateAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputNestedGroupIndex, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndedxNestedGroup, "&Wis alle uitvoer...", "Er zijn geen berekeningen met uitvoer om te wissen.", RingtoetsCommonFormsResources.ClearIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 9, + TestHelper.AssertContextMenuStripContainsItem(menu, 5, CoreCommonGuiResources.Rename, CoreCommonGuiResources.Rename_ToolTip, CoreCommonGuiResources.RenameIcon); @@ -282,15 +299,15 @@ CoreCommonGuiResources.DeleteIcon); TestHelper.AssertContextMenuStripContainsItem(menu, 12, - CoreCommonGuiResources.Expand_all, - CoreCommonGuiResources.Expand_all_ToolTip, - CoreCommonGuiResources.ExpandAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, 13, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 13, + CoreCommonGuiResources.Expand_all, + CoreCommonGuiResources.Expand_all_ToolTip, + CoreCommonGuiResources.ExpandAllIcon, + false); TestHelper.AssertContextMenuStripContainsItem(menu, 15, CoreCommonGuiResources.Properties, @@ -346,8 +363,8 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { // Assert - Assert.AreEqual(16, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, customOnlyContextMenuAddGenerateCalculationsIndex, + Assert.AreEqual(18, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddGenerateCalculationsIndex, RingtoetsCommonFormsResources.CalculationGroup_Generate_calculations, "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de randvoorwaardenberekeningen te genereren.", RingtoetsCommonFormsResources.GenerateScenariosIcon, false); @@ -396,11 +413,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)); } } @@ -449,8 +467,8 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { // Assert - Assert.AreEqual(16, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, customOnlyContextMenuAddGenerateCalculationsIndex, + Assert.AreEqual(18, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddGenerateCalculationsIndex, RingtoetsCommonFormsResources.CalculationGroup_Generate_calculations, "Genereer randvoorwaardenberekeningen.", RingtoetsCommonFormsResources.GenerateScenariosIcon); @@ -499,11 +517,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)); } } @@ -838,7 +857,7 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { // Call - var clearAllOutputItem = contextMenu.Items[5]; + var clearAllOutputItem = contextMenu.Items[contextMenuClearOutputIndedxNestedGroup]; // Assert Assert.IsFalse(clearAllOutputItem.Enabled); @@ -889,7 +908,7 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { // Call - var clearAllOutputItem = contextMenu.Items[contextMenuClearOutputNestedGroupIndex]; + var clearAllOutputItem = contextMenu.Items[contextMenuClearOutputIndedxNestedGroup]; // Assert Assert.IsFalse(clearAllOutputItem.Enabled); @@ -970,7 +989,7 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { // Call - contextMenu.Items[contextMenuClearOutputNestedGroupIndex].PerformClick(); + contextMenu.Items[contextMenuClearOutputIndedxNestedGroup].PerformClick(); // Assert if (confirm) @@ -1090,7 +1109,7 @@ // When using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); + contextMenu.Items[contextMenuAddGenerateCalculationsIndex].PerformClick(); } // Then @@ -1149,7 +1168,7 @@ // When using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); + contextMenu.Items[contextMenuAddGenerateCalculationsIndex].PerformClick(); } // Then Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r3b65372a8a5857f063459b759650cb5c76dca16b -rb7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 3b65372a8a5857f063459b759650cb5c76dca16b) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision b7af57e52e0cd86a19d4ed56cf1cc95b1ecfe688) @@ -418,7 +418,6 @@ assessmentSection); var menuBuilderMock = mocks.StrictMock(); - using (mocks.Ordered()) { menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);