Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r9268ebeb017950ef5cc9d9d99f27bbbb91d5b19f -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 9268ebeb017950ef5cc9d9d99f27bbbb91d5b19f) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -179,9 +179,6 @@ ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -191,8 +188,6 @@ Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName, Image = output => RingtoetsCommonFormsResources.GeneralOutputIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -400,9 +395,6 @@ .AddPerformAllCalculationsInFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism) .AddClearAllCalculationOutputInFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext.WrappedData) .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -504,10 +496,7 @@ .AddSeparator(); } - return builder.AddImportItem() - .AddExportItem() - .AddSeparator() - .AddExpandAllItem() + return builder.AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() .AddPropertiesItem() @@ -630,9 +619,6 @@ .AddRenameItem() .AddDeleteItem() .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r53aef346fd0ee3cc79d1f5df9171c476453f2935 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 53aef346fd0ee3cc79d1f5df9171c476453f2935) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -191,9 +191,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -248,7 +245,7 @@ var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl); // Assert - Assert.AreEqual(7, menu.Items.Count); + Assert.AreEqual(6, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, RingtoetsCommonFormsResources.Validate, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r53aef346fd0ee3cc79d1f5df9171c476453f2935 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 53aef346fd0ee3cc79d1f5df9171c476453f2935) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -184,9 +184,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -228,7 +225,7 @@ ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); // Assert - Assert.AreEqual(12, menu.Items.Count); + Assert.AreEqual(11, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, @@ -283,9 +280,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -327,7 +321,7 @@ ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); // Assert - Assert.AreEqual(10, menu.Items.Count); + Assert.AreEqual(9, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r53aef346fd0ee3cc79d1f5df9171c476453f2935 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 53aef346fd0ee3cc79d1f5df9171c476453f2935) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -186,9 +186,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -268,7 +265,7 @@ var menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView); // Assert - Assert.AreEqual(9, menu.Items.Count); + Assert.AreEqual(8, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -133,9 +133,6 @@ menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); mocksRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -115,8 +115,6 @@ var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -97,9 +97,6 @@ Text = inputContext => HeightStructuresFormsResources.HeightStructuresInputContext_NodeDisplayName, Image = inputContext => RingtoetsCommonFormsResources.GenericInputOutputIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -109,8 +106,6 @@ Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName, Image = output => RingtoetsCommonFormsResources.GeneralOutputIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -258,9 +253,6 @@ .AddPerformAllCalculationsInFailureMechanismItem(context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism) .AddClearAllCalculationOutputInFailureMechanismItem(context.WrappedData) .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -358,10 +350,7 @@ .AddSeparator(); } - return builder.AddImportItem() - .AddExportItem() - .AddSeparator() - .AddExpandAllItem() + return builder.AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() .AddPropertiesItem() @@ -439,9 +428,6 @@ .AddRenameItem() .AddDeleteItem() .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -192,9 +192,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -239,7 +236,7 @@ var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl); // Assert - Assert.AreEqual(7, menu.Items.Count); + Assert.AreEqual(6, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, RingtoetsCommonFormsResources.Validate, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -180,9 +180,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -224,7 +221,7 @@ ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); // Assert - Assert.AreEqual(10, menu.Items.Count); + Assert.AreEqual(9, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, @@ -279,9 +276,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -327,7 +321,7 @@ ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); // Assert - Assert.AreEqual(10, menu.Items.Count); + Assert.AreEqual(9, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -179,9 +179,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); @@ -261,7 +258,7 @@ var menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView); // Assert - Assert.AreEqual(9, menu.Items.Count); + Assert.AreEqual(8, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs (.../HeightStructuresInputContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs (.../HeightStructuresInputContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -136,9 +136,6 @@ { guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); mocksRepository.ReplayAll(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs (.../ProbabilisticOutputTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs (.../ProbabilisticOutputTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -116,8 +116,6 @@ using (var treeViewControl = new TreeViewControl()) { - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r930dbe6d1d96a17d607c38b7b9600e9147abca44 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 930dbe6d1d96a17d607c38b7b9600e9147abca44) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -421,8 +421,6 @@ Image = failureMechanismContribution => RingtoetsCommonFormsResources.FailureMechanismContributionIcon, ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution, treeViewControl) .AddOpenItem() - .AddSeparator() - .AddExportItem() .Build() }; @@ -467,8 +465,6 @@ Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName, Image = output => RingtoetsCommonFormsResources.GeneralOutputIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -489,9 +485,6 @@ return Gui.Get(nodeData, treeViewControl) .AddCustomItem(addItem) .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -757,9 +750,6 @@ .AddRenameItem() .AddDeleteItem() .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -904,9 +894,6 @@ return builder.AddToggleRelevancyOfFailureMechanismItem(nodeData, RemoveAllViewsForItem) .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -997,11 +984,7 @@ } return Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .AddSeparator() .AddCustomItem(connectionItem) - .AddImportItem() - .AddExportItem() .AddSeparator() .AddCustomItem(designWaterLevelItem) .AddSeparator() Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -re2e6d944af7b0cea6c9c34e77bd0644149526c37 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision e2e6d944af7b0cea6c9c34e77bd0644149526c37) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -276,9 +276,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -ra32bbe3919b6babd74ae4867e8337662aed0dad2 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision a32bbe3919b6babd74ae4867e8337662aed0dad2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -278,9 +278,6 @@ menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs (.../FailureMechanismContributionContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs (.../FailureMechanismContributionContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -127,8 +127,6 @@ var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); var gui = mocks.StrictMock(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r25fa2a83863cea9ede34695627f4be4627dd1466 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 25fa2a83863cea9ede34695627f4be4627dd1466) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -154,11 +154,7 @@ var nodeData = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); - menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - 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); @@ -215,7 +211,7 @@ const string expectedItemText = "&Toetspeilen berekenen"; const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de toetspeilen te berekenen."; - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon, false); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon, false); } } // Assert @@ -251,7 +247,7 @@ const string expectedItemText = "&Toetspeilen berekenen"; const string expectedItemTooltip = "Bereken de toetspeilen"; - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon); } } // Assert @@ -264,7 +260,7 @@ // Given var gui = mocks.DynamicMock(); - var contextMenuRunAssessmentLevelCalculationsIndex = 3; + var contextMenuRunAssessmentLevelCalculationsIndex = 2; var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(100001, "", 1.1, 2.2); var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(100002, "", 3.3, 4.4) @@ -368,7 +364,7 @@ // Given string testFile = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - int contextMenuImportHydraulicBoundaryDatabaseIndex = 1; + int contextMenuImportHydraulicBoundaryDatabaseIndex = 0; AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); @@ -415,7 +411,7 @@ // Given string testFile = Path.Combine(testDataPath, "empty.sqlite"); - int contextMenuImportHydraulicBoundaryDatabaseIndex = 1; + int contextMenuImportHydraulicBoundaryDatabaseIndex = 0; AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); @@ -458,7 +454,7 @@ // Given string testFile = Path.Combine(testDataPathNoHlcd, "HRD dutch coast south.sqlite"); - int contextMenuImportHydraulicBoundaryDatabaseIndex = 1; + int contextMenuImportHydraulicBoundaryDatabaseIndex = 0; AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); @@ -505,7 +501,7 @@ assessmentObserver.Expect(o => o.UpdateObserver()); IObserver observer = mocks.StrictMock(); - int contextMenuImportHydraulicBoundaryDatabaseIndex = 1; + int contextMenuImportHydraulicBoundaryDatabaseIndex = 0; AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); using (HydraulicBoundaryDatabaseImporter importer = new HydraulicBoundaryDatabaseImporter()) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs (.../ProbabilityAssessmentOutputTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs (.../ProbabilityAssessmentOutputTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -116,8 +116,6 @@ guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); var menuBuilderMock = mocksRepository.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs =================================================================== diff -u -r2227f1d3a31b15a6d05c5385898d5da4b79dcdea -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision 2227f1d3a31b15a6d05c5385898d5da4b79dcdea) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -136,9 +136,6 @@ menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -172,9 +172,6 @@ ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -187,7 +184,6 @@ ChildNodeObjects = ringtoetsPipingSurfaceLine => ringtoetsPipingSurfaceLine.WrappedData.SurfaceLines.Cast().ToArray(), ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddImportItem() - .AddExportItem() .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() @@ -212,7 +208,6 @@ ChildNodeObjects = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Cast().ToArray(), ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddImportItem() - .AddExportItem() .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() @@ -264,8 +259,6 @@ Image = emptyPipingOutput => RingtoetsCommonFormsResources.GeneralOutputIcon, ForeColor = emptyPipingOutput => Color.FromKnownColor(KnownColor.GrayText), ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddExportItem() - .AddSeparator() .AddPropertiesItem() .Build() }; @@ -461,9 +454,6 @@ .AddPerformAllCalculationsInFailureMechanismItem(pipingFailureMechanismContext, CalculateAll) .AddClearAllCalculationOutputInFailureMechanismItem(pipingFailureMechanismContext.WrappedData) .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -548,9 +538,6 @@ .AddRenameItem() .AddDeleteItem() .AddSeparator() - .AddImportItem() - .AddExportItem() - .AddSeparator() .AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() @@ -674,10 +661,7 @@ .AddSeparator(); } - return builder.AddImportItem() - .AddExportItem() - .AddSeparator() - .AddExpandAllItem() + return builder.AddExpandAllItem() .AddCollapseAllItem() .AddSeparator() .AddPropertiesItem() Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs (.../EmptyPipingOutputTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs (.../EmptyPipingOutputTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -102,8 +102,6 @@ { // Setup var menuBuilderMock = mocks.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -208,7 +208,7 @@ ContextMenuStrip menu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); // Assert - Assert.AreEqual(17, menu.Items.Count); + Assert.AreEqual(14, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex, RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", @@ -241,28 +241,17 @@ CoreCommonGuiResources.DeleteIcon); TestHelper.AssertContextMenuStripContainsItem(menu, 10, - CoreCommonGuiResources.Import, - CoreCommonGuiResources.Import_ToolTip, - CoreCommonGuiResources.ImportIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, 11, - CoreCommonGuiResources.Export, - CoreCommonGuiResources.Export_ToolTip, - CoreCommonGuiResources.ExportIcon, - false); - - TestHelper.AssertContextMenuStripContainsItem(menu, 13, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 14, + TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 16, + TestHelper.AssertContextMenuStripContainsItem(menu, 13, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, @@ -273,8 +262,7 @@ menu.Items[2], menu.Items[6], menu.Items[9], - menu.Items[12], - menu.Items[15] + menu.Items[12] }, typeof(ToolStripSeparator)); } @@ -321,7 +309,7 @@ // Assert var mainCalculationGroupContextMenuItemOffset = 4; - Assert.AreEqual(18, menu.Items.Count); + Assert.AreEqual(15, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex + mainCalculationGroupContextMenuItemOffset, RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", @@ -345,28 +333,17 @@ RingtoetsCommonFormsResources.ClearIcon); TestHelper.AssertContextMenuStripContainsItem(menu, 11, - CoreCommonGuiResources.Import, - CoreCommonGuiResources.Import_ToolTip, - CoreCommonGuiResources.ImportIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, 12, - CoreCommonGuiResources.Export, - CoreCommonGuiResources.Export_ToolTip, - CoreCommonGuiResources.ExportIcon, - false); - - TestHelper.AssertContextMenuStripContainsItem(menu, 14, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 15, + TestHelper.AssertContextMenuStripContainsItem(menu, 12, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 17, + TestHelper.AssertContextMenuStripContainsItem(menu, 14, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, @@ -377,8 +354,7 @@ menu.Items[3], menu.Items[6], menu.Items[10], - menu.Items[13], - menu.Items[16] + menu.Items[13] }, typeof(ToolStripSeparator)); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -282,9 +282,6 @@ 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.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).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); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -335,7 +335,7 @@ ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); // Assert - Assert.AreEqual(15, menu.Items.Count); + Assert.AreEqual(12, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, 0, CoreCommonGuiResources.Open, CoreCommonGuiResources.Open_ToolTip, CoreCommonGuiResources.OpenIcon, false); @@ -345,21 +345,17 @@ TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon); TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 8, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 9, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 8, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 9, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 12, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 14, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, false); - CollectionAssert.AllItemsAreInstancesOfType(new[] { menu.Items[1], menu.Items[3], menu.Items[7], - menu.Items[10], - menu.Items[13] + menu.Items[10] }, typeof(ToolStripSeparator)); } } @@ -487,9 +483,6 @@ menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddImportItem()).Return(menuBuilder); - menuBuilder.Expect(mb => mb.AddExportItem()).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); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -113,9 +113,6 @@ menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs (.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs (.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -169,7 +169,6 @@ var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs (.../StochasticSoilModelContextTreeNodeInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs (.../StochasticSoilModelContextTreeNodeInfoTest.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) @@ -197,7 +197,6 @@ var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);