Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -249,32 +249,33 @@ plugin.Gui = guiMock; // Call - var menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView); + using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView)) + { + // Assert + Assert.AreEqual(7, menu.Items.Count); - // Assert - Assert.AreEqual(7, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, + RingtoetsCommonFormsResources.Checkbox_ticked); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, - RingtoetsCommonFormsResources.Checkbox_ticked); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndex, - RingtoetsCommonFormsResources.Clear_all_output, - RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndex, + RingtoetsCommonFormsResources.Clear_all_output, + RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsCommonFormsResources.ClearIcon, + false); + } } } @@ -302,15 +303,16 @@ plugin.Gui = guiMock; // Call - var menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView); + using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView)) + { + // Assert + Assert.AreEqual(2, menu.Items.Count); - // Assert - Assert.AreEqual(2, menu.Items.Count); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, - RingtoetsCommonFormsResources.Checkbox_empty); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, + RingtoetsCommonFormsResources.Checkbox_empty); + } } } @@ -336,10 +338,11 @@ plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); + } } // Assert // Assert expectancies are called in TearDown() @@ -366,10 +369,11 @@ plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); + } } // Assert // Assert expectancies are called in TearDown() @@ -397,14 +401,15 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - 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, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + } } } @@ -434,14 +439,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex, - 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, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + } } } @@ -472,15 +478,16 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex]; - - 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); + } } } @@ -519,13 +526,14 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Calculate_all_ToolTip, - RingtoetsCommonFormsResources.CalculateAllIcon); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Calculate_all_ToolTip, + RingtoetsCommonFormsResources.CalculateAllIcon); + } } } @@ -551,14 +559,15 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, - 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, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + } } } @@ -588,14 +597,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex, - 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, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + } } } @@ -626,15 +636,16 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex]; - - 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); + } } } @@ -673,13 +684,14 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, - RingtoetsCommonFormsResources.ValidateAllIcon); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, + RingtoetsCommonFormsResources.ValidateAllIcon); + } } } @@ -734,35 +746,37 @@ mocksRepository.ReplayAll(); plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(), messages => + using (var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndex].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]); + }); + } } } @@ -815,20 +829,22 @@ mocksRepository.ReplayAll(); plugin.Gui = guiMock; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(), messages => + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].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]); + }); + } } }