Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r92b5d6508562f727347d73ee087a46c6d2f97902 -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 92b5d6508562f727347d73ee087a46c6d2f97902) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -1295,13 +1295,13 @@ private static void VerifyHydraulicBoundaryDatabasePath(IProject project) { - var ringtoetsProject = project as RiskeerProject; - if (ringtoetsProject == null) + var riskeerProject = project as RiskeerProject; + if (riskeerProject == null) { return; } - IEnumerable sectionsWithHydraulicBoundaryDatabaseLinked = ringtoetsProject.AssessmentSections.Where(i => i.HydraulicBoundaryDatabase.IsLinked()); + IEnumerable sectionsWithHydraulicBoundaryDatabaseLinked = riskeerProject.AssessmentSections.Where(i => i.HydraulicBoundaryDatabase.IsLinked()); foreach (AssessmentSection section in sectionsWithHydraulicBoundaryDatabaseLinked) { string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(section.HydraulicBoundaryDatabase.FilePath, Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -750,7 +750,7 @@ Assert.AreEqual("Conform WBI2017", actualSettings.LakeLevel); Assert.AreEqual("Conform WBI2017", actualSettings.WindDirection); Assert.AreEqual("Conform WBI2017", actualSettings.WindSpeed); - Assert.AreEqual("Gegenereerd door Ringtoets (conform WBI2017)", actualSettings.Comment); + Assert.AreEqual("Gegenereerd door Riskeer (conform WBI2017)", actualSettings.Comment); } [Test] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -156,7 +156,7 @@ Assert.AreEqual("Conform WBI2017", settings.LakeLevel); Assert.AreEqual("Conform WBI2017", settings.WindDirection); Assert.AreEqual("Conform WBI2017", settings.WindSpeed); - Assert.AreEqual("Gegenereerd door Ringtoets (conform WBI2017)", settings.Comment); + Assert.AreEqual("Gegenereerd door Riskeer (conform WBI2017)", settings.Comment); } [Test] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs (.../HydraulicLocationConfigurationSettingsUpdateHelperTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs (.../HydraulicLocationConfigurationSettingsUpdateHelperTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -80,7 +80,7 @@ Assert.AreEqual("Conform WBI2017", settings.LakeLevel); Assert.AreEqual("Conform WBI2017", settings.WindDirection); Assert.AreEqual("Conform WBI2017", settings.WindSpeed); - Assert.AreEqual("Gegenereerd door Ringtoets (conform WBI2017)", settings.Comment); + Assert.AreEqual("Gegenereerd door Riskeer (conform WBI2017)", settings.Comment); } [Test] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj =================================================================== diff -u -r92b5d6508562f727347d73ee087a46c6d2f97902 -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj (.../Riskeer.Integration.Plugin.Test.csproj) (revision 92b5d6508562f727347d73ee087a46c6d2f97902) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj (.../Riskeer.Integration.Plugin.Test.csproj) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -136,7 +136,7 @@ - + Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r92b5d6508562f727347d73ee087a46c6d2f97902 -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 92b5d6508562f727347d73ee087a46c6d2f97902) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -655,7 +655,7 @@ } [Test] - public void GetChildDataWithViewDefinitions_RingtoetsProjectWithChildren_ReturnChildren() + public void GetChildDataWithViewDefinitions_ProjectWithChildren_ReturnChildren() { // Setup var project = new RiskeerProject(); Fisheye: Tag 01ac28cffccda3451783c513b8d2d9130ff0ec60 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RiskeerProjectTreeNodeInfoTest.cs =================================================================== diff -u --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RiskeerProjectTreeNodeInfoTest.cs (revision 0) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RiskeerProjectTreeNodeInfoTest.cs (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -0,0 +1,216 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.ContextMenu; +using Core.Common.Gui.TestUtil.ContextMenu; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Riskeer.Common.Data.AssessmentSection; +using Riskeer.Integration.Data; +using Riskeer.Integration.Forms.Properties; +using GuiResources = Core.Common.Gui.Properties.Resources; + +namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos +{ + [TestFixture] + public class RiskeerProjectTreeNodeInfoTest + { + private MockRepository mockRepository; + + [SetUp] + public void SetUp() + { + mockRepository = new MockRepository(); + } + + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Setup + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + + // Assert + Assert.IsNotNull(info.Text); + Assert.IsNull(info.ForeColor); + Assert.IsNotNull(info.Image); + Assert.IsNotNull(info.ContextMenuStrip); + Assert.IsNull(info.EnsureVisibleOnCreate); + Assert.IsNull(info.ExpandOnCreate); + Assert.IsNotNull(info.ChildNodeObjects); + Assert.IsNull(info.CanRename); + Assert.IsNull(info.OnNodeRenamed); + Assert.IsNull(info.CanRemove); + Assert.IsNull(info.OnNodeRemoved); + Assert.IsNull(info.CanCheck); + Assert.IsNull(info.CheckedState); + Assert.IsNull(info.OnNodeChecked); + Assert.IsNull(info.CanDrag); + Assert.IsNull(info.CanDrop); + Assert.IsNull(info.CanInsert); + Assert.IsNull(info.OnDrop); + } + } + + [Test] + public void Text_Always_ReturnsName() + { + // Setup + const string testName = "ttt"; + var project = new RiskeerProject(testName); + + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + + // Call + string text = info.Text(project); + + // Assert + Assert.AreEqual(testName, text); + } + } + + [Test] + public void Image_Always_ReturnsSetImage() + { + // Setup + var project = new RiskeerProject(); + + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + + // Call + Image image = info.Image(project); + + // Assert + TestHelper.AssertImagesAreEqual(GuiResources.ProjectIcon, image); + } + } + + [Test] + public void ChildNodeObjects_Always_ReturnsChildrenOfData() + { + // Setup + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); + var project = new RiskeerProject(); + project.AssessmentSections.Add(assessmentSection); + + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + + // Call + object[] objects = info.ChildNodeObjects(project); + + // Assert + Assert.AreEqual(1, objects.Length); + var actualAssessmentSection = (AssessmentSection) objects[0]; + Assert.AreSame(assessmentSection, actualAssessmentSection); + } + } + + [Test] + public void ContextMenuStrip_Always_CallsBuilder() + { + // Setup + var menuBuilder = mockRepository.StrictMock(); + using (mockRepository.Ordered()) + { + menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder); + menuBuilder.Expect(mb => mb.Build()).Return(null); + } + + using (var treeViewControl = new TreeViewControl()) + { + var gui = mockRepository.Stub(); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + mockRepository.ReplayAll(); + + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + plugin.Gui = gui; + + // Call + info.ContextMenuStrip(null, null, treeViewControl); + } + } + + // Assert + mockRepository.VerifyAll(); + } + + [Test] + public void ContextMenuStrip_Always_ContextMenuItemAddAssessmentSectionEnabled() + { + // Setup + var project = new RiskeerProject(); + + using (var treeViewControl = new TreeViewControl()) + { + var gui = mockRepository.Stub(); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + gui.Stub(cmp => cmp.Get(project, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); + mockRepository.ReplayAll(); + + using (var plugin = new RiskeerPlugin()) + { + TreeNodeInfo info = GetInfo(plugin); + + plugin.Gui = gui; + + // Call + 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 + mockRepository.VerifyAll(); // Expect no calls on arguments + } + + private static TreeNodeInfo GetInfo(RiskeerPlugin plugin) + { + return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(RiskeerProject)); + } + } +} \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -r2e13b9fea3ee6d1dee96f9359db2f796aadc11ef -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision 2e13b9fea3ee6d1dee96f9359db2f796aadc11ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -278,11 +278,11 @@ getNormFunc, categoryBoundaryName)) - using (var ringtoetsPlugin = new RiskeerPlugin()) + using (var plugin = new RiskeerPlugin()) { - ViewInfo viewInfo = GetViewInfo(ringtoetsPlugin); - ringtoetsPlugin.Gui = gui; - ringtoetsPlugin.Activate(); + ViewInfo viewInfo = GetViewInfo(plugin); + plugin.Gui = gui; + plugin.Activate(); // Call viewInfo.AfterCreate(view, context); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -r2e13b9fea3ee6d1dee96f9359db2f796aadc11ef -r01ac28cffccda3451783c513b8d2d9130ff0ec60 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision 2e13b9fea3ee6d1dee96f9359db2f796aadc11ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) @@ -279,11 +279,11 @@ getNormFunc, categoryBoundaryName)) - using (var ringtoetsPlugin = new RiskeerPlugin()) + using (var plugin = new RiskeerPlugin()) { - ViewInfo viewInfo = GetViewInfo(ringtoetsPlugin); - ringtoetsPlugin.Gui = gui; - ringtoetsPlugin.Activate(); + ViewInfo viewInfo = GetViewInfo(plugin); + plugin.Gui = gui; + plugin.Activate(); // Call viewInfo.AfterCreate(view, context);