Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -reaba38093f5f76350766303e83e497fd4af07227 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eaba38093f5f76350766303e83e497fd4af07227) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -72,18 +72,18 @@ /// /// Looks up a localized string similar to Naam van het toetstraject.. /// - public static string AssessmentSectionBase_Name_Description { + public static string AssessmentSection_Name_Description { get { - return ResourceManager.GetString("AssessmentSectionBase_Name_Description", resourceCulture); + return ResourceManager.GetString("AssessmentSection_Name_Description", resourceCulture); } } /// /// Looks up a localized string similar to Naam. /// - public static string AssessmentSectionBase_Name_DisplayName { + public static string AssessmentSection_Name_DisplayName { get { - return ResourceManager.GetString("AssessmentSectionBase_Name_DisplayName", resourceCulture); + return ResourceManager.GetString("AssessmentSection_Name_DisplayName", resourceCulture); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -reaba38093f5f76350766303e83e497fd4af07227 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision eaba38093f5f76350766303e83e497fd4af07227) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -120,10 +120,10 @@ Traject - + Naam van het toetstraject. - + Naam Fisheye: Tag a7a3af9bffa76922cf344ee2134ad30078de878d refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionBaseProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj =================================================================== diff -u -r553ac4eda05a343285bc09090a3fb5f80a4d249e -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 553ac4eda05a343285bc09090a3fb5f80a4d249e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -53,7 +53,7 @@ True Resources.resx - + UserControl Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u -r553ac4eda05a343285bc09090a3fb5f80a4d249e -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision 553ac4eda05a343285bc09090a3fb5f80a4d249e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -82,7 +82,7 @@ /// public override IEnumerable GetPropertyInfos() { - yield return new PropertyInfo(); + yield return new PropertyInfo(); yield return new PropertyInfo(); } @@ -142,15 +142,15 @@ { yield return new TreeNodeInfo { - Text = assessmentSectionBase => assessmentSectionBase.Name, - Image = assessmentSectionBase => RingtoetsFormsResources.AssessmentSectionFolderIcon, - EnsureVisibleOnCreate = assessmentSectionBase => true, - ChildNodeObjects = AssessmentSectionBaseChildNodeObjects, - ContextMenuStrip = AssessmentSectionBaseContextMenuStrip, - CanRename = (assessmentSectionBase, parentData) => true, - OnNodeRenamed = AssessmentSectionBaseOnNodeRenamed, - CanRemove = (assessmentSectionBase, parentNodeData) => true, - OnNodeRemoved = AssessmentSectionBaseOnNodeRemoved + Text = assessmentSection => assessmentSection.Name, + Image = assessmentSection => RingtoetsFormsResources.AssessmentSectionFolderIcon, + EnsureVisibleOnCreate = assessmentSection => true, + ChildNodeObjects = assessmentSectionChildNodeObjects, + ContextMenuStrip = AssessmentSectionContextMenuStrip, + CanRename = (assessmentSection, parentData) => true, + OnNodeRenamed = AssessmentSectionOnNodeRenamed, + CanRemove = (assessmentSection, parentNodeData) => true, + OnNodeRemoved = AssessmentSectionOnNodeRemoved }; yield return new TreeNodeInfo @@ -255,10 +255,10 @@ private static bool CloseFailureMechanismResultViewForData(FailureMechanismResultView view, object o) { - var assessmentSectionBase = o as IAssessmentSection; - if (assessmentSectionBase != null) + var assessmentSection = o as IAssessmentSection; + if (assessmentSection != null) { - return assessmentSectionBase.GetFailureMechanisms().Any(failureMechanism => view.Data == failureMechanism.SectionResults); + return assessmentSection.GetFailureMechanisms().Any(failureMechanism => view.Data == failureMechanism.SectionResults); } return false; @@ -287,9 +287,9 @@ #endregion - # region AssessmentSectionBase + # region assessmentSection - private object[] AssessmentSectionBaseChildNodeObjects(IAssessmentSection nodeData) + private object[] assessmentSectionChildNodeObjects(IAssessmentSection nodeData) { var childNodes = new List { @@ -326,21 +326,21 @@ } } - private void AssessmentSectionBaseOnNodeRenamed(IAssessmentSection nodeData, string newName) + private void AssessmentSectionOnNodeRenamed(IAssessmentSection nodeData, string newName) { nodeData.Name = newName; nodeData.NotifyObservers(); } - private void AssessmentSectionBaseOnNodeRemoved(IAssessmentSection nodeData, object parentNodeData) + private void AssessmentSectionOnNodeRemoved(IAssessmentSection nodeData, object parentNodeData) { var parentProject = (Project) parentNodeData; parentProject.Items.Remove(nodeData); parentProject.NotifyObservers(); } - private ContextMenuStrip AssessmentSectionBaseContextMenuStrip(IAssessmentSection nodeData, object parentData, TreeViewControl treeViewControl) + private ContextMenuStrip AssessmentSectionContextMenuStrip(IAssessmentSection nodeData, object parentData, TreeViewControl treeViewControl) { return Gui.Get(nodeData, treeViewControl) .AddOpenItem() @@ -614,11 +614,8 @@ assessmentSection.Name, // TODO: Provide name of reference line instead HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, - new AssessmentLevelCalculationInput((int)hydraulicBoundaryLocation.Id, assessmentSection.FailureMechanismContribution.Norm), - output => - { - ParseHydraRingOutput(hydraulicBoundaryLocation, output); - }); + new AssessmentLevelCalculationInput((int) hydraulicBoundaryLocation.Id, assessmentSection.FailureMechanismContribution.Norm), + output => { ParseHydraRingOutput(hydraulicBoundaryLocation, output); }); } private static void ParseHydraRingOutput(HydraulicBoundaryLocation hydraulicBoundaryLocation, TargetProbabilityCalculationOutput output) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryDatabaseContextTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryDatabaseContextTest.cs (.../HydraulicBoundaryDatabaseContextTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryDatabaseContextTest.cs (.../HydraulicBoundaryDatabaseContextTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -20,13 +20,9 @@ // All rights reserved. using System; - using Core.Common.Base; - using NUnit.Framework; - using Rhino.Mocks; - using Ringtoets.Common.Data; using Ringtoets.Integration.Forms.PresentationObjects; @@ -40,15 +36,15 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - var pressentationObject = new HydraulicBoundaryDatabaseContext(assessmentSectionBaseMock); + var pressentationObject = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); // Assert Assert.IsInstanceOf(pressentationObject); - Assert.AreSame(assessmentSectionBaseMock, pressentationObject.Parent); + Assert.AreSame(assessmentSectionMock, pressentationObject.Parent); } [Test] @@ -73,7 +69,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new HydraulicBoundaryDatabaseContext(assessmentSection); + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); // Call var isEqual = context.Equals(context); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs (.../AssessmentSectionPropertiesTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs (.../AssessmentSectionPropertiesTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -16,7 +16,7 @@ public void DefaultConstructor_ExpectedValues() { // Call - var properties = new AssessmentSectionBaseProperties(); + var properties = new AssessmentSectionProperties(); // Assert Assert.IsInstanceOf>(properties); @@ -32,7 +32,7 @@ Name = "Test" }; - var properties = new AssessmentSectionBaseProperties + var properties = new AssessmentSectionProperties { Data = assessmentSection }; @@ -53,7 +53,7 @@ var assessmentSection = new AssessmentSection(); assessmentSection.Attach(projectObserver); - var properties = new AssessmentSectionBaseProperties + var properties = new AssessmentSectionProperties { Data = assessmentSection }; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -23,7 +23,6 @@ using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; - using Ringtoets.Common.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.PresentationObjects; @@ -50,13 +49,13 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionBaseMock = mocks.Stub(); + var assessmentSectionMock = mocks.Stub(); mocks.ReplayAll(); HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 1.0, 2.0); HydraulicBoundaryLocationProperties expectedLocationProperties = new HydraulicBoundaryLocationProperties(hydraulicBoundaryLocation); - HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSectionBaseMock); + HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); hydraulicBoundaryDatabaseContext.Parent.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabaseContext.Parent.HydraulicBoundaryDatabase.FilePath = "Test"; hydraulicBoundaryDatabaseContext.Parent.HydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj =================================================================== diff -u -rf67372a878749b45946b74d08f75f3da3f673a40 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision f67372a878749b45946b74d08f75f3da3f673a40) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -62,7 +62,7 @@ - + Fisheye: Tag a7a3af9bffa76922cf344ee2134ad30078de878d refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionBaseTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -0,0 +1,275 @@ +// 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.Linq; +using Core.Common.Base; +using Core.Common.Base.Data; +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; +using Ringtoets.Common.Data.Contribution; +using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.Integration.Data.Placeholders; +using Ringtoets.Integration.Forms.PresentationObjects; +using Ringtoets.Integration.Plugin; +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Forms.PresentationObjects; +using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources; + +namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos +{ + [TestFixture] + public class AssessmentSectionTreeNodeInfoTest + { + private MockRepository mocks; + private RingtoetsGuiPlugin plugin; + private TreeNodeInfo info; + + [SetUp] + public void SetUp() + { + mocks = new MockRepository(); + plugin = new RingtoetsGuiPlugin(); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(IAssessmentSection)); + } + + [TearDown] + public void TearDown() + { + plugin.Dispose(); + } + + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.AreEqual(typeof(IAssessmentSection), info.TagType); + Assert.IsNull(info.ForeColor); + Assert.IsNull(info.CanCheck); + Assert.IsNull(info.IsChecked); + 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 + var testName = "ttt"; + + var assessmentSection = mocks.Stub(); + assessmentSection.Name = testName; + + mocks.ReplayAll(); + + // Call + var text = info.Text(assessmentSection); + + // Assert + Assert.AreEqual(testName, text); + + mocks.VerifyAll(); + } + + [Test] + public void Image_Always_ReturnsSetImage() + { + // Setup + var assessmentSection = mocks.StrictMock(); + + mocks.ReplayAll(); + + // Call + var image = info.Image(assessmentSection); + + // Assert + TestHelper.AssertImagesAreEqual(RingtoetsIntegrationFormsResources.AssessmentSectionFolderIcon, image); + + mocks.VerifyAll(); + } + + [Test] + public void EnsureVisibleOnCreate_Always_ReturnsTrue() + { + // Setup + var assessmentSection = mocks.StrictMock(); + + mocks.ReplayAll(); + + // Call + var result = info.EnsureVisibleOnCreate(assessmentSection); + + // Assert + Assert.IsTrue(result); + + mocks.VerifyAll(); + } + + [Test] + public void ChildNodeObjects_Always_ReturnsChildsOnData() + { + // Setup + var failureMechanisms = new IFailureMechanism[] + { + new PipingFailureMechanism(), + new FailureMechanismPlaceholder("A") + }; + var contribution = new FailureMechanismContribution(failureMechanisms, 10.0, 2); + var comments = new AssessmentSectionComment + { + Text = "some comment" + }; + + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(contribution); + assessmentSection.Stub(section => section.GetFailureMechanisms()).Return(failureMechanisms); + assessmentSection.Stub(section => section.Comments).Return(comments); + mocks.ReplayAll(); + + // Call + var objects = info.ChildNodeObjects(assessmentSection).ToArray(); + + // Assert + Assert.AreEqual(6, objects.Length); + var referenceLineContext = (ReferenceLineContext) objects[0]; + Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData); + Assert.AreSame(assessmentSection, referenceLineContext.Parent); + + Assert.AreSame(contribution, objects[1]); + + var context = (HydraulicBoundaryDatabaseContext) objects[2]; + Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.Parent.HydraulicBoundaryDatabase); + Assert.AreSame(assessmentSection, context.Parent); + + var pipingFailureMechanismContext = (PipingFailureMechanismContext)objects[4]; + Assert.AreSame(failureMechanisms[0], pipingFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, pipingFailureMechanismContext.Parent); + + var placeholderFailureMechanismContext = (FailureMechanismPlaceholderContext)objects[5]; + Assert.AreSame(failureMechanisms[1], placeholderFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, placeholderFailureMechanismContext.Parent); + + mocks.VerifyAll(); + } + + [Test] + public void ContextMenuStrip_Always_CallsBuilder() + { + // Setup + var gui = mocks.StrictMultiMock(); + var treeViewControlMock = mocks.StrictMock(); + var menuBuilderMock = mocks.StrictMock(); + gui.Expect(g => g.Get(null, treeViewControlMock)).Return(menuBuilderMock); + + menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + + mocks.ReplayAll(); + + plugin.Gui = gui; + + // Call + info.ContextMenuStrip(null, null, treeViewControlMock); + + // Assert + mocks.VerifyAll(); + } + + [Test] + public void CanRename_Always_ReturnsTrue() + { + // Call + var canRename = info.CanRename(null, null); + + // Assert + Assert.IsTrue(canRename); + } + + [Test] + public void OnNodeRenamed_WithData_SetProjectNameWithNotification() + { + // Setup + var assessmentSection = mocks.Stub(); + assessmentSection.Expect(section => section.NotifyObservers()); + + mocks.ReplayAll(); + + // Call + const string newName = "New Name"; + info.OnNodeRenamed(assessmentSection, newName); + + // Assert + Assert.AreEqual(newName, assessmentSection.Name); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_Always_ReturnsTrue() + { + // Call + var canRemove = info.CanRemove(null, null); + + // Assert + Assert.IsTrue(canRemove); + } + + [Test] + public void RemoveNodeData_ProjectWithAssessmentSection_ReturnTrueAndRemoveAssessmentSection() + { + // Setup + var observerMock = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); + + observerMock.Expect(o => o.UpdateObserver()); + + mocks.ReplayAll(); + + var project = new Project(); + project.Items.Add(assessmentSection); + project.Attach(observerMock); + + // Call + info.OnNodeRemoved(assessmentSection, project); + + // Assert + CollectionAssert.DoesNotContain(project.Items, assessmentSection); + mocks.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Drawing; using System.Linq; using Core.Common.Base; @@ -222,13 +221,13 @@ }; var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 10, 30000); - var assessmentSectionBase = mocks.Stub(); - assessmentSectionBase.Name = "Dummy"; - assessmentSectionBase.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; - assessmentSectionBase.Stub(section => section.FailureMechanismContribution).Return(failureMechanismContribution); - assessmentSectionBase.Expect(section => section.NotifyObservers()); + var assessmentSectionMock = mocks.Stub(); + assessmentSectionMock.Name = "Dummy"; + assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; + assessmentSectionMock.Stub(section => section.FailureMechanismContribution).Return(failureMechanismContribution); + assessmentSectionMock.Expect(section => section.NotifyObservers()); - var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSectionBase); + var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); hydraulicBoundaryDatabaseContextObserver.Expect(o => o.UpdateObserver()); gui.Expect(cmp => cmp.Get(hydraulicBoundaryDatabaseContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -rf67372a878749b45946b74d08f75f3da3f673a40 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision f67372a878749b45946b74d08f75f3da3f673a40) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -72,24 +72,24 @@ { // Setup var view = new AssessmentSectionView(); - var map = (MapControl)view.Controls[0]; + var map = (MapControl) view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase(); + var assessmentSection = new TestAssessmentSection(); // Call - view.Data = assessmentSectionBase; + view.Data = assessmentSection; // Assert MapDataCollection mapData = map.Data; Assert.AreEqual(2, mapData.List.Count); - var hrLocationsMapData = (MapPointData)mapData.List[0]; + var hrLocationsMapData = (MapPointData) mapData.List[0]; CollectionAssert.IsEmpty(hrLocationsMapData.Features.First().MapGeometries.First().Points); Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name); Assert.IsTrue(hrLocationsMapData.IsVisible); - var referenceLineMapData = (MapLineData)mapData.List[1]; + var referenceLineMapData = (MapLineData) mapData.List[1]; CollectionAssert.IsEmpty(referenceLineMapData.Features.First().MapGeometries.First().Points); Assert.AreEqual("Referentielijn", referenceLineMapData.Name); Assert.IsTrue(referenceLineMapData.IsVisible); @@ -112,27 +112,27 @@ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = hydraulicBoundaryDatabase, ReferenceLine = referenceLine }; // Call - view.Data = assessmentSectionBase; + view.Data = assessmentSection; // Assert - Assert.AreSame(assessmentSectionBase, view.Data); + Assert.AreSame(assessmentSection, view.Data); Assert.IsInstanceOf(map.Data); MapDataCollection mapData = map.Data; Assert.IsNotNull(mapData); - var hrLocationsMapData = (MapPointData)mapData.List[0]; + var hrLocationsMapData = (MapPointData) mapData.List[0]; CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations.Select(l => l.Location), hrLocationsMapData.Features.First().MapGeometries.First().Points); Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name); Assert.IsTrue(hrLocationsMapData.IsVisible); - var referenceLineMapData = (MapLineData)mapData.List[1]; + var referenceLineMapData = (MapLineData) mapData.List[1]; CollectionAssert.AreEqual(referenceLine.Points, referenceLineMapData.Features.First().MapGeometries.First().Points); Assert.AreEqual("Referentielijn", referenceLineMapData.Name); Assert.IsTrue(referenceLineMapData.IsVisible); @@ -143,15 +143,15 @@ { // Setup var view = new AssessmentSectionView(); - var map = (MapControl)view.Controls[0]; + var map = (MapControl) view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() }; - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - view.Data = assessmentSectionBase; + view.Data = assessmentSection; var mapData = map.Data; var mapDataElementBeforeUpdate = mapData.List.First() as MapPointData; @@ -160,11 +160,11 @@ // Precondition Assert.AreEqual(geometryBeforeUpdate, new Point2D(1.0, 2.0)); - assessmentSectionBase.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); + assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); // Call - assessmentSectionBase.NotifyObservers(); + assessmentSection.NotifyObservers(); // Assert Assert.IsInstanceOf(map.Data); @@ -182,7 +182,7 @@ { // Setup var view = new AssessmentSectionView(); - var map = (MapControl)view.Controls[0]; + var map = (MapControl) view.Controls[0]; var points = new List { @@ -196,13 +196,13 @@ new Point2D(4.0, 3.0) }; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { ReferenceLine = new ReferenceLine() }; - assessmentSectionBase.ReferenceLine.SetGeometry(points); + assessmentSection.ReferenceLine.SetGeometry(points); - view.Data = assessmentSectionBase; + view.Data = assessmentSection; var mapData = map.Data; var mapDataElementBeforeUpdate = mapData.List.ElementAt(1) as MapLineData; @@ -211,11 +211,11 @@ // Precondition CollectionAssert.AreEquivalent(geometryBeforeUpdate, points); - assessmentSectionBase.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - assessmentSectionBase.ReferenceLine.SetGeometry(pointsUpdate); + assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + assessmentSection.ReferenceLine.SetGeometry(pointsUpdate); // Call - assessmentSectionBase.NotifyObservers(); + assessmentSection.NotifyObservers(); // Assert Assert.IsInstanceOf(map.Data); @@ -233,39 +233,39 @@ { // Setup var view = new AssessmentSectionView(); - var map = (MapControl)view.Controls[0]; + var map = (MapControl) view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), ReferenceLine = new ReferenceLine() }; - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(1.0, 2.0), new Point2D(2.0, 1.0) }); - view.Data = assessmentSectionBase; + view.Data = assessmentSection; - var assessmentSectionBase2 = new TestAssessmentSectionBase + var assessmentSection2 = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), ReferenceLine = new ReferenceLine() }; - assessmentSectionBase2.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); - assessmentSectionBase2.ReferenceLine.SetGeometry(new List + assessmentSection2.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); + assessmentSection2.ReferenceLine.SetGeometry(new List { new Point2D(2.0, 1.0), new Point2D(4.0, 3.0) }); // Call - assessmentSectionBase2.NotifyObservers(); + assessmentSection2.NotifyObservers(); // Assert - Assert.AreEqual(assessmentSectionBase, view.Data); + Assert.AreEqual(assessmentSection, view.Data); Assert.IsInstanceOf(map.Data); } @@ -274,54 +274,54 @@ { // Setup var view = new AssessmentSectionView(); - var map = (MapControl)view.Controls[0]; + var map = (MapControl) view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), ReferenceLine = new ReferenceLine() }; - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(1.0, 2.0), new Point2D(2.0, 1.0) }); - view.Data = assessmentSectionBase; + view.Data = assessmentSection; MapData dataBeforeUpdate = map.Data; view.Data = null; - assessmentSectionBase.ReferenceLine = new ReferenceLine(); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection.ReferenceLine = new ReferenceLine(); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(2.0, 5.0), new Point2D(34.0, 2.0) }); // Call - assessmentSectionBase.NotifyObservers(); + assessmentSection.NotifyObservers(); // Assert Assert.IsNull(view.Data); Assert.AreEqual(dataBeforeUpdate, map.Data); } - private class TestAssessmentSectionBase : Observable, IAssessmentSection + private class TestAssessmentSection : Observable, IAssessmentSection { public string Name { get; set; } public AssessmentSectionComment Comments { get; set; } public ReferenceLine ReferenceLine { get; set; } public FailureMechanismContribution FailureMechanismContribution { get; private set; } public HydraulicBoundaryDatabase HydraulicBoundaryDatabase { get; set; } + public long StorageId { get; set; } + public IEnumerable GetFailureMechanisms() { yield break; } - - public long StorageId { get; set; } } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Core.Common.Base; using Core.Common.IO.Exceptions; using Core.Common.TestUtil; using Core.Common.Utils.Builders; @@ -149,13 +148,12 @@ var context = new HydraulicBoundaryDatabaseContext(assessmentSection); - var expectedMessage = "Er is nog geen bestand geopend."; - // Call TestDelegate call = () => importer.Import(context); // Assert var exception = Assert.Throws(call); + var expectedMessage = "Er is nog geen bestand geopend."; Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); } @@ -236,8 +234,6 @@ mocks.ReplayAll(); string validFilePath = Path.Combine(testDataPath, "corruptschema.sqlite"); - string expectedMessage = new FileReaderErrorMessageBuilder(validFilePath) - .Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database. Het bestand wordt overgeslagen."); var importResult = true; // Precondition @@ -248,6 +244,8 @@ Action call = () => importResult = importer.Import(importTarget); // Assert + string expectedMessage = new FileReaderErrorMessageBuilder(validFilePath) + .Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database. Het bestand wordt overgeslagen."); TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importResult); mocks.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs =================================================================== diff -u -r553ac4eda05a343285bc09090a3fb5f80a4d249e -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 553ac4eda05a343285bc09090a3fb5f80a4d249e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -51,7 +51,7 @@ Assert.AreEqual(2, propertyInfos.Length); var assessmentSectionProperties = propertyInfos.Single(pi => pi.DataType == typeof(IAssessmentSection)); - Assert.AreEqual(typeof(AssessmentSectionBaseProperties), assessmentSectionProperties.PropertyObjectType); + Assert.AreEqual(typeof(AssessmentSectionProperties), assessmentSectionProperties.PropertyObjectType); Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck); Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData); Assert.IsNull(assessmentSectionProperties.AfterCreate); @@ -133,22 +133,22 @@ } [Test] - public void GetChildDataWithViewDefinitions_AssessmentSectionBase_ReturnFailureMechanismContribution() + public void GetChildDataWithViewDefinitions_AssessmentSection_ReturnFailureMechanismContribution() { // Setup var mocks = new MockRepository(); - var assessmentSectionBase = mocks.Stub(); + var assessmentSectionMock = mocks.Stub(); mocks.ReplayAll(); var guiPlugin = new RingtoetsGuiPlugin(); // Call - var childrenWithViewDefinitions = guiPlugin.GetChildDataWithViewDefinitions(assessmentSectionBase); + var childrenWithViewDefinitions = guiPlugin.GetChildDataWithViewDefinitions(assessmentSectionMock); // Assert CollectionAssert.AreEqual(new object[] { - assessmentSectionBase.FailureMechanismContribution + assessmentSectionMock.FailureMechanismContribution }, childrenWithViewDefinitions); mocks.VerifyAll(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -193,7 +193,7 @@ Image = stochasticSoilModel => PipingFormsResources.StochasticSoilModelIcon, ChildNodeObjects = stochasticSoilModel => stochasticSoilModel.StochasticSoilProfiles.Cast().ToArray(), ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddPropertiesItem() + .AddPropertiesItem() .Build() }; @@ -248,8 +248,8 @@ private bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o) { - var assessmentSectionBase = o as IAssessmentSection; - return assessmentSectionBase != null && ((PipingFailureMechanismContext) view.Data).Parent == assessmentSectionBase; + var assessmentSection = o as IAssessmentSection; + return assessmentSection != null && ((PipingFailureMechanismContext) view.Data).Parent == assessmentSection; } # endregion @@ -258,12 +258,12 @@ private static bool ClosePipingCalculationsViewForData(PipingCalculationsView view, object o) { - var assessmentSectionBase = o as IAssessmentSection; - if (assessmentSectionBase != null) + var assessmentSection = o as IAssessmentSection; + if (assessmentSection != null) { - var pipingFailureMechanism = assessmentSectionBase.GetFailureMechanisms() - .OfType() - .FirstOrDefault(); + var pipingFailureMechanism = assessmentSection.GetFailureMechanisms() + .OfType() + .FirstOrDefault(); if (pipingFailureMechanism != null) { @@ -702,18 +702,15 @@ { var surfaceLineAvailable = nodeData.AvailablePipingSurfaceLines.Any() && nodeData.AvailableStochasticSoilModels.Any(); - var pipingCalculationGroupGeneratePipingCalculationsToolTip = + var pipingCalculationGroupGeneratePipingCalculationsToolTip = surfaceLineAvailable ? - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip : - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip; + PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip : + PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip; var generateCalculationsItem = new StrictContextMenuItem( PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations, pipingCalculationGroupGeneratePipingCalculationsToolTip, - PipingFormsResources.GeneratePipingCalculationsIcon, (o, args) => - { - ShowSurfaceLineSelectionDialog(nodeData); - }) + PipingFormsResources.GeneratePipingCalculationsIcon, (o, args) => { ShowSurfaceLineSelectionDialog(nodeData); }) { Enabled = surfaceLineAvailable }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs (.../PipingCalculationContextTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs (.../PipingCalculationContextTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -102,7 +102,7 @@ // Setup var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); @@ -117,7 +117,7 @@ }; var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); - var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionBaseMock); + var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); // Call context.Attach(observer); @@ -133,7 +133,7 @@ // Setup var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var observer = mocks.StrictMock(); mocks.ReplayAll(); @@ -147,7 +147,7 @@ }; var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); - var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionBaseMock); + var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); context.Attach(observer); @@ -165,7 +165,7 @@ // Setup var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); @@ -180,7 +180,7 @@ }; var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); - var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionBaseMock); + var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); calculation.Attach(observer); // Attach to wrapped object Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationGroupContextTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationGroupContextTest.cs (.../PipingCalculationGroupContextTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationGroupContextTest.cs (.../PipingCalculationGroupContextTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -1,16 +1,13 @@ using System; using System.Linq; - using Core.Common.Base; using Core.Common.TestUtil; using NUnit.Framework; - using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Forms.Test.PresentationObjects @@ -33,12 +30,12 @@ }; var mocks = new MockRepository(); - var assessmentSectionBase = mocks.StrictMock(); + var assessmentSection = mocks.StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - var groupContext = new PipingCalculationGroupContext(group, surfaceLines, soilModels, pipingFailureMechanismMock, assessmentSectionBase); + var groupContext = new PipingCalculationGroupContext(group, surfaceLines, soilModels, pipingFailureMechanismMock, assessmentSection); // Assert Assert.IsInstanceOf(groupContext); @@ -47,7 +44,7 @@ Assert.AreSame(surfaceLines, groupContext.AvailablePipingSurfaceLines); Assert.AreSame(soilModels, groupContext.AvailableStochasticSoilModels); Assert.AreSame(pipingFailureMechanismMock, groupContext.PipingFailureMechanism); - Assert.AreSame(assessmentSectionBase, groupContext.AssessmentSection); + Assert.AreSame(assessmentSection, groupContext.AssessmentSection); } [Test] @@ -65,11 +62,11 @@ }; var mocks = new MockRepository(); - var assessmentSectionBase = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => new PipingCalculationGroupContext(group, surfaceLines, soilModels, null, assessmentSectionBase); + TestDelegate call = () => new PipingCalculationGroupContext(group, surfaceLines, soilModels, null, assessmentSectionMock); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "Het piping faalmechanisme mag niet 'null' zijn."); @@ -109,7 +106,7 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionBase = new MockRepository().StrictMock(); + var assessmentSectionMock = new MockRepository().StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); @@ -120,7 +117,7 @@ var context = new PipingCalculationGroupContext(pipingCalculationGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock, assessmentSectionBase); + pipingFailureMechanismMock, assessmentSectionMock); // Call context.Attach(observer); @@ -135,7 +132,7 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionBase = new MockRepository().StrictMock(); + var assessmentSectionMock = new MockRepository().StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); var observer = mocks.StrictMock(); mocks.ReplayAll(); @@ -145,7 +142,7 @@ var context = new PipingCalculationGroupContext(pipingCalculationGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock, assessmentSectionBase); + pipingFailureMechanismMock, assessmentSectionMock); context.Attach(observer); @@ -162,7 +159,7 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionBase = new MockRepository().StrictMock(); + var assessmentSectionMock = new MockRepository().StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); @@ -173,7 +170,7 @@ var context = new PipingCalculationGroupContext(pipingCalculationGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock, assessmentSectionBase); + pipingFailureMechanismMock, assessmentSectionMock); pipingCalculationGroup.Attach(observer); // Attach to wrapped object Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs (.../PipingCalculationContextPropertiesTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs (.../PipingCalculationContextPropertiesTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -1,8 +1,6 @@ using System.Linq; - using Core.Common.Base; using Core.Common.Gui.PropertyBag; - using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data; @@ -39,7 +37,7 @@ var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var properties = new PipingCalculationContextProperties @@ -48,7 +46,7 @@ Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock) + assessmentSectionMock) }; // Call & Assert @@ -63,7 +61,7 @@ var projectObserver = mocks.StrictMock(); projectObserver.Expect(o => o.UpdateObserver()); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); @@ -75,7 +73,7 @@ Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock) + assessmentSectionMock) }; // Call & Assert @@ -94,7 +92,7 @@ int numberProperties = 1; projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); @@ -106,7 +104,7 @@ Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock) + assessmentSectionMock) }; // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationGroupContextPropertiesTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationGroupContextPropertiesTest.cs (.../PipingCalculationGroupContextPropertiesTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationGroupContextPropertiesTest.cs (.../PipingCalculationGroupContextPropertiesTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -36,15 +36,15 @@ var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var properties = new PipingCalculationGroupContextProperties { Data = new PipingCalculationGroupContext(calculationGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock, assessmentSectionBaseMock) + pipingFailureMechanismMock, assessmentSectionMock) }; // Call & Assert @@ -59,7 +59,7 @@ var projectObserver = mocks.StrictMock(); projectObserver.Expect(o => o.UpdateObserver()); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var calculationGroup = new PipingCalculationGroup(); @@ -70,7 +70,7 @@ Data = new PipingCalculationGroupContext(calculationGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock, assessmentSectionBaseMock) + pipingFailureMechanismMock, assessmentSectionMock) }; // Call & Assert @@ -90,15 +90,15 @@ var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var properties = new PipingCalculationGroupContextProperties { Data = new PipingCalculationGroupContext(calculationGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock, assessmentSectionBaseMock) + pipingFailureMechanismMock, assessmentSectionMock) }; string propertyName = TypeUtils.GetMemberName(p => p.Name); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r3434a272cc8bfb25dae4bd7bd50afedb377343c0 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision 3434a272cc8bfb25dae4bd7bd50afedb377343c0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -1,7 +1,6 @@ using System; using System.Linq; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.ContextMenu; @@ -12,11 +11,9 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data; -using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.Forms.Test.PresentationObjects; using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Plugin; using Ringtoets.Piping.Primitives; @@ -65,7 +62,7 @@ }; var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var pipingCalculationContext = new PipingCalculationContext(calculation, @@ -75,10 +72,10 @@ }, new[] { - new TestStochasticSoilModel(), + new TestStochasticSoilModel(), }, pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); // Call var text = info.Text(pipingCalculationContext); @@ -108,7 +105,7 @@ }; var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var pipingCalculationContext = new PipingCalculationContext(calculation, @@ -121,7 +118,7 @@ new TestStochasticSoilModel() }, pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); mocks.ReplayAll(); @@ -144,7 +141,7 @@ }; var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var pipingCalculationContext = new PipingCalculationContext(calculation, @@ -157,7 +154,7 @@ new TestStochasticSoilModel() }, pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); // Call var children = info.ChildNodeObjects(pipingCalculationContext).ToArray(); @@ -178,14 +175,14 @@ { // Setup var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var pipingCalculationContext = new PipingCalculationContext(new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); // Precondition Assert.IsFalse(pipingCalculationContext.WrappedData.HasOutput); @@ -228,14 +225,14 @@ }; var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var pipingCalculationsInputs = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); pipingCalculationsInputs.Attach(observerMock); // Call @@ -265,12 +262,12 @@ var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -299,12 +296,12 @@ Output = new TestPipingOutput() }; var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -331,12 +328,12 @@ var menuBuilderMock = mocks.Stub(); var treeViewControlMock = mocks.StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); @@ -436,14 +433,14 @@ // Setup var dataMock = mocks.StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var nodeMock = new PipingCalculationContext(new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); // Call bool removalAllowed = info.CanRemove(nodeMock, dataMock); @@ -508,12 +505,12 @@ var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); observer.Expect(o => o.UpdateObserver()); @@ -567,12 +564,12 @@ var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -611,12 +608,12 @@ var calculateContextMenuItemIndex = 1; var calculation = PipingCalculationFactory.CreateCalculationWithValidInput(); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); gui.Expect(g => g.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Expect(g => g.MainWindow).Return(mainWindow); @@ -669,12 +666,12 @@ var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); - var assessmentSectionBaseMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, - assessmentSectionBaseMock); + assessmentSectionMock); gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -rf67372a878749b45946b74d08f75f3da3f673a40 -ra7a3af9bffa76922cf344ee2134ad30078de878d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision f67372a878749b45946b74d08f75f3da3f673a40) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision a7a3af9bffa76922cf344ee2134ad30078de878d) @@ -59,12 +59,12 @@ var map = (MapControl)view.Controls[0]; var mocks = new MockRepository(); - var assessmentSectionBase = mocks.Stub(); + var assessmentSectionMock = mocks.Stub(); mocks.ReplayAll(); var pipingFailureMechanism = new PipingFailureMechanism(); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); // Call view.Data = pipingContext; @@ -77,8 +77,8 @@ AssertFailureMechanismSectionsMapData(pipingFailureMechanism.Sections, mapData.List[1]); AssertFailureMechanismSectionsStartPointMapData(pipingFailureMechanism.Sections, mapData.List[2]); AssertFailureMechanismSectionsEndPointMapData(pipingFailureMechanism.Sections, mapData.List[3]); - AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[4]); - AssertReferenceMapData(assessmentSectionBase.ReferenceLine, mapData.List[5]); + AssertHydraulicBoundaryLocationsMapData(assessmentSectionMock.HydraulicBoundaryDatabase, mapData.List[4]); + AssertReferenceMapData(assessmentSectionMock.ReferenceLine, mapData.List[5]); mocks.VerifyAll(); } @@ -109,9 +109,9 @@ }); var mocks = new MockRepository(); - var assessmentSectionBase = mocks.Stub(); - assessmentSectionBase.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; - assessmentSectionBase.ReferenceLine = referenceLine; + var assessmentSectionMock = mocks.Stub(); + assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; + assessmentSectionMock.ReferenceLine = referenceLine; mocks.ReplayAll(); var pipingFailureMechanism = new PipingFailureMechanism(); @@ -120,7 +120,7 @@ pipingFailureMechanism.AddSection(new FailureMechanismSection("B", refereceGeometryPoints.Skip(1).Take(2))); pipingFailureMechanism.AddSection(new FailureMechanismSection("C", refereceGeometryPoints.Skip(2).Take(2))); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); // Call view.Data = pipingContext; @@ -136,8 +136,8 @@ AssertFailureMechanismSectionsMapData(pipingFailureMechanism.Sections, mapData.List[1]); AssertFailureMechanismSectionsStartPointMapData(pipingFailureMechanism.Sections, mapData.List[2]); AssertFailureMechanismSectionsEndPointMapData(pipingFailureMechanism.Sections, mapData.List[3]); - AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[4]); - AssertReferenceMapData(assessmentSectionBase.ReferenceLine, mapData.List[5]); + AssertHydraulicBoundaryLocationsMapData(assessmentSectionMock.HydraulicBoundaryDatabase, mapData.List[4]); + AssertReferenceMapData(assessmentSectionMock.ReferenceLine, mapData.List[5]); mocks.VerifyAll(); } @@ -152,13 +152,13 @@ var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase1.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = hydraulicBoundaryDatabase1 }; var pipingFailureMechanism = new PipingFailureMechanism(); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); view.Data = pipingContext; var mapData = map.Data; @@ -172,10 +172,10 @@ var hydraulicBoundaryDatabase2 = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase2.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); - assessmentSectionBase.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase2; + assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase2; // Call - assessmentSectionBase.NotifyObservers(); + assessmentSection.NotifyObservers(); // Assert Assert.IsInstanceOf(map.Data); @@ -207,14 +207,14 @@ new Point2D(4.0, 3.0) }; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { ReferenceLine = new ReferenceLine() }; - assessmentSectionBase.ReferenceLine.SetGeometry(points); + assessmentSection.ReferenceLine.SetGeometry(points); var pipingFailureMechanism = new PipingFailureMechanism(); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); view.Data = pipingContext; var mapData = map.Data; @@ -225,10 +225,10 @@ // Precondition CollectionAssert.AreEquivalent(geometryBeforeUpdate, points); - assessmentSectionBase.ReferenceLine.SetGeometry(pointsUpdate); + assessmentSection.ReferenceLine.SetGeometry(pointsUpdate); // Call - assessmentSectionBase.NotifyObservers(); + assessmentSection.NotifyObservers(); // Assert Assert.IsInstanceOf(map.Data); @@ -249,12 +249,12 @@ var map = (MapControl)view.Controls[0]; var mocks = new MockRepository(); - var assessmentSectionBase = mocks.Stub(); + var assessmentSectionMock = mocks.Stub(); mocks.ReplayAll(); var pipingFailureMechanism = new PipingFailureMechanism(); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); view.Data = pipingContext; var mapData = map.Data; @@ -284,37 +284,37 @@ var view = new PipingFailureMechanismView(); var map = (MapControl)view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), ReferenceLine = new ReferenceLine() }; - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(1.0, 2.0), new Point2D(2.0, 1.0) }); var pipingFailureMechanism = new PipingFailureMechanism(); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); view.Data = pipingContext; - var assessmentSectionBase2 = new TestAssessmentSectionBase + var assessmentSection2 = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), ReferenceLine = new ReferenceLine() }; - assessmentSectionBase2.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection2.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(2.0, 1.0), new Point2D(4.0, 3.0) }); // Call - assessmentSectionBase2.NotifyObservers(); + assessmentSection2.NotifyObservers(); // Assert Assert.AreEqual(pipingContext, view.Data); @@ -328,35 +328,35 @@ var view = new PipingFailureMechanismView(); var map = (MapControl)view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase + var assessmentSection = new TestAssessmentSection { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), ReferenceLine = new ReferenceLine() }; - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(1.0, 2.0), new Point2D(2.0, 1.0) }); var pipingFailureMechanism = new PipingFailureMechanism(); - var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase); + var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); view.Data = pipingContext; view.Data = null; MapData dataBeforeUpdate = map.Data; - assessmentSectionBase.ReferenceLine = new ReferenceLine(); - assessmentSectionBase.ReferenceLine.SetGeometry(new List + assessmentSection.ReferenceLine = new ReferenceLine(); + assessmentSection.ReferenceLine.SetGeometry(new List { new Point2D(2.0, 5.0), new Point2D(34.0, 2.0) }); // Call - assessmentSectionBase.NotifyObservers(); + assessmentSection.NotifyObservers(); // Assert Assert.AreEqual(dataBeforeUpdate, map.Data); @@ -366,8 +366,8 @@ public void NotifyObservers_DataUpdatedNotifyObserversOnOldData_NoUpdateInViewData() { // Setup - IAssessmentSection oldAssessmentSectionMock = new TestAssessmentSectionBase(); - IAssessmentSection newAssessmentSectionMock = new TestAssessmentSectionBase(); + IAssessmentSection oldAssessmentSectionMock = new TestAssessmentSection(); + IAssessmentSection newAssessmentSectionMock = new TestAssessmentSection(); newAssessmentSectionMock.ReferenceLine = new ReferenceLine(); newAssessmentSectionMock.ReferenceLine.SetGeometry(new[] @@ -478,7 +478,7 @@ Assert.AreEqual("Profielschematisaties", mapData.Name); } - private class TestAssessmentSectionBase : Observable, IAssessmentSection + private class TestAssessmentSection : Observable, IAssessmentSection { public string Name { get; set; } public AssessmentSectionComment Comments { get; set; }