Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rd6e6041931d39b07ebb06bd0919a5d338736704e -r59d8943b166f40b1d8b3595b43b2a524e719b2ef --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision d6e6041931d39b07ebb06bd0919a5d338736704e) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 59d8943b166f40b1d8b3595b43b2a524e719b2ef) @@ -491,6 +491,9 @@ var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl)); bool isNestedGroup = parentData is StabilityPointStructuresCalculationGroupContext; + builder.AddExportItem() + .AddSeparator(); + if (!isNestedGroup) { builder.AddCustomItem(CreateGenerateStabilityPointStructuresCalculationsItem(context)) @@ -661,7 +664,9 @@ StructuresCalculation calculation = context.WrappedData; - return builder.AddRenameItem() + return builder.AddExportItem() + .AddSeparator() + .AddRenameItem() .AddValidateCalculationItem( context, Validate, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rc990bf404015584981f3ec1d22ecec12a7b037f3 -r59d8943b166f40b1d8b3595b43b2a524e719b2ef --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision c990bf404015584981f3ec1d22ecec12a7b037f3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision 59d8943b166f40b1d8b3595b43b2a524e719b2ef) @@ -53,9 +53,9 @@ [TestFixture] public class StabilityPointStructuresCalculationContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuValidateIndex = 1; - private const int contextMenuCalculateIndex = 2; - private const int contextMenuClearIndex = 4; + private const int contextMenuValidateIndex = 3; + private const int contextMenuCalculateIndex = 4; + private const int contextMenuClearIndex = 6; private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"); private MockRepository mocks; @@ -179,6 +179,8 @@ var menuBuilderMock = mocks.StrictMock(); 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); @@ -238,7 +240,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSection, treeViewControl)) { // Assert - Assert.AreEqual(11, menu.Items.Count); + Assert.AreEqual(13, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, "&Valideren", Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc990bf404015584981f3ec1d22ecec12a7b037f3 -r59d8943b166f40b1d8b3595b43b2a524e719b2ef --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision c990bf404015584981f3ec1d22ecec12a7b037f3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 59d8943b166f40b1d8b3595b43b2a524e719b2ef) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.IO; using System.Linq; using System.Windows.Forms; @@ -54,18 +55,18 @@ [TestFixture] public class StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuGenerateCalculationsIndexRootGroup = 0; - private const int contextMenuAddCalculationGroupIndexRootGroup = 2; - private const int contextMenuAddCalculationIndexRootGroup = 3; - private const int contextMenuValidateAllIndexRootGroup = 5; - private const int contextMenuCalculateAllIndexRootGroup = 6; - private const int contextMenuClearAllIndexRootGroup = 8; + private const int contextMenuGenerateCalculationsIndexRootGroup = 2; + private const int contextMenuAddCalculationGroupIndexRootGroup = 4; + private const int contextMenuAddCalculationIndexRootGroup = 5; + private const int contextMenuValidateAllIndexRootGroup = 7; + private const int contextMenuCalculateAllIndexRootGroup = 8; + private const int contextMenuClearAllIndexRootGroup = 10; - private const int contextMenuAddCalculationGroupIndexNestedGroup = 0; - private const int contextMenuAddCalculationIndexNestedGroup = 1; - private const int contextMenuValidateAllIndexNestedGroup = 4; - private const int contextMenuCalculateAllIndexNestedGroup = 5; - private const int contextMenuClearAllIndexNestedGroup = 7; + private const int contextMenuAddCalculationGroupIndexNestedGroup = 2; + private const int contextMenuAddCalculationIndexNestedGroup = 3; + private const int contextMenuValidateAllIndexNestedGroup = 6; + private const int contextMenuCalculateAllIndexNestedGroup = 7; + private const int contextMenuClearAllIndexNestedGroup = 9; private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"); private IGui gui; @@ -127,7 +128,7 @@ assessmentSection); // Call - var children = info.ChildNodeObjects(groupContext); + object[] children = info.ChildNodeObjects(groupContext); // Assert CollectionAssert.IsEmpty(children); @@ -180,6 +181,8 @@ var menuBuilderMock = mocks.StrictMock(); using (mocks.Ordered()) { + 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.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); @@ -235,7 +238,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl)) { // Assert - Assert.AreEqual(15, menu.Items.Count); + Assert.AreEqual(17, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuGenerateCalculationsIndexRootGroup, "Genereer &berekeningen...", @@ -294,7 +297,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl)) { // Assert - Assert.AreEqual(15, menu.Items.Count); + Assert.AreEqual(17, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuGenerateCalculationsIndexRootGroup, "Genereer &berekeningen...", @@ -533,6 +536,8 @@ var menuBuilderMock = mocks.StrictMock(); using (mocks.Ordered()) { + 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.AddSeparator()).Return(menuBuilderMock); @@ -585,7 +590,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl)) { // Assert - Assert.AreEqual(14, menu.Items.Count); + Assert.AreEqual(16, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, "&Map toevoegen", @@ -653,7 +658,7 @@ // Assert Assert.AreEqual(2, group.Children.Count); - var newlyAddedItem = group.Children.Last(); + ICalculationBase newlyAddedItem = group.Children.Last(); Assert.IsInstanceOf(newlyAddedItem); Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); @@ -699,7 +704,7 @@ // Assert Assert.AreEqual(2, group.Children.Count); - var newlyAddedItem = group.Children.Last(); + ICalculationBase newlyAddedItem = group.Children.Last(); Assert.IsInstanceOf>(newlyAddedItem); Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); @@ -771,7 +776,7 @@ // Call TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages => { - var messageList = messages.ToList(); + List messageList = messages.ToList(); // Assert Assert.AreEqual(12, messageList.Count); @@ -846,7 +851,7 @@ // Call TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndexRootGroup].PerformClick(), messages => { - var messageList = messages.ToList(); + List messageList = messages.ToList(); // Assert Assert.AreEqual(4, messageList.Count); @@ -910,7 +915,7 @@ contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); // Then - var stabilityPointStructuresCalculations = failureMechanism.Calculations.OfType>().ToArray(); + StructuresCalculation[] stabilityPointStructuresCalculations = failureMechanism.Calculations.OfType>().ToArray(); Assert.AreEqual(1, stabilityPointStructuresCalculations.Length); Assert.AreSame(structure1, stabilityPointStructuresCalculations[0].InputParameters.Structure); } @@ -1035,7 +1040,7 @@ contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); // Then - var stabilityPointStructuresCalculations = failureMechanism.Calculations.OfType>().ToArray(); + StructuresCalculation[] stabilityPointStructuresCalculations = failureMechanism.Calculations.OfType>().ToArray(); Assert.AreEqual(2, stabilityPointStructuresCalculations.Length); Assert.AreEqual(expectedNewName, stabilityPointStructuresCalculations[1].Name); }