Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2) @@ -162,7 +162,6 @@ var groupContext = new HeightStructuresCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var treeViewControlMock = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); @@ -181,13 +180,16 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); - mocks.ReplayAll(); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock); - // Call - info.ContextMenuStrip(groupContext, null, treeViewControlMock); + mocks.ReplayAll(); + // Call + info.ContextMenuStrip(groupContext, null, treeViewControl); + } // Assert mocks.VerifyAll(); } @@ -202,39 +204,40 @@ var groupContext = new HeightStructuresCalculationGroupContext(group, failureMechanism, assessmentSectionMock); - var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - - guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); - + mocks.ReplayAll(); - // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControlMock); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); - // Assert - Assert.AreEqual(9, menu.Items.Count); + // Call + ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, - RingtoetsFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, - RingtoetsFormsResources.CalculationGroup_Add_Calculation, - RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, - RingtoetsFormsResources.FailureMechanismIcon); + // Assert + Assert.AreEqual(9, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsFormsResources.CalculateIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, + RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, + RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, + RingtoetsFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, + RingtoetsFormsResources.CalculationGroup_Add_Calculation, + RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, + RingtoetsFormsResources.FailureMechanismIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, + RingtoetsFormsResources.Calculate_all, + RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + RingtoetsFormsResources.CalculateIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, + RingtoetsFormsResources.Clear_all_output, + RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsFormsResources.ClearIcon, + false); + } mocks.VerifyAll(); } @@ -252,7 +255,6 @@ var parentGroupContext = new HeightStructuresCalculationGroupContext(parentGroup, failureMechanism, assessmentSectionMock); - var treeViewControlMock = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); @@ -272,13 +274,16 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControlMock)).Return(menuBuilderMock); - mocks.ReplayAll(); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock); - // Call - info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock); + mocks.ReplayAll(); + // Call + info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); + } // Assert mocks.VerifyAll(); } @@ -297,39 +302,40 @@ var parentGroupContext = new HeightStructuresCalculationGroupContext(parentGroup, failureMechanism, assessmentSectionMock); - var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); - mocks.ReplayAll(); - // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); - // Assert - Assert.AreEqual(9, menu.Items.Count); + // Call + ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, - RingtoetsFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, - RingtoetsFormsResources.CalculationGroup_Add_Calculation, - RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, - RingtoetsFormsResources.FailureMechanismIcon); + // Assert + Assert.AreEqual(9, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsFormsResources.CalculateIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, + RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, + RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, + RingtoetsFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, + RingtoetsFormsResources.CalculationGroup_Add_Calculation, + RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, + RingtoetsFormsResources.FailureMechanismIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, + RingtoetsFormsResources.Calculate_all, + RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + RingtoetsFormsResources.CalculateIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, + RingtoetsFormsResources.Clear_all_output, + RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsFormsResources.ClearIcon, + false); + } mocks.VerifyAll(); } @@ -355,25 +361,26 @@ var applicationFeatureCommandHandlerStub = mocks.Stub(); var exportImportHandlerStub = mocks.Stub(); var viewCommandsHandlerMock = mocks.StrictMock(); - var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); - guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); + using (var treeViewControl = new TreeViewControl()) + { + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl); + guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); - mocks.ReplayAll(); + mocks.ReplayAll(); - // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + // Call + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsFormsResources.CalculateAllIcon, - false); + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, + RingtoetsFormsResources.Calculate_all, + RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsFormsResources.CalculateAllIcon, + false); + } mocks.VerifyAll(); } @@ -406,26 +413,26 @@ var applicationFeatureCommandHandlerStub = mocks.Stub(); var exportImportHandlerStub = mocks.Stub(); var viewCommandsHandlerMock = mocks.StrictMock(); - var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); - guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); + using (var treeViewControl = new TreeViewControl()) + { + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl); + guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); - mocks.ReplayAll(); + mocks.ReplayAll(); - // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + // Call + var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsFormsResources.CalculateAllIcon, - false); - + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup, + RingtoetsFormsResources.Calculate_all, + RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsFormsResources.CalculateAllIcon, + false); + } mocks.VerifyAll(); } @@ -458,27 +465,27 @@ var applicationFeatureCommandHandlerStub = mocks.Stub(); var exportImportHandlerStub = mocks.Stub(); var viewCommandsHandlerMock = mocks.StrictMock(); - var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); - guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); + using (var treeViewControl = new TreeViewControl()) + { + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl); + guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); - mocks.ReplayAll(); + mocks.ReplayAll(); - // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + // Call + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup]; + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup]; - Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); - + Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } mocks.VerifyAll(); } @@ -519,24 +526,25 @@ var applicationFeatureCommandHandlerStub = mocks.Stub(); var exportImportHandlerStub = mocks.Stub(); var viewCommandsHandlerMock = mocks.StrictMock(); - var treeViewControlMock = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock); - guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); + using (var treeViewControl = new TreeViewControl()) + { + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl); + guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false); - viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); + viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false); - mocks.ReplayAll(); + mocks.ReplayAll(); - // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + // Call + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip, - RingtoetsFormsResources.CalculateIcon); + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, + RingtoetsFormsResources.Calculate_all, + RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip, + RingtoetsFormsResources.CalculateIcon); + } mocks.VerifyAll(); } @@ -545,7 +553,6 @@ { // Setup var mainWindowStub = mocks.Stub(); - var treeViewControlMock = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new HeightStructuresFailureMechanism(); @@ -584,40 +591,42 @@ failureMechanism, assessmentSection); - guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindowStub); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + guiMock.Expect(g => g.MainWindow).Return(mainWindowStub); - mocks.ReplayAll(); + mocks.ReplayAll(); - plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControlMock); + plugin.Gui = guiMock; + var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl); - DialogBoxHandler = (name, wnd) => - { - // Expect an activity dialog which is automatically closed - }; + DialogBoxHandler = (name, wnd) => + { + // Expect an activity dialog which is automatically closed + }; - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages => - { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages => + { + var messageList = messages.ToList(); - // Assert - Assert.AreEqual(12, messageList.Count); - StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); - StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); - StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]); - Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[3]); - StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[4]); - StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[5]); - StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[6]); - StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]); - Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[8]); - StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]); - Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]); - Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]); - }); - + // Assert + Assert.AreEqual(12, messageList.Count); + StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); + StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); + StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]); + Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[3]); + StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[4]); + StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[5]); + StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[6]); + StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]); + Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[8]); + StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]); + Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]); + Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]); + }); + } mocks.VerifyAll(); } @@ -638,31 +647,32 @@ }; var observerMock = mocks.StrictMock(); - var treeViewControlMock = mocks.StrictMock(); - observerMock.Expect(o => o.UpdateObserver()); - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder); - mocks.ReplayAll(); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - group.Children.Add(calculationGroup); - nodeData.Attach(observerMock); + mocks.ReplayAll(); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + group.Children.Add(calculationGroup); + nodeData.Attach(observerMock); - // Precondition - Assert.AreEqual(1, group.Children.Count); + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - // Call - contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick(); + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Assert - Assert.AreEqual(2, group.Children.Count); - var newlyAddedItem = group.Children.Last(); - Assert.IsInstanceOf(newlyAddedItem); - Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name, - "An item with the same name default name already exists, therefore '(1)' needs to be appended."); + // Call + contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick(); + // Assert + Assert.AreEqual(2, group.Children.Count); + var newlyAddedItem = group.Children.Last(); + Assert.IsInstanceOf(newlyAddedItem); + Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name, + "An item with the same name default name already exists, therefore '(1)' needs to be appended."); + } mocks.VerifyAll(); } @@ -682,31 +692,32 @@ Name = "Nieuwe berekening" }; var observerMock = mocks.StrictMock(); - var treeViewControlMock = mocks.StrictMock(); - observerMock.Expect(o => o.UpdateObserver()); - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder); - mocks.ReplayAll(); + using (var treeViewControl = new TreeViewControl()) + { + guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - group.Children.Add(calculation); - nodeData.Attach(observerMock); + mocks.ReplayAll(); - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + group.Children.Add(calculation); + nodeData.Attach(observerMock); - // Precondition - Assert.AreEqual(1, group.Children.Count); + var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - // Call - contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick(); + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Assert - Assert.AreEqual(2, group.Children.Count); - var newlyAddedItem = group.Children.Last(); - Assert.IsInstanceOf(newlyAddedItem); - Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, - "An item with the same name default name already exists, therefore '(1)' needs to be appended."); + // Call + contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick(); + // Assert + Assert.AreEqual(2, group.Children.Count); + var newlyAddedItem = group.Children.Last(); + Assert.IsInstanceOf(newlyAddedItem); + Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, + "An item with the same name default name already exists, therefore '(1)' needs to be appended."); + } mocks.VerifyAll(); }