Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs =================================================================== diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision 223b2a4edc4ac816051c7eeecb735c34a6246574) +++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -755,9 +755,7 @@ var parentTag = GetParentTag(selectedNode); // Update the context menu (relevant in case of keyboard navigation in the tree view) - selectedNode.ContextMenuStrip = treeNodeInfo.ContextMenuStrip != null - ? treeNodeInfo.ContextMenuStrip(selectedNode.Tag, parentTag, this) - : null; + UpdateContextMenuStrip(selectedNode, treeNodeInfo, parentTag); if (treeView.ContextMenu != null && selectedNode.ContextMenuStrip != null) { @@ -823,9 +821,7 @@ var parentTag = GetParentTag(clickedNode); // Update the context menu - clickedNode.ContextMenuStrip = treeNodeInfo.ContextMenuStrip != null - ? treeNodeInfo.ContextMenuStrip(clickedNode.Tag, parentTag, this) - : null; + UpdateContextMenuStrip(clickedNode, treeNodeInfo, parentTag); return; } @@ -837,6 +833,17 @@ } } + private void UpdateContextMenuStrip(TreeNode node, TreeNodeInfo treeNodeInfo, object parentTag) + { + if (node.ContextMenuStrip != null) + { + node.ContextMenuStrip.Dispose(); + } + node.ContextMenuStrip = treeNodeInfo.ContextMenuStrip != null + ? treeNodeInfo.ContextMenuStrip(node.Tag, parentTag, this) + : null; + } + private bool IsOnCheckBox(Point point) { return treeView.HitTest(point).Location.ToString() == stateImageLocationString; Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -290,8 +290,9 @@ // Assert using (var treeViewControl = new TreeViewControl()) + using (var contextMenuStrip = treeNodeInfo.ContextMenuStrip(0, 1, treeViewControl)) { - Assert.AreEqual(1, treeNodeInfo.ContextMenuStrip(0, 1, treeViewControl).Items.Count); + Assert.AreEqual(1, contextMenuStrip.Items.Count); treeNodeInfo.OnDrop(0, 1, 2, 3, treeViewControl); Assert.AreEqual(1, onDropCounter); } Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs =================================================================== diff -u -r71144e484518b806157fb6613779981342542462 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs (.../MapDataCollectionTreeNodeInfoTest.cs) (revision 71144e484518b806157fb6613779981342542462) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs (.../MapDataCollectionTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -305,10 +305,11 @@ mocks.ReplayAll(); // Call - var contextMenu = info.ContextMenuStrip(mapDataCollection, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, Resources.MapPlusIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapDataCollection, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, Resources.MapPlusIcon); + } } } } Index: Ringtoets/Asphalt/src/Ringtoets.Asphalt.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rfdb3a9b9fb6e78d48d47b6fb1abe5db45f80b6dd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Asphalt/src/Ringtoets.Asphalt.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision fdb3a9b9fb6e78d48d47b6fb1abe5db45f80b6dd) +++ Ringtoets/Asphalt/src/Ringtoets.Asphalt.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -89,24 +89,6 @@ FailureMechanismEnabledContextMenuStrip, FailureMechanismDisabledContextMenuStrip); - yield return new TreeNodeInfo - { - Text = context => RingtoetsCommonFormsResources.Plugin_ForeShores_DisplayName, - Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon, - ForeColor = context => context.WrappedData.Any() ? - Color.FromKnownColor(KnownColor.ControlText) : - Color.FromKnownColor(KnownColor.GrayText), - ChildNodeObjects = context => context.WrappedData - .Cast() - .ToArray(), - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddImportItem() - .AddSeparator() - .AddCollapseAllItem() - .AddExpandAllItem() - .Build() - }; - yield return new TreeNodeInfo> { Text = context => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/Ringtoets.Asphalt.Plugin.Test.csproj =================================================================== diff -u -r5438eca33953e6bff6c34acf5c71a7c210c96f2b -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/Ringtoets.Asphalt.Plugin.Test.csproj (.../Ringtoets.Asphalt.Plugin.Test.csproj) (revision 5438eca33953e6bff6c34acf5c71a7c210c96f2b) +++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/Ringtoets.Asphalt.Plugin.Test.csproj (.../Ringtoets.Asphalt.Plugin.Test.csproj) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -54,7 +54,6 @@ Properties\GlobalAssembly.cs - Fisheye: Tag ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd refers to a dead (removed) revision in file `Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/TreeNodeInfos/ForehoreProfilesContextTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -96,9 +96,8 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(3, treeNodeInfos.Length); + Assert.AreEqual(2, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverFailureMechanismContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ForeshoreProfilesContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cbe47edc5aec1175bceda95452ebe5697eda181d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -755,6 +755,15 @@ } /// + /// Looks up a localized string similar to Voorlanden. + /// + public static string Foreshores_DisplayName { + get { + return ResourceManager.GetString("Foreshores_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap GeneralFolderIcon { @@ -1022,15 +1031,6 @@ } /// - /// Looks up a localized string similar to Voorlanden. - /// - public static string Plugin_ForeShores_DisplayName { - get { - return ResourceManager.GetString("Plugin_ForeShores_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De veiligheidsfactor voor deze berekening.. /// public static string ProbabilityAssessmentOutput_FactorOfSafety_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision cbe47edc5aec1175bceda95452ebe5697eda181d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -442,7 +442,7 @@ Genereer &berekeningen... - + Voorlanden Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -1014,10 +1014,11 @@ }); // Call - ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSectionMock, treeView); - - // Assert - Assert.AreSame(contextMenuStripRelevant, result); + using (ContextMenuStrip contextMenuStrip = treeNodeInfo.ContextMenuStrip(context, assessmentSectionMock, treeView)) + { + // Assert + Assert.AreSame(contextMenuStripRelevant, contextMenuStrip); + } mocks.VerifyAll(); } } @@ -1058,10 +1059,11 @@ }); // Call - ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSectionMock, treeView); - - // Assert - Assert.AreSame(contextMenuStripNotRelevant, result); + using (ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSectionMock, treeView)) + { + // Assert + Assert.AreSame(contextMenuStripNotRelevant, result); + } mocks.VerifyAll(); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -238,26 +238,27 @@ })); // Call - var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl)) + { + // Assert + Assert.AreEqual(6, menu.Items.Count); - // Assert - Assert.AreEqual(6, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Validate_ToolTip, + RingtoetsCommonFormsResources.ValidateIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Validate_ToolTip, - RingtoetsCommonFormsResources.ValidateIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Calculate_ToolTip, + RingtoetsCommonFormsResources.CalculateIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Calculate_ToolTip, - RingtoetsCommonFormsResources.CalculateIcon); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex, - RingtoetsCommonFormsResources.Clear_output, - RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear, - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex, + RingtoetsCommonFormsResources.Clear_output, + RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear, + RingtoetsCommonFormsResources.ClearIcon, + false); + } } } @@ -281,14 +282,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.CalculateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.CalculateIcon, + false); + } } } @@ -317,14 +319,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.CalculateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.CalculateIcon, + false); + } } } @@ -355,15 +358,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[contextMenuCalculateIndex]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex]; - - Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } @@ -402,13 +406,14 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Calculate_ToolTip, - RingtoetsCommonFormsResources.CalculateIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Calculate_ToolTip, + RingtoetsCommonFormsResources.CalculateIcon); + } } } @@ -432,14 +437,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.ValidateIcon, - false); + using (var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.ValidateIcon, + false); + } } } @@ -468,14 +474,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.ValidateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.ValidateIcon, + false); + } } } @@ -506,15 +513,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[contextMenuValidateIndex]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex]; - - Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } @@ -553,13 +561,14 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Validate_ToolTip, - RingtoetsCommonFormsResources.ValidateIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Validate_ToolTip, + RingtoetsCommonFormsResources.ValidateIcon); + } } } @@ -618,29 +627,30 @@ calculation.Attach(observerMock); - var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl); - DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // When - Action action = () => { contextMenuAdapter.Items[contextMenuCalculateIndex].PerformClick(); }; - - // Then - TestHelper.AssertLogMessages(action, messages => + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { - var msgs = messages.ToArray(); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); - StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); - StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); - }); + // When + Action action = () => { contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); }; - Assert.IsNull(calculation.Output); + // Then + TestHelper.AssertLogMessages(action, messages => + { + var msgs = messages.ToArray(); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); + StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + }); + + Assert.IsNull(calculation.Output); + } } } @@ -695,18 +705,19 @@ calculation.Attach(observerMock); - var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl); - - // When - Action action = () => { contextMenuAdapter.Items[contextMenuValidateIndex].PerformClick(); }; - - // Then - TestHelper.AssertLogMessages(action, messages => + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { - var msgs = messages.ToArray(); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - }); + // When + Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); + + // Then + TestHelper.AssertLogMessages(action, messages => + { + var msgs = messages.ToArray(); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + }); + } } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -233,38 +233,39 @@ mocks.ReplayAll(); // Call - ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl); - - // Assert - Assert.AreEqual(12, 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, 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); + using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl)) + { + // Assert + Assert.AreEqual(12, 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, 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); + } } } @@ -334,35 +335,36 @@ mocks.ReplayAll(); // 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); + } } } @@ -403,14 +405,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); + } } } @@ -458,14 +461,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); + } } } @@ -513,15 +517,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); + } } } @@ -568,13 +573,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); + } } } @@ -600,14 +606,15 @@ mocks.ReplayAll(); // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, - GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip, - RingtoetsCommonFormsResources.GenerateScenariosIcon, - false); + using (var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, + GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip, + RingtoetsCommonFormsResources.GenerateScenariosIcon, + false); + } } } @@ -634,13 +641,14 @@ mocks.ReplayAll(); // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, - GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsPlugin_CreateGenerateCalculationsItem_ToolTip, - RingtoetsCommonFormsResources.GenerateScenariosIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, + GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsPlugin_CreateGenerateCalculationsItem_ToolTip, + RingtoetsCommonFormsResources.GenerateScenariosIcon); + } } } @@ -697,20 +705,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]); + }); + } } } @@ -770,35 +780,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 grasbekleding erosie kruin en binnentalud '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 grasbekleding erosie kruin en binnentalud '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 grasbekleding erosie kruin en binnentalud '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 grasbekleding erosie kruin en binnentalud '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]); + }); + } } } @@ -830,20 +842,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."); + } } } @@ -875,20 +888,21 @@ group.Children.Add(calculationItem); 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."); + } } } @@ -930,13 +944,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); + } } } @@ -985,14 +1000,15 @@ new ButtonTester("OkButton", selectionDialog).Click(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // When + contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); - // When - contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); - - // Then - var grassCoverErosionInwardsCalculations = failureMechanism.Calculations.OfType().ToArray(); - Assert.AreEqual(1, grassCoverErosionInwardsCalculations.Length); + // Then + var grassCoverErosionInwardsCalculations = failureMechanism.Calculations.OfType().ToArray(); + Assert.AreEqual(1, grassCoverErosionInwardsCalculations.Length); + } } } @@ -1041,13 +1057,14 @@ new ButtonTester("CustomCancelButton", selectionDialog).Click(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // When + contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); - // When - contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); - - // Then - Assert.AreEqual(0, failureMechanism.Calculations.OfType().Count()); + // Then + Assert.AreEqual(0, failureMechanism.Calculations.OfType().Count()); + } } } @@ -1105,17 +1122,18 @@ new ButtonTester("OkButton", selectionDialog).Click(); }; - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + string expectedNewName = NamingHelper.GetUniqueName(failureMechanism.CalculationsGroup.Children, existingCalculationName, c => c.Name); - string expectedNewName = NamingHelper.GetUniqueName(failureMechanism.CalculationsGroup.Children, existingCalculationName, c => c.Name); + // When + contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); - // When - contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick(); - - // Then - var grassCoverErosionInwardsCalculations = failureMechanism.Calculations.OfType().ToArray(); - Assert.AreEqual(2, grassCoverErosionInwardsCalculations.Length); - Assert.AreEqual(expectedNewName, grassCoverErosionInwardsCalculations[1].Name); + // Then + var grassCoverErosionInwardsCalculations = failureMechanism.Calculations.OfType().ToArray(); + Assert.AreEqual(2, grassCoverErosionInwardsCalculations.Length); + Assert.AreEqual(expectedNewName, grassCoverErosionInwardsCalculations[1].Name); + } } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -260,33 +260,34 @@ 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, 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, 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); + } } } @@ -314,15 +315,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); + } } } @@ -348,10 +350,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() @@ -378,10 +381,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() @@ -409,14 +413,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); + } } } @@ -446,14 +451,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); + } } } @@ -484,15 +490,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); + } } } @@ -531,13 +538,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); + } } } @@ -562,14 +570,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); + } } } @@ -599,14 +608,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); + } } } @@ -637,15 +647,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); + } } } @@ -684,13 +695,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); + } } } @@ -749,35 +761,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 (ContextMenuStrip 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 grasbekleding erosie kruin en binnentalud '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 grasbekleding erosie kruin en binnentalud '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 grasbekleding erosie kruin en binnentalud '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 grasbekleding erosie kruin en binnentalud '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]); + }); + } } } @@ -833,20 +847,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]); + }); + } } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -21,6 +21,7 @@ using System.Drawing; using System.Linq; +using System.Windows.Forms; using Core.Common.Base; using Core.Common.Controls.TreeView; using Core.Common.Gui; @@ -336,13 +337,14 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); - - // Assert - Assert.IsFalse(failureMechanism.IsRelevant); + // Assert + Assert.IsFalse(failureMechanism.IsRelevant); + } } } @@ -374,13 +376,14 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); - - // Assert - Assert.IsTrue(failureMechanism.IsRelevant); + // Assert + Assert.IsTrue(failureMechanism.IsRelevant); + } } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -228,28 +228,29 @@ plugin.Gui = guiMock; // Call - var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl)) + { + // Assert + Assert.AreEqual(6, menu.Items.Count); - // Assert - Assert.AreEqual(6, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.ValidateIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.ValidateIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.CalculateIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.CalculateIcon, - false); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex, - RingtoetsCommonFormsResources.Clear_output, - RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear, - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex, + RingtoetsCommonFormsResources.Clear_output, + RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear, + RingtoetsCommonFormsResources.ClearIcon, + false); + } } } @@ -273,14 +274,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.CalculateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.CalculateIcon, + false); + } } } @@ -310,14 +312,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.CalculateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.CalculateIcon, + false); + } } } @@ -348,15 +351,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[contextMenuCalculateIndex]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex]; - - Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } @@ -395,13 +399,14 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Calculate_ToolTip, - RingtoetsCommonFormsResources.CalculateIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, + RingtoetsCommonFormsResources.Calculate, + RingtoetsCommonFormsResources.Calculate_ToolTip, + RingtoetsCommonFormsResources.CalculateIcon); + } } } @@ -425,14 +430,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.ValidateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.ValidateIcon, + false); + } } } @@ -462,14 +468,15 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.ValidateIcon, - false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.ValidateIcon, + false); + } } } @@ -500,15 +507,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[contextMenuValidateIndex]; - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex]; - - Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } @@ -547,13 +555,14 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, - RingtoetsCommonFormsResources.Validate, - RingtoetsCommonFormsResources.Validate_ToolTip, - RingtoetsCommonFormsResources.ValidateIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, + RingtoetsCommonFormsResources.Validate, + RingtoetsCommonFormsResources.Validate_ToolTip, + RingtoetsCommonFormsResources.ValidateIcon); + } } } @@ -610,31 +619,32 @@ calculation.Attach(observerMock); - var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl); - DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // When - Action action = () => { contextMenuAdapter.Items[contextMenuCalculateIndex].PerformClick(); }; - - // Then - TestHelper.AssertLogMessages(action, messages => + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { - var msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); - StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); - StringAssert.StartsWith(string.Format("De berekening voor hoogte kunstwerk '{0}' is niet gelukt.", calculation.Name), msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); - StringAssert.StartsWith(string.Format("Uitvoeren van '{0}' is mislukt.", calculation.Name), msgs[6]); - }); + // When + Action action = () => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); - Assert.IsNull(calculation.Output); + // Then + TestHelper.AssertLogMessages(action, messages => + { + var msgs = messages.ToArray(); + Assert.AreEqual(7, msgs.Length); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); + StringAssert.StartsWith(string.Format("De berekening voor hoogte kunstwerk '{0}' is niet gelukt.", calculation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Uitvoeren van '{0}' is mislukt.", calculation.Name), msgs[6]); + }); + + Assert.IsNull(calculation.Output); + } } } @@ -687,19 +697,20 @@ calculation.Attach(observerMock); - var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl); - - // When - Action action = () => { contextMenuAdapter.Items[contextMenuValidateIndex].PerformClick(); }; - - // Then - TestHelper.AssertLogMessages(action, messages => + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { - var msgs = messages.ToArray(); - Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - }); + // When + Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); + + // Then + TestHelper.AssertLogMessages(action, messages => + { + var msgs = messages.ToArray(); + Assert.AreEqual(2, msgs.Length); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + }); + } } } 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); + } } } 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]); + }); + } } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rf2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision f2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -529,6 +529,24 @@ ContextMenuStrip = WaveHeightLocationsContextMenuStrip }; + yield return new TreeNodeInfo + { + Text = context => RingtoetsCommonFormsResources.Foreshores_DisplayName, + Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon, + ForeColor = context => context.WrappedData.Any() ? + Color.FromKnownColor(KnownColor.ControlText) : + Color.FromKnownColor(KnownColor.GrayText), + ChildNodeObjects = context => context.WrappedData + .Cast() + .ToArray(), + ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) + .AddImportItem() + .AddSeparator() + .AddCollapseAllItem() + .AddExpandAllItem() + .Build() + }; + yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -0,0 +1,84 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.Base; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Forms.PresentationObjects; + +namespace Ringtoets.Integration.Forms.Test.PresentationObjects +{ + [TestFixture] + public class ForeshoreProfilesContextTest + { + [Test] + public void Constructor_ForeshoreProfilesNull_ThrowArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + // Call + TestDelegate call = () => new ForeshoreProfilesContext(null, assessmentSection); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("wrappedData", paramName); + mocks.VerifyAll(); + } + + [Test] + public void Constructor_ParentAssessmentSectionNull_ThrowArgumentNullException() + { + // Setup + var foreshores = new ObservableList(); + + // Call + TestDelegate call = () => new ForeshoreProfilesContext(foreshores, null); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("parentAssessmentSection", paramName); + } + + [Test] + public void Constructor_ValidArgument_ExpectedValues() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var foreshores = new ObservableList(); + + // Call + var context = new ForeshoreProfilesContext(foreshores, assessmentSection); + + // Assert + Assert.AreSame(foreshores, context.WrappedData); + Assert.AreSame(assessmentSection, context.ParentAssessmentSection); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj =================================================================== diff -u -rbbf215488ec670989eca94379ea62ef4c9155540 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision bbf215488ec670989eca94379ea62ef4c9155540) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -72,6 +72,7 @@ + @@ -95,6 +96,7 @@ + Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -177,14 +177,15 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + const string expectedItemText = "Alles be&rekenen"; + const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de toetspeilen te berekenen."; - // Assert - const string expectedItemText = "Alles be&rekenen"; - const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de toetspeilen te berekenen."; - - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunAssessmentLevelCalculationsIndex, - expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunAssessmentLevelCalculationsIndex, + expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon, false); + } } } @@ -215,14 +216,15 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + const string expectedItemText = @"Alles be&rekenen"; + const string expectedItemTooltip = @"Alle toetspeilen berekenen."; - // Assert - const string expectedItemText = @"Alles be&rekenen"; - const string expectedItemTooltip = @"Alle toetspeilen berekenen."; - - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunAssessmentLevelCalculationsIndex, - expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunAssessmentLevelCalculationsIndex, + expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon); + } } } @@ -274,20 +276,21 @@ plugin.Gui = guiMock; plugin.Activate(); - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl); + using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl)) + { + // When + Action action = () => { contextMenuAdapter.Items[contextMenuRunAssessmentLevelCalculationsIndex].PerformClick(); }; - // When - Action action = () => { contextMenuAdapter.Items[contextMenuRunAssessmentLevelCalculationsIndex].PerformClick(); }; + // Then + string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", + hydraulicBoundaryDatabase.FilePath); + TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple(message, LogLevelConstant.Error)); - // Then - string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", - hydraulicBoundaryDatabase.FilePath); - TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple(message, LogLevelConstant.Error)); + Assert.IsNaN(hydraulicBoundaryLocation1.DesignWaterLevel); // No result set - Assert.IsNaN(hydraulicBoundaryLocation1.DesignWaterLevel); // No result set - - // Previous result not cleared - Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation2.DesignWaterLevel, hydraulicBoundaryLocation2.DesignWaterLevel.GetAccuracy()); + // Previous result not cleared + Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation2.DesignWaterLevel, hydraulicBoundaryLocation2.DesignWaterLevel.GetAccuracy()); + } } } mockRepository.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -24,6 +24,7 @@ using System.Drawing; using System.Linq; using System.Reflection; +using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Geometry; using Core.Common.Controls.TreeView; @@ -372,12 +373,13 @@ var info = GetInfo(plugin); // Call - var menu = info.ContextMenuStrip(context, assessmentSection, treeView); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndex, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, - RingtoetsCommonFormsResources.Checkbox_ticked); + using (ContextMenuStrip menu = info.ContextMenuStrip(context, assessmentSection, treeView)) + { + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndex, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, + RingtoetsCommonFormsResources.Checkbox_ticked); + } } // Assert @@ -422,13 +424,14 @@ var info = GetInfo(plugin); - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndex].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndex].PerformClick(); - - // Assert - Assert.IsFalse(failureMechanism.IsRelevant); + // Assert + Assert.IsFalse(failureMechanism.IsRelevant); + } } } mocks.VerifyAll(); @@ -468,13 +471,14 @@ var info = GetInfo(plugin); - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndex].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndex].PerformClick(); - - // Assert - Assert.IsTrue(failureMechanism.IsRelevant); + // Assert + Assert.IsTrue(failureMechanism.IsRelevant); + } } } mocks.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileContextTreeNodeInfoTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileContextTreeNodeInfoTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileContextTreeNodeInfoTest.cs (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -0,0 +1,209 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Drawing; +using System.Linq; +using System.Windows.Forms; +using Core.Common.Base; +using Core.Common.Base.Geometry; +using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.ContextMenu; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.Integration.Plugin; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos +{ + [TestFixture] + public class ForeshoreProfileContextTreeNodeInfoTest + { + private RingtoetsPlugin plugin; + private TreeNodeInfo info; + + [SetUp] + public void SetUp() + { + plugin = new RingtoetsPlugin(); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ForeshoreProfilesContext)); + } + + [TearDown] + public void TearDown() + { + plugin.Dispose(); + info = null; + } + + [Test] + public void Initialized_ExpectedValues() + { + // Assert + Assert.IsNull(info.CanCheck); + Assert.IsNull(info.CanDrag); + Assert.IsNull(info.CanDrop); + Assert.IsNull(info.CanInsert); + Assert.IsNull(info.CanRemove); + Assert.IsNull(info.CanRename); + Assert.IsNull(info.EnsureVisibleOnCreate); + Assert.IsNull(info.IsChecked); + Assert.IsNull(info.OnDrop); + Assert.IsNull(info.OnNodeChecked); + Assert.IsNull(info.OnNodeRemoved); + Assert.IsNull(info.OnNodeRenamed); + } + + [Test] + public void Text_Always_ReturnText() + { + // Call + string text = info.Text(null); + + // Assert + Assert.AreEqual("Voorlanden", text); + } + + [Test] + public void Image_Always_ReturnFolderIcon() + { + // Call + Image icon = info.Image(null); + + // Assert + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, icon); + } + + [Test] + public void ForeColor_CollectionIsEmpty_ReturnGrayText() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var emptyCollection = new ObservableList(); + var context = new ForeshoreProfilesContext(emptyCollection, assessmentSection); + + // Call + Color color = info.ForeColor(context); + + // Assert + Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color); + mocks.ReplayAll(); + } + + [Test] + public void ForeColor_CollectionHasElements_ReturnControlText() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var emptyCollection = new ObservableList + { + new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()) + }; + var context = new ForeshoreProfilesContext(emptyCollection, assessmentSection); + + // Call + Color color = info.ForeColor(context); + + // Assert + Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color); + mocks.ReplayAll(); + } + + [Test] + public void ChildNodeObjects_Always_ReturnChildrenOfCollection() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var profile1 = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()); + var profile2 = new ForeshoreProfile(new Point2D(1, 1), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()); + var profile3 = new ForeshoreProfile(new Point2D(2, 2), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()); + var emptyCollection = new ObservableList + { + profile1, + profile2, + profile3, + }; + var context = new ForeshoreProfilesContext(emptyCollection, assessmentSection); + + // Call + object[] children = info.ChildNodeObjects(context); + + // Assert + var expectedChildren = new[] + { + profile1, + profile2, + profile3 + }; + CollectionAssert.AreEqual(expectedChildren, children); + mocks.ReplayAll(); + } + + [Test] + public void ContextMenuStrip_Always_ReturnContextMenuStrip() + { + // Setup + var mocks = new MockRepository(); + using (var treeViewControl = new TreeViewControl()) + { + var assessmentSection = mocks.Stub(); + + var emptyCollection = new ObservableList(); + var context = new ForeshoreProfilesContext(emptyCollection, assessmentSection); + + var contextMenuBuilder = mocks.Stub(); + contextMenuBuilder.Expect(b => b.AddImportItem()).Return(contextMenuBuilder); + contextMenuBuilder.Expect(b => b.AddSeparator()).Return(contextMenuBuilder); + contextMenuBuilder.Expect(b => b.AddCollapseAllItem()).Return(contextMenuBuilder); + contextMenuBuilder.Expect(b => b.AddExpandAllItem()).Return(contextMenuBuilder); + contextMenuBuilder.Expect(b => b.Build()).Return(null); + + var gui = mocks.Stub(); + gui.Stub(g => g.Get(context, treeViewControl)).Return(contextMenuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + mocks.ReplayAll(); + + plugin.Gui = gui; + + // Call + info.ContextMenuStrip(context, null, treeViewControl); + + // Assert + plugin.Dispose(); + mocks.VerifyAll(); + } + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rf2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision f2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -286,21 +286,22 @@ TreeNodeInfo info = GetInfo(plugin); plugin.Gui = gui; - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl); - - // When - Action action = () => contextMenuAdapter.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); - - // Then - TestHelper.AssertLogMessages(action, messages => + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl)) { - string[] msgs = messages.ToArray(); - Assert.AreEqual(2, msgs.Length); - Assert.AreEqual("De hydraulische randvoorwaardenlocaties zijn ingelezen.", msgs[0]); - Assert.AreEqual(string.Format("Database op pad '{0}' gekoppeld.", testFile), msgs[1]); - }); + // When + Action action = () => contextMenuStrip.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); - Assert.IsNotNull(assessmentSection.HydraulicBoundaryDatabase); + // Then + TestHelper.AssertLogMessages(action, messages => + { + string[] msgs = messages.ToArray(); + Assert.AreEqual(2, msgs.Length); + Assert.AreEqual("De hydraulische randvoorwaardenlocaties zijn ingelezen.", msgs[0]); + Assert.AreEqual(string.Format("Database op pad '{0}' gekoppeld.", testFile), msgs[1]); + }); + + Assert.IsNotNull(assessmentSection.HydraulicBoundaryDatabase); + } } mocks.VerifyAll(); } @@ -333,17 +334,18 @@ TreeNodeInfo info = GetInfo(plugin); plugin.Gui = gui; - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl); + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl)) + { + // When + Action action = () => contextMenuStrip.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); - // When - Action action = () => contextMenuAdapter.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); + // Then + string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Kon geen locaties verkrijgen van de database. Het bestand wordt overgeslagen.", + testFile); + TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - // Then - string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Kon geen locaties verkrijgen van de database. Het bestand wordt overgeslagen.", - testFile); - TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - - Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase); + Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase); + } } mocks.VerifyAll(); } @@ -376,18 +378,19 @@ TreeNodeInfo info = GetInfo(plugin); plugin.Gui = gui; - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl); + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl)) + { + // When + Action action = () => contextMenuStrip.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); - // When - Action action = () => contextMenuAdapter.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); + // Then + string expectedMessage = + string.Format("Fout bij het lezen van bestand '{0}': Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand.", + testFile); + TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - // Then - string expectedMessage = - string.Format("Fout bij het lezen van bestand '{0}': Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand.", - testFile); - TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - - Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase); + Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase); + } } mocks.VerifyAll(); } @@ -447,21 +450,22 @@ TreeNodeInfo info = GetInfo(plugin); plugin.Gui = gui; - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl); + using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl)) + { + // When + Action action = () => contextMenuAdapter.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); - // When - Action action = () => contextMenuAdapter.Items[contextMenuImportHydraulicBoundaryDatabaseIndex].PerformClick(); + // Then + string expectedMessage = string.Format("Database op pad '{0}' gekoppeld.", validFile); + TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - // Then - string expectedMessage = string.Format("Database op pad '{0}' gekoppeld.", validFile); - TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - - Assert.IsNotNull(assessmentSection.HydraulicBoundaryDatabase); - Assert.AreEqual(currentFilePath, assessmentSection.HydraulicBoundaryDatabase.FilePath); - Assert.AreEqual(currentVersion, assessmentSection.HydraulicBoundaryDatabase.Version); - CollectionAssert.AreEqual(currentLocations, assessmentSection.HydraulicBoundaryDatabase.Locations); - Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations.First(), pipingCalculation.InputParameters.HydraulicBoundaryLocation); - Assert.AreSame(pipingOutput, pipingCalculation.Output); + Assert.IsNotNull(assessmentSection.HydraulicBoundaryDatabase); + Assert.AreEqual(currentFilePath, assessmentSection.HydraulicBoundaryDatabase.FilePath); + Assert.AreEqual(currentVersion, assessmentSection.HydraulicBoundaryDatabase.Version); + CollectionAssert.AreEqual(currentLocations, assessmentSection.HydraulicBoundaryDatabase.Locations); + Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations.First(), pipingCalculation.InputParameters.HydraulicBoundaryLocation); + Assert.AreSame(pipingOutput, pipingCalculation.Output); + } } mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs =================================================================== diff -u -rdca4da4c1f78e4074d1a4513411e3509344ec169 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision dca4da4c1f78e4074d1a4513411e3509344ec169) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -20,6 +20,7 @@ // All rights reserved. using System.Linq; +using System.Windows.Forms; using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.ContextMenu; @@ -187,11 +188,12 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(project, null, treeViewControl); - - const string expectedItemText = "T&raject toevoegen..."; - const string expectedItemTooltip = "Voeg een nieuw traject toe aan het project."; - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, Resources.AddAssessmentSectionFolder); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(project, null, treeViewControl)) + { + const string expectedItemText = "T&raject toevoegen..."; + const string expectedItemTooltip = "Voeg een nieuw traject toe aan het project."; + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, Resources.AddAssessmentSectionFolder); + } } } // Assert Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -178,13 +178,14 @@ plugin.Gui = guiMock; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - const string expectedItemText = "Alles be&rekenen"; - const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de golfhoogtes te berekenen."; - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex, - expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon, false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + const string expectedItemText = "Alles be&rekenen"; + const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de golfhoogtes te berekenen."; + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex, + expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon, false); + } } } @@ -220,14 +221,15 @@ plugin.Gui = guiMock; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + const string expectedItemText = "Alles be&rekenen"; + const string expectedItemTooltip = "Alle golfhoogtes berekenen."; - // Assert - const string expectedItemText = "Alles be&rekenen"; - const string expectedItemTooltip = "Alle golfhoogtes berekenen."; - - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex, - expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex, + expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon); + } } } @@ -324,20 +326,21 @@ plugin.Gui = guiMock; plugin.Activate(); - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl); + using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl)) + { + // When + Action action = () => contextMenuAdapter.Items[contextMenuRunWaveHeightCalculationsIndex].PerformClick(); - // When - Action action = () => { contextMenuAdapter.Items[contextMenuRunWaveHeightCalculationsIndex].PerformClick(); }; + // Then + string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", + hydraulicBoundaryDatabase.FilePath); + TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple(message, LogLevelConstant.Error)); - // Then - string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", - hydraulicBoundaryDatabase.FilePath); - TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple(message, LogLevelConstant.Error)); + Assert.IsNaN(hydraulicBoundaryLocation1.WaveHeight); // No result set - Assert.IsNaN(hydraulicBoundaryLocation1.WaveHeight); // No result set - - // Previous result not cleared - Assert.AreEqual(waveHeight, hydraulicBoundaryLocation2.WaveHeight, hydraulicBoundaryLocation2.WaveHeight.GetAccuracy()); + // Previous result not cleared + Assert.AreEqual(waveHeight, hydraulicBoundaryLocation2.WaveHeight, hydraulicBoundaryLocation2.WaveHeight.GetAccuracy()); + } } } mockRepository.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -400,7 +400,7 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(24, treeNodeInfos.Length); + Assert.AreEqual(25, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(IAssessmentSection))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ReferenceLineContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContext))); @@ -410,6 +410,7 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HydraulicBoundaryDatabaseContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(DesignWaterLevelLocationsContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveHeightLocationsContext))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ForeshoreProfilesContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs (.../EmptyPipingOutputTreeNodeInfoTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs (.../EmptyPipingOutputTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -138,7 +138,7 @@ info.ContextMenuStrip(null, null, treeViewControl); } // Assert - // Assert expectacies are called in TearDown() + // Assert expectancies are called in TearDown() } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -216,65 +216,66 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Assert + Assert.AreEqual(14, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, + "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", + RingtoetsCommonFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, + "Voeg een nieuwe berekening toe aan deze berekeningsmap.", + PipingFormsResources.PipingIcon); - // Assert - Assert.AreEqual(14, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, - "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", - RingtoetsCommonFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, - "Voeg een nieuwe berekening toe aan deze berekeningsmap.", - PipingFormsResources.PipingIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup, + RingtoetsCommonFormsResources.Validate_all, + "Valideer alle berekeningen binnen deze berekeningsmap.", + RingtoetsCommonFormsResources.ValidateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, + RingtoetsCommonFormsResources.Calculate_all, + "Voer alle berekeningen binnen deze berekeningsmap uit.", + RingtoetsCommonFormsResources.CalculateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputNestedGroupIndex, + "&Wis alle uitvoer...", + "Wis de uitvoer van alle berekeningen binnen deze berekeningsmap.", + RingtoetsCommonFormsResources.ClearIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup, - RingtoetsCommonFormsResources.Validate_all, - "Valideer alle berekeningen binnen deze berekeningsmap.", - RingtoetsCommonFormsResources.ValidateAllIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, - RingtoetsCommonFormsResources.Calculate_all, - "Voer alle berekeningen binnen deze berekeningsmap uit.", - RingtoetsCommonFormsResources.CalculateAllIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputNestedGroupIndex, - "&Wis alle uitvoer...", - "Wis de uitvoer van alle berekeningen binnen deze berekeningsmap.", - RingtoetsCommonFormsResources.ClearIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 7, + CoreCommonGuiResources.Rename, + CoreCommonGuiResources.Rename_ToolTip, + CoreCommonGuiResources.RenameIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 8, + CoreCommonGuiResources.Delete, + CoreCommonGuiResources.Delete_ToolTip, + CoreCommonGuiResources.DeleteIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 7, - CoreCommonGuiResources.Rename, - CoreCommonGuiResources.Rename_ToolTip, - CoreCommonGuiResources.RenameIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 8, - CoreCommonGuiResources.Delete, - CoreCommonGuiResources.Delete_ToolTip, - CoreCommonGuiResources.DeleteIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 10, + CoreCommonGuiResources.Expand_all, + CoreCommonGuiResources.Expand_all_ToolTip, + CoreCommonGuiResources.ExpandAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, 11, + CoreCommonGuiResources.Collapse_all, + CoreCommonGuiResources.Collapse_all_ToolTip, + CoreCommonGuiResources.CollapseAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, 10, - CoreCommonGuiResources.Expand_all, - CoreCommonGuiResources.Expand_all_ToolTip, - CoreCommonGuiResources.ExpandAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, 11, - CoreCommonGuiResources.Collapse_all, - CoreCommonGuiResources.Collapse_all_ToolTip, - CoreCommonGuiResources.CollapseAllIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, 13, + CoreCommonGuiResources.Properties, + CoreCommonGuiResources.Properties_ToolTip, + CoreCommonGuiResources.PropertiesHS, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, 13, - CoreCommonGuiResources.Properties, - CoreCommonGuiResources.Properties_ToolTip, - CoreCommonGuiResources.PropertiesHS, - false); - - CollectionAssert.AllItemsAreInstancesOfType(new[] - { - menu.Items[2], - menu.Items[6], - menu.Items[9], - menu.Items[12] - }, typeof(ToolStripSeparator)); + CollectionAssert.AllItemsAreInstancesOfType(new[] + { + menu.Items[2], + menu.Items[6], + menu.Items[9], + menu.Items[12] + }, typeof(ToolStripSeparator)); + } } [Test] @@ -413,14 +414,15 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, 1, - RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip, - RingtoetsCommonFormsResources.GenerateScenariosIcon, - false); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, 1, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, + PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip, + RingtoetsCommonFormsResources.GenerateScenariosIcon, + false); + } } } @@ -455,14 +457,15 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, 1, - RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip, - RingtoetsCommonFormsResources.GenerateScenariosIcon, - false); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, 1, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, + PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip, + RingtoetsCommonFormsResources.GenerateScenariosIcon, + false); + } } } @@ -500,13 +503,14 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, 1, - RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip, - RingtoetsCommonFormsResources.GenerateScenariosIcon); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, 1, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, + PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip, + RingtoetsCommonFormsResources.GenerateScenariosIcon); + } } } @@ -542,15 +546,16 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); - - // Assert - ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndexNestedGroup]; - ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndexNestedGroup]; - Assert.IsFalse(validateItem.Enabled); - Assert.IsFalse(calculateItem.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); - Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Assert + ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndexNestedGroup]; + ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndexNestedGroup]; + Assert.IsFalse(validateItem.Enabled); + Assert.IsFalse(calculateItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); + Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + } } } @@ -581,12 +586,13 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - ToolStripItem removeAllItemDisabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; - Assert.IsFalse(removeAllItemDisabled.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove, removeAllItemDisabled.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem removeAllItemDisabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; + Assert.IsFalse(removeAllItemDisabled.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove, removeAllItemDisabled.ToolTipText); + } } } @@ -623,12 +629,13 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - ToolStripItem removeAllItemEnabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; - Assert.IsTrue(removeAllItemEnabled.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all_Tooltip, removeAllItemEnabled.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem removeAllItemEnabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; + Assert.IsTrue(removeAllItemEnabled.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all_Tooltip, removeAllItemEnabled.ToolTipText); + } } } @@ -672,20 +679,21 @@ nodeData.Attach(observer); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Precondition - Assert.AreEqual(1, group.Children.Count); + // Call + contextMenu.Items[contextMenuAddCalculationGroupIndexNestedGroup].PerformClick(); - // Call - contextMenu.Items[contextMenuAddCalculationGroupIndexNestedGroup].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."); + } } } @@ -729,20 +737,21 @@ nodeData.Attach(observer); - var contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Precondition - Assert.AreEqual(1, group.Children.Count); + // Call + contextMenu.Items[contextMenuAddCalculationIndexNestedGroup].PerformClick(); - // Call - contextMenu.Items[contextMenuAddCalculationIndexNestedGroup].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."); + } } } @@ -791,23 +800,24 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); - - // Call - Action call = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick(); - - // Assert - TestHelper.AssertLogMessages(call, messages => + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { - var msgs = messages.ToArray(); - Assert.AreEqual(9, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validCalculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validCalculation.Name), msgs[1]); + // Call + Action call = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick(); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidCalculation.Name), msgs[2]); - // Some validation error from validation service - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidCalculation.Name), msgs[8]); - }); + // Assert + TestHelper.AssertLogMessages(call, messages => + { + var msgs = messages.ToArray(); + Assert.AreEqual(9, msgs.Length); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validCalculation.Name), msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validCalculation.Name), msgs[1]); + + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidCalculation.Name), msgs[2]); + // Some validation error from validation service + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidCalculation.Name), msgs[8]); + }); + } } } @@ -867,15 +877,16 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); - - DialogBoxHandler = (name, wnd) => + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) { - // Expect an activity dialog which is automatically closed - }; + DialogBoxHandler = (name, wnd) => + { + // Expect an activity dialog which is automatically closed + }; - // Call - contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick(); + // Call + contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick(); + } } // Assert } @@ -956,17 +967,19 @@ messageBox.ClickCancel(); } }; - var contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); - // Call - contextMenu.Items[contextMenuClearOutputNestedGroupIndex].PerformClick(); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuClearOutputNestedGroupIndex].PerformClick(); - // Assert - Assert.AreNotEqual(confirm, calculation1.HasOutput); - Assert.AreNotEqual(confirm, calculation2.HasOutput); + // Assert + Assert.AreNotEqual(confirm, calculation1.HasOutput); + Assert.AreNotEqual(confirm, calculation2.HasOutput); - Assert.AreEqual("Bevestigen", messageBoxTitle); - Assert.AreEqual("Weet u zeker dat u alle uitvoer wilt wissen?", messageBoxText); + Assert.AreEqual("Bevestigen", messageBoxTitle); + Assert.AreEqual("Weet u zeker dat u alle uitvoer wilt wissen?", messageBoxText); + } } } @@ -1023,15 +1036,16 @@ new ButtonTester("CustomCancelButton", selectionDialog).Click(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Call + contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); - // Call - contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); - - // Assert - Assert.NotNull(selectionDialog); - Assert.NotNull(grid); - Assert.AreEqual(2, rowCount); + // Assert + Assert.NotNull(selectionDialog); + Assert.NotNull(grid); + Assert.AreEqual(2, rowCount); + } } } @@ -1076,13 +1090,14 @@ dialog.ClickOk(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Call + contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex].PerformClick(); - // Call - contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex].PerformClick(); - - // Assert - Assert.IsEmpty(group.Children); + // Assert + Assert.IsEmpty(group.Children); + } } } @@ -1175,24 +1190,25 @@ new ButtonTester("OkButton", selectionDialog).Click(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // When + contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); - // When - contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); + // Then + var failureMechanismSectionResult1 = pipingFailureMechanism.SectionResults.First(); + var failureMechanismSectionResult2 = pipingFailureMechanism.SectionResults.ElementAt(1); - // Then - var failureMechanismSectionResult1 = pipingFailureMechanism.SectionResults.First(); - var failureMechanismSectionResult2 = pipingFailureMechanism.SectionResults.ElementAt(1); + var pipingCalculationScenarios = pipingFailureMechanism.Calculations.OfType().ToArray(); + Assert.AreEqual(2, failureMechanismSectionResult1.GetCalculationScenarios(pipingCalculationScenarios).Count()); - var pipingCalculationScenarios = pipingFailureMechanism.Calculations.OfType().ToArray(); - Assert.AreEqual(2, failureMechanismSectionResult1.GetCalculationScenarios(pipingCalculationScenarios).Count()); + foreach (var calculationScenario in failureMechanismSectionResult1.GetCalculationScenarios(pipingCalculationScenarios)) + { + Assert.IsInstanceOf(calculationScenario); + } - foreach (var calculationScenario in failureMechanismSectionResult1.GetCalculationScenarios(pipingCalculationScenarios)) - { - Assert.IsInstanceOf(calculationScenario); + CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(pipingCalculationScenarios)); } - - CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(pipingCalculationScenarios)); } } @@ -1293,15 +1309,16 @@ new ButtonTester("CustomCancelButton", selectionDialog).Click(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // When - contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); - - // Then - foreach (var failureMechanismSectionResult in pipingFailureMechanism.SectionResults) + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - CollectionAssert.IsEmpty(failureMechanismSectionResult.GetCalculationScenarios(pipingFailureMechanism.Calculations.OfType())); + // When + contextMenu.Items[customOnlyContextMenuAddGenerateCalculationsIndex].PerformClick(); + + // Then + foreach (var failureMechanismSectionResult in pipingFailureMechanism.SectionResults) + { + CollectionAssert.IsEmpty(failureMechanismSectionResult.GetCalculationScenarios(pipingFailureMechanism.Calculations.OfType())); + } } } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Geometry; using Core.Common.Controls.TreeView; @@ -198,12 +199,13 @@ plugin.Gui = gui; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, RingtoetsCommonFormsResources.Validate, RingtoetsCommonFormsResources.Validate_ToolTip, RingtoetsCommonFormsResources.ValidateIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, RingtoetsCommonFormsResources.Calculate, RingtoetsCommonFormsResources.Calculate_ToolTip, RingtoetsCommonFormsResources.CalculateIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, RingtoetsCommonFormsResources.Clear_output, RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear, RingtoetsCommonFormsResources.ClearIcon, false); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, RingtoetsCommonFormsResources.Validate, RingtoetsCommonFormsResources.Validate_ToolTip, RingtoetsCommonFormsResources.ValidateIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, RingtoetsCommonFormsResources.Calculate, RingtoetsCommonFormsResources.Calculate_ToolTip, RingtoetsCommonFormsResources.CalculateIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, RingtoetsCommonFormsResources.Clear_output, RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear, RingtoetsCommonFormsResources.ClearIcon, false); + } } } @@ -238,12 +240,13 @@ plugin.Gui = gui; // Call - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, RingtoetsCommonFormsResources.Validate, RingtoetsCommonFormsResources.Validate_ToolTip, RingtoetsCommonFormsResources.ValidateIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, RingtoetsCommonFormsResources.Calculate, RingtoetsCommonFormsResources.Calculate_ToolTip, RingtoetsCommonFormsResources.CalculateIcon); - TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, RingtoetsCommonFormsResources.Clear_output, RingtoetsCommonFormsResources.Clear_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, RingtoetsCommonFormsResources.Validate, RingtoetsCommonFormsResources.Validate_ToolTip, RingtoetsCommonFormsResources.ValidateIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, RingtoetsCommonFormsResources.Calculate, RingtoetsCommonFormsResources.Calculate_ToolTip, RingtoetsCommonFormsResources.CalculateIcon); + TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, RingtoetsCommonFormsResources.Clear_output, RingtoetsCommonFormsResources.Clear_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon); + } } } @@ -424,33 +427,34 @@ calculation.Attach(observer); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl); - DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // When - var calculateContextMenuItemIndex = 1; - Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); }; - - // Then - var expectedValidationMessageCount = 5; - TestHelper.AssertLogMessages(action, messages => + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl)) { - var msgs = messages.GetEnumerator(); - Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' gestart om: ", msgs.Current); - for (int i = 0; i < expectedValidationMessageCount; i++) + // When + var calculateContextMenuItemIndex = 1; + Action action = () => { contextMenuStrip.Items[calculateContextMenuItemIndex].PerformClick(); }; + + // Then + var expectedValidationMessageCount = 5; + TestHelper.AssertLogMessages(action, messages => { + var msgs = messages.GetEnumerator(); Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Validatie mislukt: ", msgs.Current); - } - Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", msgs.Current); - }); - Assert.IsNull(calculation.Output); + StringAssert.StartsWith("Validatie van 'Nieuwe berekening' gestart om: ", msgs.Current); + for (int i = 0; i < expectedValidationMessageCount; i++) + { + Assert.IsTrue(msgs.MoveNext()); + StringAssert.StartsWith("Validatie mislukt: ", msgs.Current); + } + Assert.IsTrue(msgs.MoveNext()); + StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", msgs.Current); + }); + Assert.IsNull(calculation.Output); + } } } @@ -482,17 +486,18 @@ calculation.Attach(observer); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl); + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl)) + { + // When + var validateContextMenuItemIndex = 0; + Action action = () => contextMenuStrip.Items[validateContextMenuItemIndex].PerformClick(); - // When - var validateContextMenuItemIndex = 0; - Action action = () => contextMenuAdapter.Items[validateContextMenuItemIndex].PerformClick(); - - // Then - var expectedValidationMessageCount = 5; - var expectedStatusMessageCount = 2; - var expectedLogMessageCount = expectedValidationMessageCount + expectedStatusMessageCount; - TestHelper.AssertLogMessagesCount(action, expectedLogMessageCount); + // Then + var expectedValidationMessageCount = 5; + var expectedStatusMessageCount = 2; + var expectedLogMessageCount = expectedValidationMessageCount + expectedStatusMessageCount; + TestHelper.AssertLogMessagesCount(action, expectedLogMessageCount); + } } } @@ -532,32 +537,33 @@ calculation.Attach(observer); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl); - DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // When - var calculateContextMenuItemIndex = 1; - Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); }; - - // Then - TestHelper.AssertLogMessages(action, messages => + using (var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl)) { - var msgs = messages.GetEnumerator(); - Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' gestart om: ", msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", msgs.Current); + // When + var calculateContextMenuItemIndex = 1; + Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); }; - Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", msgs.Current); - }); - Assert.IsNotNull(calculation.Output); + // Then + TestHelper.AssertLogMessages(action, messages => + { + var msgs = messages.GetEnumerator(); + Assert.IsTrue(msgs.MoveNext()); + StringAssert.StartsWith("Validatie van 'Nieuwe berekening' gestart om: ", msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + StringAssert.StartsWith("Validatie van 'Nieuwe berekening' beëindigd om: ", msgs.Current); + + Assert.IsTrue(msgs.MoveNext()); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", msgs.Current); + }); + Assert.IsNotNull(calculation.Output); + } } } @@ -595,8 +601,6 @@ calculation.Output = new TestPipingOutput(); calculation.Attach(observer); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl); - string messageBoxText = null, messageBoxTitle = null; DialogBoxHandler = (name, wnd) => { @@ -613,14 +617,17 @@ } }; - // When - int clearOutputItemPosition = 2; - contextMenuAdapter.Items[clearOutputItemPosition].PerformClick(); + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(pipingCalculationContext, null, treeViewControl)) + { + // When + int clearOutputItemPosition = 2; + contextMenuStrip.Items[clearOutputItemPosition].PerformClick(); - // Then - Assert.AreNotEqual(confirm, calculation.HasOutput); - Assert.AreEqual("Bevestigen", messageBoxTitle); - Assert.AreEqual("Weet u zeker dat u de uitvoer van deze berekening wilt wissen?", messageBoxText); + // Then + Assert.AreNotEqual(confirm, calculation.HasOutput); + Assert.AreEqual("Bevestigen", messageBoxTitle); + Assert.AreEqual("Weet u zeker dat u de uitvoer van deze berekening wilt wissen?", messageBoxText); + } } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -256,8 +256,6 @@ failureMechanism.CalculationsGroup.Children.ElementAt(0).Attach(observer); failureMechanism.CalculationsGroup.Children.ElementAt(1).Attach(observer); - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - string messageBoxTitle = null, messageBoxText = null; DialogBoxHandler = (name, wnd) => { @@ -276,17 +274,20 @@ } }; - // When - contextMenuAdapter.Items[contextMenuClearIndex].PerformClick(); - - // Then - foreach (var calc in failureMechanism.CalculationsGroup.Children.OfType()) + using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - Assert.AreNotEqual(confirm, calc.HasOutput); - } + // When + contextMenuStrip.Items[contextMenuClearIndex].PerformClick(); - Assert.AreEqual("Bevestigen", messageBoxTitle); - Assert.AreEqual("Weet u zeker dat u alle uitvoer wilt wissen?", messageBoxText); + // Then + foreach (var calc in failureMechanism.CalculationsGroup.Children.OfType()) + { + Assert.AreNotEqual(confirm, calc.HasOutput); + } + + Assert.AreEqual("Bevestigen", messageBoxTitle); + Assert.AreEqual("Weet u zeker dat u alle uitvoer wilt wissen?", messageBoxText); + } } } @@ -330,31 +331,32 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Assert + Assert.AreEqual(12, menu.Items.Count); - // Assert - Assert.AreEqual(12, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, 0, CoreCommonGuiResources.Open, CoreCommonGuiResources.Open_ToolTip, CoreCommonGuiResources.OpenIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 0, CoreCommonGuiResources.Open, CoreCommonGuiResources.Open_ToolTip, CoreCommonGuiResources.OpenIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, RingtoetsCommonFormsResources.Checkbox_ticked); - TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, RingtoetsCommonFormsResources.Checkbox_ticked); + TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.Validate_all, RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, RingtoetsCommonFormsResources.ValidateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.Validate_all, RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, RingtoetsCommonFormsResources.ValidateAllIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 8, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 9, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 8, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 9, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false); + TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, false); - TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, false); - - CollectionAssert.AllItemsAreInstancesOfType(new[] - { - menu.Items[1], - menu.Items[3], - menu.Items[7], - menu.Items[10] - }, typeof(ToolStripSeparator)); + CollectionAssert.AllItemsAreInstancesOfType(new[] + { + menu.Items[1], + menu.Items[3], + menu.Items[7], + menu.Items[10] + }, typeof(ToolStripSeparator)); + } } } @@ -380,12 +382,13 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - - // Assert - ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; - Assert.IsFalse(clearOutputItem.Enabled); - Assert.AreEqual("Er zijn geen berekeningen met uitvoer om te wissen.", clearOutputItem.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Assert + ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; + Assert.IsFalse(clearOutputItem.Enabled); + Assert.AreEqual("Er zijn geen berekeningen met uitvoer om te wissen.", clearOutputItem.ToolTipText); + } } } @@ -418,12 +421,13 @@ failureMechanism.CalculationsGroup.Children.Add(pipingCalculation); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - - // Assert - ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; - Assert.IsTrue(clearOutputItem.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.Clear_all_output_ToolTip, clearOutputItem.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Assert + ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; + Assert.IsTrue(clearOutputItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Clear_all_output_ToolTip, clearOutputItem.ToolTipText); + } } } @@ -450,15 +454,16 @@ failureMechanism.CalculationsGroup.Children.Clear(); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - - // Assert - ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndex]; - ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndex]; - Assert.IsFalse(validateItem.Enabled); - Assert.IsFalse(calculateItem.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); - Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Assert + ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndex]; + ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndex]; + Assert.IsFalse(validateItem.Enabled); + Assert.IsFalse(calculateItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); + Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + } } } @@ -566,23 +571,24 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - - // Call - Action call = () => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); - - // Assert - TestHelper.AssertLogMessages(call, messages => + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - var msgs = messages.ToArray(); - Assert.AreEqual(9, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", validCalculation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", validCalculation.Name), msgs[1]); + // Call + Action call = () => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", invalidCalculation.Name), msgs[2]); - // Some validation error from validation service - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", invalidCalculation.Name), msgs[8]); - }); + // Assert + TestHelper.AssertLogMessages(call, messages => + { + var msgs = messages.ToArray(); + Assert.AreEqual(9, msgs.Length); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", validCalculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", validCalculation.Name), msgs[1]); + + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", invalidCalculation.Name), msgs[2]); + // Some validation error from validation service + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", invalidCalculation.Name), msgs[8]); + }); + } } } @@ -622,15 +628,16 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); - DialogBoxHandler = (name, wnd) => { // Expect an activity dialog which is automatically closed }; - // Call - contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(); + } } // Assert @@ -668,13 +675,14 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); - - // Assert - Assert.IsFalse(failureMechanism.IsRelevant); + // Assert + Assert.IsFalse(failureMechanism.IsRelevant); + } } } @@ -705,13 +713,14 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); - - // Assert - Assert.IsTrue(failureMechanism.IsRelevant); + // Assert + Assert.IsTrue(failureMechanism.IsRelevant); + } } } Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs =================================================================== diff -u -r04f56b5617d98e3888d548632421149206006fd9 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision 04f56b5617d98e3888d548632421149206006fd9) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -20,7 +20,9 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.StabilityStoneCover.Data.Properties; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -44,6 +46,7 @@ sectionResults = new List(); HydraulicBoundariesCalculationGroup = new CalculationGroup(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, false); GeneralInput = new GeneralStabilityStoneCoverWaveConditionsInput(); + ForeshoreProfiles = new ObservableList(); } public override IEnumerable Calculations @@ -64,6 +67,11 @@ /// public CalculationGroup HydraulicBoundariesCalculationGroup { get; private set; } + /// + /// Gets the available foreshore profiles for this instance. + /// + public ObservableList ForeshoreProfiles { get; private set; } + public IEnumerable SectionResults { get Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -145,6 +145,7 @@ return new ArrayList { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), + new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, assessmentSection), new CommentContext(failureMechanism) }; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs =================================================================== diff -u -r04f56b5617d98e3888d548632421149206006fd9 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 04f56b5617d98e3888d548632421149206006fd9) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -19,9 +19,12 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Core.Common.Base.Geometry; using NUnit.Framework; +using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; namespace Ringtoets.StabilityStoneCover.Data.Test @@ -44,6 +47,10 @@ Assert.IsFalse(failureMechanism.HydraulicBoundariesCalculationGroup.IsNameEditable); CollectionAssert.IsEmpty(failureMechanism.HydraulicBoundariesCalculationGroup.Children); + CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); + Assert.IsInstanceOf(failureMechanism.ForeshoreProfiles); + Assert.IsInstanceOf>(failureMechanism.ForeshoreProfiles); + CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.Calculations); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rf3b13cad3bbf455b19eee8eafe349a55a5cefdaa -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision f3b13cad3bbf455b19eee8eafe349a55a5cefdaa) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -21,6 +21,7 @@ using System.Drawing; using System.Linq; +using System.Windows.Forms; using Core.Common.Base; using Core.Common.Controls.TreeView; using Core.Common.Gui; @@ -186,12 +187,16 @@ Assert.AreEqual("Invoer", inputsFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputsFolder.Category); - Assert.AreEqual(2, inputsFolder.Contents.Count); + Assert.AreEqual(3, inputsFolder.Contents.Count); var failureMechanismSectionsContext = (FailureMechanismSectionsContext) inputsFolder.Contents[0]; Assert.AreSame(failureMechanism, failureMechanismSectionsContext.WrappedData); Assert.AreSame(assessmentSection, failureMechanismSectionsContext.ParentAssessmentSection); - var commentContext = (CommentContext) inputsFolder.Contents[1]; + var profilesContext = (ForeshoreProfilesContext) inputsFolder.Contents[1]; + Assert.AreSame(failureMechanism.ForeshoreProfiles, profilesContext.WrappedData); + Assert.AreSame(assessmentSection, profilesContext.ParentAssessmentSection); + + var commentContext = (CommentContext) inputsFolder.Contents[2]; Assert.AreSame(failureMechanism, commentContext.WrappedData); var hydraulicBoundariesCalculationGroup = (StabilityStoneCoverHydraulicBoundariesCalculationGroupContext) children[1]; @@ -336,13 +341,14 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); - - // Assert - Assert.IsFalse(failureMechanism.IsRelevant); + // Assert + Assert.IsFalse(failureMechanism.IsRelevant); + } } } @@ -374,13 +380,14 @@ plugin.Gui = gui; - var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); - - // Assert - Assert.IsTrue(failureMechanism.IsRelevant); + // Assert + Assert.IsTrue(failureMechanism.IsRelevant); + } } } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverHydraulicBoundariesCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r1157278bc5d74cdcb929abe4a1b487328ec4c268 -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverHydraulicBoundariesCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverHydraulicBoundariesCalculationGroupContextTreeNodeInfoTest.cs) (revision 1157278bc5d74cdcb929abe4a1b487328ec4c268) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverHydraulicBoundariesCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverHydraulicBoundariesCalculationGroupContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) @@ -201,69 +201,70 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Assert + Assert.AreEqual(14, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, + "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", + RingtoetsCommonFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, + "Voeg een nieuwe berekening toe aan deze berekeningsmap.", + RingtoetsCommonFormsResources.FailureMechanismIcon, + false); - // Assert - Assert.AreEqual(14, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, - "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", - RingtoetsCommonFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, - "Voeg een nieuwe berekening toe aan deze berekeningsmap.", - RingtoetsCommonFormsResources.FailureMechanismIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup, + RingtoetsCommonFormsResources.Validate_all, + "Er zijn geen berekeningen om te valideren.", + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, + RingtoetsCommonFormsResources.Calculate_all, + "Er zijn geen berekeningen om uit te voeren.", + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputNestedGroupIndex, + "&Wis alle uitvoer...", + "Er zijn geen berekeningen met uitvoer om te wissen.", + RingtoetsCommonFormsResources.ClearIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup, - RingtoetsCommonFormsResources.Validate_all, - "Er zijn geen berekeningen om te valideren.", - RingtoetsCommonFormsResources.ValidateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup, - RingtoetsCommonFormsResources.Calculate_all, - "Er zijn geen berekeningen om uit te voeren.", - RingtoetsCommonFormsResources.CalculateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputNestedGroupIndex, - "&Wis alle uitvoer...", - "Er zijn geen berekeningen met uitvoer om te wissen.", - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, 7, + CoreCommonGuiResources.Rename, + CoreCommonGuiResources.Rename_ToolTip, + CoreCommonGuiResources.RenameIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 8, + CoreCommonGuiResources.Delete, + CoreCommonGuiResources.Delete_ToolTip, + CoreCommonGuiResources.DeleteIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 7, - CoreCommonGuiResources.Rename, - CoreCommonGuiResources.Rename_ToolTip, - CoreCommonGuiResources.RenameIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, 8, - CoreCommonGuiResources.Delete, - CoreCommonGuiResources.Delete_ToolTip, - CoreCommonGuiResources.DeleteIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, 10, + CoreCommonGuiResources.Expand_all, + CoreCommonGuiResources.Expand_all_ToolTip, + CoreCommonGuiResources.ExpandAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, 11, + CoreCommonGuiResources.Collapse_all, + CoreCommonGuiResources.Collapse_all_ToolTip, + CoreCommonGuiResources.CollapseAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, 10, - CoreCommonGuiResources.Expand_all, - CoreCommonGuiResources.Expand_all_ToolTip, - CoreCommonGuiResources.ExpandAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, 11, - CoreCommonGuiResources.Collapse_all, - CoreCommonGuiResources.Collapse_all_ToolTip, - CoreCommonGuiResources.CollapseAllIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, 13, + CoreCommonGuiResources.Properties, + CoreCommonGuiResources.Properties_ToolTip, + CoreCommonGuiResources.PropertiesHS, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, 13, - CoreCommonGuiResources.Properties, - CoreCommonGuiResources.Properties_ToolTip, - CoreCommonGuiResources.PropertiesHS, - false); - - CollectionAssert.AllItemsAreInstancesOfType(new[] - { - menu.Items[2], - menu.Items[6], - menu.Items[9], - menu.Items[12] - }, typeof(ToolStripSeparator)); + CollectionAssert.AllItemsAreInstancesOfType(new[] + { + menu.Items[2], + menu.Items[6], + menu.Items[9], + menu.Items[12] + }, typeof(ToolStripSeparator)); + } } [Test] @@ -298,66 +299,67 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + Assert.AreEqual(15, menu.Items.Count); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, + "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", + RingtoetsCommonFormsResources.AddFolderIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, + "Voeg een nieuwe berekening toe aan deze berekeningsmap.", + RingtoetsCommonFormsResources.FailureMechanismIcon, + false); - // Assert - Assert.AreEqual(15, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup, - "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.", - RingtoetsCommonFormsResources.AddFolderIcon); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation, - "Voeg een nieuwe berekening toe aan deze berekeningsmap.", - RingtoetsCommonFormsResources.FailureMechanismIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenIndexRootGroup, + RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all, + "Er zijn geen berekeningen of mappen om te verwijderen.", + RingtoetsCommonFormsResources.RemoveAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenIndexRootGroup, - RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all, - "Er zijn geen berekeningen of mappen om te verwijderen.", - RingtoetsCommonFormsResources.RemoveAllIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, + RingtoetsCommonFormsResources.Validate_all, + "Er zijn geen berekeningen om te valideren.", + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, + RingtoetsCommonFormsResources.Calculate_all, + "Er zijn geen berekeningen om uit te voeren.", + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndexRootGroup, + "&Wis alle uitvoer...", + "Er zijn geen berekeningen met uitvoer om te wissen.", + RingtoetsCommonFormsResources.ClearIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup, - RingtoetsCommonFormsResources.Validate_all, - "Er zijn geen berekeningen om te valideren.", - RingtoetsCommonFormsResources.ValidateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, - RingtoetsCommonFormsResources.Calculate_all, - "Er zijn geen berekeningen om uit te voeren.", - RingtoetsCommonFormsResources.CalculateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndexRootGroup, - "&Wis alle uitvoer...", - "Er zijn geen berekeningen met uitvoer om te wissen.", - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExpandAllIndexRootGroup, + CoreCommonGuiResources.Expand_all, + CoreCommonGuiResources.Expand_all_ToolTip, + CoreCommonGuiResources.ExpandAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCollapseAllIndexRootGroup, + CoreCommonGuiResources.Collapse_all, + CoreCommonGuiResources.Collapse_all_ToolTip, + CoreCommonGuiResources.CollapseAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExpandAllIndexRootGroup, - CoreCommonGuiResources.Expand_all, - CoreCommonGuiResources.Expand_all_ToolTip, - CoreCommonGuiResources.ExpandAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCollapseAllIndexRootGroup, - CoreCommonGuiResources.Collapse_all, - CoreCommonGuiResources.Collapse_all_ToolTip, - CoreCommonGuiResources.CollapseAllIcon, - false); - - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuPropertiesIndexRootGroup, - CoreCommonGuiResources.Properties, - CoreCommonGuiResources.Properties_ToolTip, - CoreCommonGuiResources.PropertiesHS, - false); - CollectionAssert.AllItemsAreInstancesOfType(new[] - { - menu.Items[1], - menu.Items[4], - menu.Items[6], - menu.Items[10], - menu.Items[13] - }, typeof(ToolStripSeparator)); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuPropertiesIndexRootGroup, + CoreCommonGuiResources.Properties, + CoreCommonGuiResources.Properties_ToolTip, + CoreCommonGuiResources.PropertiesHS, + false); + CollectionAssert.AllItemsAreInstancesOfType(new[] + { + menu.Items[1], + menu.Items[4], + menu.Items[6], + menu.Items[10], + menu.Items[13] + }, typeof(ToolStripSeparator)); + } } } @@ -386,15 +388,16 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); - - // Assert - ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndexNestedGroup]; - ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndexNestedGroup]; - Assert.IsFalse(validateItem.Enabled); - Assert.IsFalse(calculateItem.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); - Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Assert + ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndexNestedGroup]; + ToolStripItem calculateItem = contextMenu.Items[contextMenuCalculateAllIndexNestedGroup]; + Assert.IsFalse(validateItem.Enabled); + Assert.IsFalse(calculateItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, calculateItem.ToolTipText); + Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_CreateValidateAllItem_No_calculations_to_validate, validateItem.ToolTipText); + } } } @@ -421,12 +424,13 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - ToolStripItem removeAllItemDisabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; - Assert.IsFalse(removeAllItemDisabled.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove, removeAllItemDisabled.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem removeAllItemDisabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; + Assert.IsFalse(removeAllItemDisabled.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove, removeAllItemDisabled.ToolTipText); + } } } @@ -459,12 +463,13 @@ plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); - - // Assert - ToolStripItem removeAllItemEnabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; - Assert.IsTrue(removeAllItemEnabled.Enabled); - Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all_Tooltip, removeAllItemEnabled.ToolTipText); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + ToolStripItem removeAllItemEnabled = contextMenu.Items[customOnlyContextMenuRemoveAllChildrenIndex]; + Assert.IsTrue(removeAllItemEnabled.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all_Tooltip, removeAllItemEnabled.ToolTipText); + } } } @@ -502,20 +507,21 @@ nodeData.Attach(observer); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, parentNodeData, treeViewControl)) + { + // Precondition + Assert.AreEqual(1, group.Children.Count); - // Precondition - Assert.AreEqual(1, group.Children.Count); + // Call + contextMenu.Items[contextMenuAddCalculationGroupIndexNestedGroup].PerformClick(); - // Call - contextMenu.Items[contextMenuAddCalculationGroupIndexNestedGroup].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."); + } } } @@ -556,13 +562,14 @@ dialog.ClickOk(); }; - var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Call + contextMenu.Items[contextMenuRemoveAllChildrenIndexRootGroup].PerformClick(); - // Call - contextMenu.Items[contextMenuRemoveAllChildrenIndexRootGroup].PerformClick(); - - // Assert - Assert.IsEmpty(group.Children); + // Assert + Assert.IsEmpty(group.Children); + } } }