Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -225,40 +225,41 @@ mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl)) + { + // Assert + Assert.AreEqual(10, menu.Items.Count); - // Assert - Assert.AreEqual(10, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, + RingtoetsCommonFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip, + RingtoetsCommonFormsResources.FailureMechanismIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenRootGroupIndex, + RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all, + RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove, + RingtoetsCommonFormsResources.RemoveAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, - RingtoetsCommonFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip, - RingtoetsCommonFormsResources.FailureMechanismIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenRootGroupIndex, - RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all, - RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove, - RingtoetsCommonFormsResources.RemoveAllIcon, - false); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, - RingtoetsCommonFormsResources.Clear_all_output, - RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, + RingtoetsCommonFormsResources.Clear_all_output, + RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsCommonFormsResources.ClearIcon, + false); + } } } @@ -330,35 +331,36 @@ guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl)) + { + // Assert + Assert.AreEqual(9, menu.Items.Count); - // Assert - Assert.AreEqual(9, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, + RingtoetsCommonFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip, + RingtoetsCommonFormsResources.FailureMechanismIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, - RingtoetsCommonFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip, - RingtoetsCommonFormsResources.FailureMechanismIcon); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, - RingtoetsCommonFormsResources.Clear_all_output, - RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup, + RingtoetsCommonFormsResources.Clear_all_output, + RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsCommonFormsResources.ClearIcon, + false); + } } } @@ -391,14 +393,15 @@ mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + } } } @@ -438,14 +441,15 @@ mocks.ReplayAll(); // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndexRootGroup, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndexRootGroup, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + } } } @@ -485,15 +489,16 @@ mocks.ReplayAll(); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup]; - - Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } @@ -541,13 +546,14 @@ mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_ToolTip, - RingtoetsCommonFormsResources.CalculateAllIcon); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_ToolTip, + RingtoetsCommonFormsResources.CalculateAllIcon); + } } } @@ -580,14 +586,15 @@ mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + } } } @@ -627,14 +634,15 @@ mocks.ReplayAll(); // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndexRootGroup, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndexRootGroup, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + } } } @@ -674,15 +682,16 @@ mocks.ReplayAll(); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndexRootGroup]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndexRootGroup]; - - Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } @@ -730,13 +739,14 @@ mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.CalculationGroup_Validate_all_ToolTip, - RingtoetsCommonFormsResources.ValidateAllIcon); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.CalculationGroup_Validate_all_ToolTip, + RingtoetsCommonFormsResources.ValidateAllIcon); + } } } @@ -793,35 +803,37 @@ mocks.ReplayAll(); plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl); DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages => + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl)) { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages => + { + var messageList = messages.ToList(); - // Assert - Assert.AreEqual(14, 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]); - StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[3]); - Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[4]); - StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[5]); - StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[6]); - StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[7]); - StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[8]); - StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[9]); - Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[10]); - StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[11]); - Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[12]); - Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[13]); - }); + // Assert + Assert.AreEqual(14, 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]); + StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[3]); + Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[4]); + StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[5]); + StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[6]); + StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[7]); + StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[8]); + StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[9]); + Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[10]); + StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[11]); + Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[12]); + Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[13]); + }); + } } } @@ -876,20 +888,22 @@ mocks.ReplayAll(); plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl); - - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndexRootGroup].PerformClick(), messages => + + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl)) { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndexRootGroup].PerformClick(), messages => + { + var messageList = messages.ToList(); - // Assert - Assert.AreEqual(4, messageList.Count); - StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); - StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); - StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]); - StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]); - }); + // Assert + Assert.AreEqual(4, messageList.Count); + StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); + StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); + StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]); + StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]); + }); + } } } @@ -922,20 +936,21 @@ group.Children.Add(calculationGroup); nodeData.Attach(observerMock); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Precondition - Assert.AreEqual(1, group.Children.Count); + // Call + contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick(); - // 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."); + // 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."); + } } } @@ -967,20 +982,21 @@ group.Children.Add(calculation); nodeData.Attach(observerMock); - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Precondition - Assert.AreEqual(1, group.Children.Count); + // Call + contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick(); - // 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."); + // 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."); + } } } @@ -1023,13 +1039,14 @@ dialog.ClickOk(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRemoveAllChildrenRootGroupIndex].PerformClick(); - // Call - contextMenu.Items[contextMenuRemoveAllChildrenRootGroupIndex].PerformClick(); - - // Assert - Assert.IsEmpty(group.Children); + // Assert + Assert.IsEmpty(group.Children); + } } }