Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -raba812c4ed9d10a1a4b14b46526adcd295655c43 -r8b294a80cb40bb01ffe437ad314baec0d038d160 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision aba812c4ed9d10a1a4b14b46526adcd295655c43) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 8b294a80cb40bb01ffe437ad314baec0d038d160) @@ -51,7 +51,7 @@ { private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO, "HydraulicBoundaryLocationReader"); - private IGui gui; + private IGui guiMock; private TreeNodeInfo info; private MockRepository mocks; private GrassCoverErosionInwardsGuiPlugin plugin; @@ -60,10 +60,10 @@ public void SetUp() { mocks = new MockRepository(); - gui = mocks.StrictMock(); + guiMock = mocks.StrictMock(); plugin = new GrassCoverErosionInwardsGuiPlugin { - Gui = gui + Gui = guiMock }; info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionInwardsCalculationGroupContext)); @@ -119,7 +119,7 @@ { // Setup var assessmentSectionMock = mocks.StrictMock(); - var calculationItem = mocks.StrictMock(); + var calculationItemMock = mocks.StrictMock(); mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -128,7 +128,7 @@ var childCalculation = new GrassCoverErosionInwardsCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput); group.Children.Add(childGroup); - group.Children.Add(calculationItem); + group.Children.Add(calculationItemMock); group.Children.Add(childCalculation); var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(group, @@ -144,7 +144,7 @@ Assert.AreSame(childGroup, calculationGroupContext.WrappedData); Assert.AreSame(failureMechanism, calculationGroupContext.FailureMechanism); Assert.AreSame(assessmentSectionMock, calculationGroupContext.AssessmentSection); - Assert.AreSame(calculationItem, children[1]); + Assert.AreSame(calculationItemMock, children[1]); var calculationContext = (GrassCoverErosionInwardsCalculationContext) children[2]; Assert.AreSame(childCalculation, calculationContext.WrappedData); Assert.AreSame(assessmentSectionMock, calculationContext.AssessmentSection); @@ -180,7 +180,7 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); + guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -201,34 +201,34 @@ var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var treeViewControl = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - gui.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControlMock); // Assert Assert.AreEqual(9, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, 1, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, RingtoetsFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 2, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, RingtoetsFormsResources.CalculationGroup_Add_Calculation, RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, RingtoetsFormsResources.FailureMechanismIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 4, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, RingtoetsFormsResources.CalculateIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 5, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, RingtoetsFormsResources.Clear_all_output, RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, RingtoetsFormsResources.ClearIcon, @@ -271,7 +271,7 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); + guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -296,34 +296,34 @@ var parentGroupContext = new GrassCoverErosionInwardsCalculationGroupContext(parentGroup, failureMechanism, assessmentSectionMock); - var treeViewControl = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - gui.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock); // Assert Assert.AreEqual(9, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, 0, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, RingtoetsFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 1, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, RingtoetsFormsResources.CalculationGroup_Add_Calculation, RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, RingtoetsFormsResources.FailureMechanismIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 3, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, RingtoetsFormsResources.CalculateIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 4, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, RingtoetsFormsResources.Clear_all_output, RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, RingtoetsFormsResources.ClearIcon, @@ -351,21 +351,21 @@ failureMechanism, assessmentSectionMock); - var applicationFeatureCommandHandler = mocks.Stub(); - var exportImportHandler = mocks.Stub(); - var viewCommandsHandler = mocks.StrictMock(); - var treeViewControl = mocks.StrictMock(); + var applicationFeatureCommandHandlerStub = mocks.Stub(); + var exportImportHandlerStub = mocks.Stub(); + var viewCommandsHandlerMock = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, nodeData, treeViewControl); - gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); + guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); - treeViewControl.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Assert TestHelper.AssertContextMenuStripContainsItem(menu, 5, @@ -403,21 +403,21 @@ failureMechanism, assessmentSectionMock); - var applicationFeatureCommandHandler = mocks.Stub(); - var exportImportHandler = mocks.Stub(); - var viewCommandsHandler = mocks.StrictMock(); - var treeViewControl = mocks.StrictMock(); + var applicationFeatureCommandHandlerStub = mocks.Stub(); + var exportImportHandlerStub = mocks.Stub(); + var viewCommandsHandlerMock = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, nodeData, treeViewControl); - gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); + guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); - treeViewControl.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); mocks.ReplayAll(); // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Assert mocks.VerifyAll(); // Expect no calls on arguments @@ -456,21 +456,21 @@ failureMechanism, assessmentSectionMock); - var applicationFeatureCommandHandler = mocks.Stub(); - var exportImportHandler = mocks.Stub(); - var viewCommandsHandler = mocks.StrictMock(); - var treeViewControl = mocks.StrictMock(); + var applicationFeatureCommandHandlerStub = mocks.Stub(); + var exportImportHandlerStub = mocks.Stub(); + var viewCommandsHandlerMock = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, nodeData, treeViewControl); - gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); + guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); - treeViewControl.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); mocks.ReplayAll(); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Assert mocks.VerifyAll(); // Expect no calls on arguments @@ -518,21 +518,21 @@ failureMechanism, assessmentSectionMock); - var applicationFeatureCommandHandler = mocks.Stub(); - var exportImportHandler = mocks.Stub(); - var viewCommandsHandler = mocks.StrictMock(); - var treeViewControl = mocks.StrictMock(); + var applicationFeatureCommandHandlerStub = mocks.Stub(); + var exportImportHandlerStub = mocks.Stub(); + var viewCommandsHandlerMock = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, nodeData, treeViewControl); - gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); + guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); - treeViewControl.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Assert TestHelper.AssertContextMenuStripContainsItem(menu, 5, @@ -548,37 +548,33 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var group = new CalculationGroup(); - var parentGroup = new CalculationGroup(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var parentNodeData = new GrassCoverErosionInwardsCalculationGroupContext(parentGroup, - failureMechanism, - assessmentSectionMock); var calculationGroup = new CalculationGroup { Name = "Nieuwe map" }; - var observer = mocks.StrictMock(); - var treeViewControl = mocks.StrictMock(); + var observerMock = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + observerMock.Expect(o => o.UpdateObserver()); + guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); group.Children.Add(calculationGroup); - nodeData.Attach(observer); + nodeData.Attach(observerMock); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Precondition Assert.AreEqual(1, group.Children.Count); // Call - contextMenu.Items[contextMenuAddCalculationGroupIndex].PerformClick(); + contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick(); // Assert Assert.AreEqual(2, group.Children.Count); @@ -596,41 +592,37 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var group = new CalculationGroup(); - var parentGroup = new CalculationGroup(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var parentNodeData = new GrassCoverErosionInwardsCalculationGroupContext(parentGroup, - failureMechanism, - assessmentSectionMock); var calculationItem = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new GeneralNormProbabilityInput()) { Name = "Nieuwe berekening" }; - var observer = mocks.StrictMock(); - observer.Expect(o => o.UpdateObserver()); + var observerMock = mocks.StrictMock(); + observerMock.Expect(o => o.UpdateObserver()); - var treeViewControl = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); group.Children.Add(calculationItem); - nodeData.Attach(observer); + nodeData.Attach(observerMock); - var contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Precondition Assert.AreEqual(1, group.Children.Count); // Call - contextMenu.Items[contextMenuAddCalculationItemIndex].PerformClick(); + contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick(); // Assert Assert.AreEqual(2, group.Children.Count); @@ -646,7 +638,7 @@ public void OnNodeRemoved_NestedCalculationGroup_RemoveGroupAndNotifyObservers() { // Setup - var observer = mocks.StrictMock(); + var observerMock = mocks.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); var group = new CalculationGroup(); @@ -658,12 +650,12 @@ failureMechanism, assessmentSectionMock); - observer.Expect(o => o.UpdateObserver()); + observerMock.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); parentGroup.Children.Add(group); - parentNodeData.Attach(observer); + parentNodeData.Attach(observerMock); // Precondition Assert.IsTrue(info.CanRemove(nodeData, parentNodeData)); @@ -680,7 +672,7 @@ public void OnNodeRemoved_NestedCalculationGroupContainingCalculations_RemoveGroupAndCalculationsAndNotifyObservers() { // Setup - var observer = mocks.StrictMock(); + var observerMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var group = new CalculationGroup(); @@ -695,13 +687,13 @@ new GeneralGrassCoverErosionInwardsInput(), new GeneralNormProbabilityInput()); - observer.Expect(o => o.UpdateObserver()); + observerMock.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); group.Children.Add(calculation); parentGroup.Children.Add(group); - parentNodeData.Attach(observer); + parentNodeData.Attach(observerMock); // Precondition Assert.IsTrue(info.CanRemove(nodeData, parentNodeData)); @@ -714,7 +706,13 @@ mocks.VerifyAll(); } - private const int contextMenuAddCalculationGroupIndex = 0; - private const int contextMenuAddCalculationItemIndex = 1; + private const int contextMenuAddCalculationGroupIndexRootGroup = 1; + private const int contextMenuAddCalculationIndexRootGroup = 2; + private const int contextMenuCalculateAllIndexRootGroup = 4; + private const int contextMenuClearAllIndexRootGroup = 5; + private const int contextMenuAddCalculationGroupIndexNestedGroup = 0; + private const int contextMenuAddCalculationIndexNestedGroup = 1; + private const int contextMenuCalculateAllIndexNestedGroup = 3; + private const int contextMenuClearAllIndexNestedGroup = 4; } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -raba812c4ed9d10a1a4b14b46526adcd295655c43 -r8b294a80cb40bb01ffe437ad314baec0d038d160 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision aba812c4ed9d10a1a4b14b46526adcd295655c43) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 8b294a80cb40bb01ffe437ad314baec0d038d160) @@ -42,7 +42,7 @@ [TestFixture] public class HeightStructuresCalculationGroupContextTreeNodeInfoTest { - private IGui gui; + private IGui guiMock; private TreeNodeInfo info; private MockRepository mocks; private HeightStructuresGuiPlugin plugin; @@ -51,10 +51,10 @@ public void SetUp() { mocks = new MockRepository(); - gui = mocks.StrictMock(); + guiMock = mocks.StrictMock(); plugin = new HeightStructuresGuiPlugin { - Gui = gui + Gui = guiMock }; info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(HeightStructuresCalculationGroupContext)); @@ -110,7 +110,7 @@ { // Setup var assessmentSectionMock = mocks.StrictMock(); - var calculationItem = mocks.StrictMock(); + var calculationItemMock = mocks.StrictMock(); mocks.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism(); @@ -119,7 +119,7 @@ var childCalculation = new HeightStructuresCalculation(); group.Children.Add(childGroup); - group.Children.Add(calculationItem); + group.Children.Add(calculationItemMock); group.Children.Add(childCalculation); var groupContext = new HeightStructuresCalculationGroupContext(group, @@ -135,7 +135,7 @@ Assert.AreSame(childGroup, calculationGroupContext.WrappedData); Assert.AreSame(failureMechanism, calculationGroupContext.FailureMechanism); Assert.AreSame(assessmentSectionMock, calculationGroupContext.AssessmentSection); - Assert.AreSame(calculationItem, children[1]); + Assert.AreSame(calculationItemMock, children[1]); var calculationContext = (HeightStructuresCalculationContext) children[2]; Assert.AreSame(childCalculation, calculationContext.WrappedData); Assert.AreSame(assessmentSectionMock, calculationContext.AssessmentSection); @@ -171,7 +171,7 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); + guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -192,34 +192,34 @@ var groupContext = new HeightStructuresCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var treeViewControl = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - gui.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControlMock); // Assert Assert.AreEqual(9, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, 1, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, RingtoetsFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 2, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, RingtoetsFormsResources.CalculationGroup_Add_Calculation, RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, RingtoetsFormsResources.FailureMechanismIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 4, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, RingtoetsFormsResources.CalculateIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 5, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, RingtoetsFormsResources.Clear_all_output, RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, RingtoetsFormsResources.ClearIcon, @@ -262,7 +262,7 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); + guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -287,34 +287,34 @@ var parentGroupContext = new HeightStructuresCalculationGroupContext(parentGroup, failureMechanism, assessmentSectionMock); - var treeViewControl = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - gui.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock); // Assert Assert.AreEqual(9, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, 0, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, RingtoetsFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 1, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, RingtoetsFormsResources.CalculationGroup_Add_Calculation, RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, RingtoetsFormsResources.FailureMechanismIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 3, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, RingtoetsFormsResources.CalculateIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 4, + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, RingtoetsFormsResources.Clear_all_output, RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, RingtoetsFormsResources.ClearIcon, @@ -329,38 +329,34 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var group = new CalculationGroup(); - var parentGroup = new CalculationGroup(); var failureMechanism = new HeightStructuresFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new HeightStructuresCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var parentNodeData = new HeightStructuresCalculationGroupContext(parentGroup, - failureMechanism, - assessmentSectionMock); var calculationGroup = new CalculationGroup { Name = "Nieuwe map" }; - var observer = mocks.StrictMock(); - var treeViewControl = mocks.StrictMock(); + var observerMock = mocks.StrictMock(); + var treeViewControlMock = mocks.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + observerMock.Expect(o => o.UpdateObserver()); + guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder); mocks.ReplayAll(); group.Children.Add(calculationGroup); - nodeData.Attach(observer); + nodeData.Attach(observerMock); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); // Precondition Assert.AreEqual(1, group.Children.Count); // Call - contextMenu.Items[contextMenuAddCalculationGroupIndex].PerformClick(); + contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick(); // Assert Assert.AreEqual(2, group.Children.Count); @@ -376,7 +372,7 @@ public void OnNodeRemoved_NestedCalculationGroup_RemoveGroupAndNotifyObservers() { // Setup - var observer = mocks.StrictMock(); + var observerMock = mocks.StrictMock(); var failureMechanism = new HeightStructuresFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); var group = new CalculationGroup(); @@ -388,12 +384,12 @@ failureMechanism, assessmentSectionMock); - observer.Expect(o => o.UpdateObserver()); + observerMock.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); parentGroup.Children.Add(group); - parentNodeData.Attach(observer); + parentNodeData.Attach(observerMock); // Precondition Assert.IsTrue(info.CanRemove(nodeData, parentNodeData)); @@ -410,7 +406,7 @@ public void OnNodeRemoved_NestedCalculationGroupContainingCalculations_RemoveGroupAndCalculationsAndNotifyObservers() { // Setup - var observer = mocks.StrictMock(); + var observerMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var failureMechanism = new HeightStructuresFailureMechanism(); var group = new CalculationGroup(); @@ -423,13 +419,13 @@ assessmentSectionMock); var calculation = new HeightStructuresCalculation(); - observer.Expect(o => o.UpdateObserver()); + observerMock.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); group.Children.Add(calculation); parentGroup.Children.Add(group); - parentNodeData.Attach(observer); + parentNodeData.Attach(observerMock); // Precondition Assert.IsTrue(info.CanRemove(nodeData, parentNodeData)); @@ -442,6 +438,13 @@ mocks.VerifyAll(); } - private const int contextMenuAddCalculationGroupIndex = 0; + private const int contextMenuAddCalculationGroupIndexRootGroup = 1; + private const int contextMenuAddCalculationIndexRootGroup = 2; + private const int contextMenuCalculateAllIndexRootGroup = 4; + private const int contextMenuClearAllIndexRootGroup = 5; + private const int contextMenuAddCalculationGroupIndexNestedGroup = 0; + private const int contextMenuAddCalculationIndexNestedGroup = 1; + private const int contextMenuCalculateAllIndexNestedGroup = 3; + private const int contextMenuClearAllIndexNestedGroup = 4; } }