Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision c9396d0af18873fda14c7e486decbfca7d4e8b21) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 20415b2886919a103cb4677f56a8f61abbb7aa8a) @@ -244,12 +244,12 @@ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, RingtoetsFormsResources.Validate_all, RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, - RingtoetsFormsResources.ValidateIcon, + RingtoetsFormsResources.ValidateAllIcon, false); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsFormsResources.CalculateIcon, + RingtoetsFormsResources.CalculateAllIcon, false); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, RingtoetsFormsResources.Clear_all_output, @@ -350,7 +350,7 @@ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsFormsResources.CalculateIcon, + RingtoetsFormsResources.CalculateAllIcon, false); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, RingtoetsFormsResources.Clear_all_output, @@ -540,28 +540,22 @@ var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, failureMechanism, assessmentSectionMock); + var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var applicationFeatureCommandHandlerStub = mocks.Stub(); - var exportImportHandlerStub = mocks.Stub(); - var viewCommandsHandlerMock = mocks.StrictMock(); - using (var treeViewControl = new TreeViewControl()) { - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl); guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); - mocks.ReplayAll(); // Call ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip, - RingtoetsFormsResources.CalculateIcon); + RingtoetsFormsResources.CalculateAllIcon); } }