Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rffdaea5b476af6072fa570ad76cd7649b5490fac -r2b98d6382f3894ac144cb6d3eadcbdce506d3f75 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision ffdaea5b476af6072fa570ad76cd7649b5490fac) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 2b98d6382f3894ac144cb6d3eadcbdce506d3f75) @@ -2370,8 +2370,10 @@ RiskeerCommonFormsResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName, () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsOfWaterLevelCalculationsForNormTargetProbabilities(nodeData.AssessmentSection)); - return builder.AddCustomItem(waterLevelCalculationItem) + return builder.AddExportItem() .AddSeparator() + .AddCustomItem(waterLevelCalculationItem) + .AddSeparator() .AddClearIllustrationPointsOfCalculationsItem(() => WaterLevelCalculationsForNormTargetProbabilitiesHaveIllustrationPoints(assessmentSection), changeHandler) .AddSeparator() .AddCollapseAllItem() @@ -2468,8 +2470,10 @@ RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName, () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsOfWaterLevelCalculationsForUserDefinedTargetProbabilities(nodeData.AssessmentSection)); - return builder.AddCustomItem(addTargetProbabilityItem) + return builder.AddExportItem() .AddSeparator() + .AddCustomItem(addTargetProbabilityItem) + .AddSeparator() .AddCustomItem(waterLevelCalculationItem) .AddSeparator() .AddClearIllustrationPointsOfCalculationsItem(() => WaterLevelCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(assessmentSection), changeHandler) @@ -2591,8 +2595,10 @@ RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName, () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsOfWaveHeightCalculationsForUserDefinedTargetProbabilities(nodeData.AssessmentSection)); - return builder.AddCustomItem(addTargetProbabilityItem) + return builder.AddExportItem() .AddSeparator() + .AddCustomItem(addTargetProbabilityItem) + .AddSeparator() .AddCustomItem(waveHeightCalculationItem) .AddSeparator() .AddClearIllustrationPointsOfCalculationsItem(() => WaveHeightCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(assessmentSection), changeHandler) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r2b98d6382f3894ac144cb6d3eadcbdce506d3f75 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 4b889a77a0b2a44d9eadc54540334140415177c8) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 2b98d6382f3894ac144cb6d3eadcbdce506d3f75) @@ -56,8 +56,8 @@ [TestFixture] public class WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuRunWaterLevelCalculationsIndex = 0; - private const int contextMenuClearIllustrationPointsIndex = 2; + private const int contextMenuRunWaterLevelCalculationsIndex = 2; + private const int contextMenuClearIllustrationPointsIndex = 4; private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); [Test] @@ -169,6 +169,8 @@ var menuBuilder = mockRepository.StrictMock(); using (mockRepository.Ordered()) { + menuBuilder.Expect(mb => mb.AddExportItem()).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.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); @@ -231,7 +233,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSection, treeViewControl)) { // Assert - Assert.AreEqual(6, menu.Items.Count); + Assert.AreEqual(8, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRunWaterLevelCalculationsIndex, "Alles be&rekenen", Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rd22318d66f73e412d80e69398a515c9347f25c8e -r2b98d6382f3894ac144cb6d3eadcbdce506d3f75 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d22318d66f73e412d80e69398a515c9347f25c8e) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 2b98d6382f3894ac144cb6d3eadcbdce506d3f75) @@ -57,9 +57,9 @@ [TestFixture] public class WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuAddTargetProbabilityIndex = 0; - private const int contextMenuRunWaterLevelCalculationsIndex = 2; - private const int contextMenuClearIllustrationPointsIndex = 4; + private const int contextMenuAddTargetProbabilityIndex = 2; + private const int contextMenuRunWaterLevelCalculationsIndex = 4; + private const int contextMenuClearIllustrationPointsIndex = 6; private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); [Test] @@ -168,6 +168,8 @@ var menuBuilder = mockRepository.StrictMock(); using (mockRepository.Ordered()) { + menuBuilder.Expect(mb => mb.AddExportItem()).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.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); @@ -233,7 +235,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSection, treeViewControl)) { // Assert - Assert.AreEqual(9, menu.Items.Count); + Assert.AreEqual(11, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddTargetProbabilityIndex, "Doelkans toevoegen", Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rd22318d66f73e412d80e69398a515c9347f25c8e -r2b98d6382f3894ac144cb6d3eadcbdce506d3f75 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d22318d66f73e412d80e69398a515c9347f25c8e) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 2b98d6382f3894ac144cb6d3eadcbdce506d3f75) @@ -57,9 +57,9 @@ [TestFixture] public class WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest : NUnitFormTest { - private const int contextMenuAddTargetProbabilityIndex = 0; - private const int contextMenuRunWaveHeightCalculationsIndex = 2; - private const int contextMenuClearIllustrationPointsIndex = 4; + private const int contextMenuAddTargetProbabilityIndex = 2; + private const int contextMenuRunWaveHeightCalculationsIndex = 4; + private const int contextMenuClearIllustrationPointsIndex = 6; private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); [Test] @@ -168,6 +168,8 @@ var menuBuilder = mockRepository.StrictMock(); using (mockRepository.Ordered()) { + menuBuilder.Expect(mb => mb.AddExportItem()).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.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); @@ -233,7 +235,7 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSection, treeViewControl)) { // Assert - Assert.AreEqual(9, menu.Items.Count); + Assert.AreEqual(11, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddTargetProbabilityIndex, "Doelkans toevoegen",