Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -rf2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f -rde11965509b522ad5f7446e621a95737ed25da67 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision f2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -32,7 +32,6 @@ using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.IO; using Ringtoets.GrassCoverErosionInwards.Data; -using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; @@ -111,6 +110,7 @@ SetHydraulicBoundaryLocationWaveHeightCalculationConvergence(demoAssessmentSection.HydraulicBoundaryDatabase.Locations); demoAssessmentSection.GrassCoverErosionOutwards.SetGrassCoverErosionOutwardsHydraulicBoundaryLocations(demoAssessmentSection.HydraulicBoundaryDatabase); + demoAssessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.NotifyObservers(); } private void InitializeDemoFailureMechanismSections(AssessmentSection demoAssessmentSection) Index: Ringtoets.sln =================================================================== diff -u -rf2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets.sln (.../Ringtoets.sln) (revision f2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f) +++ Ringtoets.sln (.../Ringtoets.sln) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -2289,12 +2289,13 @@ {041EDC04-3A1E-4FBA-BEB7-F391571C609F} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {11FE8C37-49EB-4FF2-8583-DABC9816FFC8} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} - {A5D1FA5A-7168-46DE-B3F0-D3FE6AC26601} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {195014EB-9F92-4638-B88F-B20B380BCA9F} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} + {A5D1FA5A-7168-46DE-B3F0-D3FE6AC26601} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {12202A15-9AF3-493D-B802-D78F6E718937} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {DFD9BCE3-9ED6-46B4-99C0-C0B116E70F79} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {F9525724-F55E-4574-8581-1DC990FA8518} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {35E124CA-64A1-49AB-B41B-5074D8676BA1} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} + {79559D7B-0ECC-4CB5-8ED1-D745F8482BA7} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {8261CCE1-98D7-465B-BC94-4ED239DE7F2E} = {9E35F3EA-D3C3-4D80-8399-689C49B68324} {0D9858E1-CF2D-4DE5-AC0E-64401900D531} = {9E35F3EA-D3C3-4D80-8399-689C49B68324} {4B4F0984-5730-4E28-93E7-DDE0F29BA550} = {FE36E7E0-D5F7-48E3-9730-D05443351EAD} @@ -2407,16 +2408,18 @@ {7E26AAA5-22ED-43CC-9B21-23EEA60A5A87} = {555F3460-DD3D-4B1D-8319-0AA454050FF7} {FFE3A667-3A4C-4F48-BC6B-1589867FCB41} = {F2C4C4F7-4058-4E71-859B-D704F15D2745} {C48E2C11-3FDA-4356-A10F-757469A108FD} = {7E26AAA5-22ED-43CC-9B21-23EEA60A5A87} - {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} = {79559D7B-0ECC-4CB5-8ED1-D745F8482BA7} + {2A2E6519-A2B8-4A6B-8849-4873578D7C8C} = {195014EB-9F92-4638-B88F-B20B380BCA9F} + {E550D725-9C80-4242-8A3F-C1A3E020DEA2} = {195014EB-9F92-4638-B88F-B20B380BCA9F} {435F0AB1-1180-47D3-9BCB-3B5FF365236C} = {79559D7B-0ECC-4CB5-8ED1-D745F8482BA7} - {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} - {888D4097-8BC2-4703-9FB1-8744C94D525E} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} - {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} + {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} = {79559D7B-0ECC-4CB5-8ED1-D745F8482BA7} {175406DB-C0DA-42A7-968C-0C17CF2257B1} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {BFD6A78A-237A-413F-8DC3-8EC6E8C5809C} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {74CBA865-9338-447F-BAD9-28312446AE84} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {89A94832-5337-4177-97D0-92CD77A375D7} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} + {888D4097-8BC2-4703-9FB1-8744C94D525E} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} + {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} + {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} {79419C3E-046C-4DC1-8C69-F14911F22C75} = {A5D1FA5A-7168-46DE-B3F0-D3FE6AC26601} {1C1E8754-CF61-4858-9CEE-3E5DE344474F} = {A5D1FA5A-7168-46DE-B3F0-D3FE6AC26601} {90DE728E-48EF-4665-AB38-3D88E41D9F4D} = {79419C3E-046C-4DC1-8C69-F14911F22C75} @@ -2432,9 +2435,6 @@ {BB9D13C5-2672-4F61-93B3-8EA361399BDD} = {1C1E8754-CF61-4858-9CEE-3E5DE344474F} {D7801688-3DD7-407F-9302-F4FD82B1F499} = {1C1E8754-CF61-4858-9CEE-3E5DE344474F} {5C19638A-3CC5-496F-8552-385785E728E3} = {1C1E8754-CF61-4858-9CEE-3E5DE344474F} - {2A2E6519-A2B8-4A6B-8849-4873578D7C8C} = {195014EB-9F92-4638-B88F-B20B380BCA9F} - {E550D725-9C80-4242-8A3F-C1A3E020DEA2} = {195014EB-9F92-4638-B88F-B20B380BCA9F} - {79559D7B-0ECC-4CB5-8ED1-D745F8482BA7} = {195014EB-9F92-4638-B88F-B20B380BCA9F} {1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99} = {2A2E6519-A2B8-4A6B-8849-4873578D7C8C} {F0BCF06A-3D01-4D65-A249-E2A14AEC6EFD} = {2A2E6519-A2B8-4A6B-8849-4873578D7C8C} {9AF85B2B-8D78-43C5-9542-FBB3A14EAB36} = {2A2E6519-A2B8-4A6B-8849-4873578D7C8C} Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs =================================================================== diff -u -r63fbdd5525927fbf9d63925eef9da8e17a0d7b44 -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs (.../HydraulicBoundaryDatabaseContext.cs) (revision 63fbdd5525927fbf9d63925eef9da8e17a0d7b44) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs (.../HydraulicBoundaryDatabaseContext.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -23,19 +23,20 @@ using Core.Common.Controls.PresentationObjects; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.HydraRing.Data; +using Ringtoets.Integration.Data; namespace Ringtoets.Integration.Forms.PresentationObjects { /// /// Presentation object for all data required to configure an instance of . /// - public class HydraulicBoundaryDatabaseContext : ObservableWrappedObjectContextBase + public class HydraulicBoundaryDatabaseContext : ObservableWrappedObjectContextBase { /// /// Creates a new instance of . /// /// The which the belongs to. /// Thrown when is null. - public HydraulicBoundaryDatabaseContext(IAssessmentSection wrappedAssessmentSection) : base(wrappedAssessmentSection) {} + public HydraulicBoundaryDatabaseContext(AssessmentSection wrappedAssessmentSection) : base(wrappedAssessmentSection) {} } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/GrassCoverErosionOutwardsFailureMechanismExtensions.cs =================================================================== diff -u -rf2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision f2be29fe8c407a4f32cb1bfcbaf4816c1f99c83f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -35,8 +35,8 @@ /// /// The to update. /// The database to use. - public static void SetGrassCoverErosionOutwardsHydraulicBoundaryLocations(this GrassCoverErosionOutwardsFailureMechanism failureMechanism, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase) + public static void SetGrassCoverErosionOutwardsHydraulicBoundaryLocations(this GrassCoverErosionOutwardsFailureMechanism failureMechanism, + HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { failureMechanism.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Clear(); if (hydraulicBoundaryDatabase == null) @@ -48,7 +48,6 @@ { failureMechanism.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation)); } - failureMechanism.GrassCoverErosionOutwardsHydraulicBoundaryLocations.NotifyObservers(); - } + } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -438,7 +438,7 @@ /// public override IEnumerable GetTreeNodeInfos() { - yield return new TreeNodeInfo + yield return new TreeNodeInfo { Text = assessmentSection => assessmentSection.Name, Image = assessmentSection => RingtoetsFormsResources.AssessmentSectionFolderIcon, @@ -811,7 +811,7 @@ #region AssessmentSection - private object[] AssessmentSectionChildNodeObjects(IAssessmentSection nodeData) + private object[] AssessmentSectionChildNodeObjects(AssessmentSection nodeData) { var childNodes = new List { @@ -1140,7 +1140,7 @@ var connectionItem = new StrictContextMenuItem( RingtoetsFormsResources.HydraulicBoundaryDatabase_Connect, RingtoetsFormsResources.HydraulicBoundaryDatabase_Connect_ToolTip, - RingtoetsCommonFormsResources.DatabaseIcon, (sender, args) => { SelectDatabaseFile(nodeData.WrappedData); }); + RingtoetsCommonFormsResources.DatabaseIcon, (sender, args) => SelectDatabaseFile(nodeData.WrappedData)); return Gui.Get(nodeData, treeViewControl) .AddCustomItem(connectionItem) @@ -1153,7 +1153,7 @@ .Build(); } - private void SelectDatabaseFile(IAssessmentSection assessmentSection) + private void SelectDatabaseFile(AssessmentSection assessmentSection) { using (var dialog = new OpenFileDialog { @@ -1165,7 +1165,7 @@ { try { - ImportHydraulicBoundaryDatabase(dialog.FileName, (AssessmentSection) assessmentSection); + ImportHydraulicBoundaryDatabase(dialog.FileName, assessmentSection); } catch (CriticalFileReadException exception) { @@ -1207,6 +1207,7 @@ } assessmentSection.GrassCoverErosionOutwards.SetGrassCoverErosionOutwardsHydraulicBoundaryLocations(assessmentSection.HydraulicBoundaryDatabase); + assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.NotifyObservers(); log.InfoFormat(RingtoetsFormsResources.RingtoetsPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked, assessmentSection.HydraulicBoundaryDatabase.FilePath); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryDatabaseContextTest.cs =================================================================== diff -u -rb32ec68f52968bc821b67cd973544bc2d0e7d568 -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryDatabaseContextTest.cs (.../HydraulicBoundaryDatabaseContextTest.cs) (revision b32ec68f52968bc821b67cd973544bc2d0e7d568) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryDatabaseContextTest.cs (.../HydraulicBoundaryDatabaseContextTest.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -21,8 +21,8 @@ using Core.Common.Controls.PresentationObjects; using NUnit.Framework; -using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.PresentationObjects; namespace Ringtoets.Integration.Forms.Test.PresentationObjects @@ -34,17 +34,14 @@ public void DefaultConstructor_ExpectedValues() { // Setup - var mockRepository = new MockRepository(); - var assessmentSectionMock = mockRepository.StrictMock(); - mockRepository.ReplayAll(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); // Call - var presentationObject = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); + var presentationObject = new HydraulicBoundaryDatabaseContext(assessmentSection); // Assert - Assert.IsInstanceOf>(presentationObject); - Assert.AreSame(assessmentSectionMock, presentationObject.WrappedData); - mockRepository.VerifyAll(); + Assert.IsInstanceOf>(presentationObject); + Assert.AreSame(assessmentSection, presentationObject.WrappedData); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -22,9 +22,9 @@ using System.ComponentModel; using Core.Common.Gui.PropertyBag; using NUnit.Framework; -using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.HydraRing.Data; +using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Forms.PropertyClasses; @@ -48,12 +48,10 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSectionMock = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); const string filePath = @"C:\file.sqlite"; - HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSectionMock) + HydraulicBoundaryDatabaseContext hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection) { WrappedData = { @@ -72,7 +70,6 @@ // Assert Assert.AreEqual(filePath, properties.FilePath); - mocks.VerifyAll(); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -rdca4da4c1f78e4074d1a4513411e3509344ec169 -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision dca4da4c1f78e4074d1a4513411e3509344ec169) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -27,26 +27,18 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Asphalt.Data; using Ringtoets.Asphalt.Forms.PresentationObjects; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.PresentationObjects; -using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; -using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; -using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Forms.PresentationObjects; using Ringtoets.Integration.Data; -using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Plugin; -using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources; @@ -67,14 +59,12 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Setup - mocks.ReplayAll(); - using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); // Assert - Assert.AreEqual(typeof(IAssessmentSection), info.TagType); + Assert.AreEqual(typeof(AssessmentSection), info.TagType); Assert.IsNull(info.ForeColor); Assert.IsNull(info.CanCheck); Assert.IsNull(info.IsChecked); @@ -84,7 +74,6 @@ Assert.IsNull(info.CanInsert); Assert.IsNull(info.OnDrop); } - mocks.VerifyAll(); } [Test] @@ -93,11 +82,11 @@ // Setup var testName = "ttt"; - var assessmentSection = mocks.Stub(); - assessmentSection.Name = testName; + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + { + Name = testName + }; - mocks.ReplayAll(); - using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); @@ -108,17 +97,14 @@ // Assert Assert.AreEqual(testName, text); } - mocks.VerifyAll(); } [Test] public void Image_Always_ReturnsSetImage() { // Setup - var assessmentSection = mocks.StrictMock(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - mocks.ReplayAll(); - using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); @@ -129,7 +115,6 @@ // Assert TestHelper.AssertImagesAreEqual(RingtoetsIntegrationFormsResources.AssessmentSectionFolderIcon, image); } - mocks.VerifyAll(); } [Test] @@ -155,34 +140,8 @@ public void ChildNodeObjects_Always_ReturnsChildrenOfData() { // Setup - var failureMechanisms = new IFailureMechanism[] - { - new PipingFailureMechanism(), - new GrassCoverErosionInwardsFailureMechanism(), - new HeightStructuresFailureMechanism(), - new DuneErosionFailureMechanism(), - new GrassCoverErosionOutwardsFailureMechanism(), - new GrassCoverSlipOffInwardsFailureMechanism(), - new GrassCoverSlipOffOutwardsFailureMechanism(), - new MicrostabilityFailureMechanism(), - new PipingStructureFailureMechanism(), - new StabilityStoneCoverFailureMechanism(), - new TechnicalInnovationFailureMechanism(), - new StrengthStabilityLengthwiseConstructionFailureMechanism(), - new WaterPressureAsphaltCoverFailureMechanism(), - new WaveImpactAsphaltCoverFailureMechanism(), - new ClosingStructureFailureMechanism(), - new MacrostabilityInwardsFailureMechanism(), - new MacrostabilityOutwardsFailureMechanism(), - new StrengthStabilityPointConstructionFailureMechanism() - }; - var contribution = new FailureMechanismContribution(failureMechanisms, 10.0, 2); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(section => section.FailureMechanismContribution).Return(contribution); - assessmentSection.Stub(section => section.GetFailureMechanisms()).Return(failureMechanisms); - mocks.ReplayAll(); - using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); @@ -195,7 +154,7 @@ Assert.AreSame(assessmentSection, referenceLineContext.WrappedData); var contributionContext = (FailureMechanismContributionContext) objects[1]; - Assert.AreSame(contribution, contributionContext.WrappedData); + Assert.AreSame(assessmentSection.FailureMechanismContribution, contributionContext.WrappedData); Assert.AreSame(assessmentSection, contributionContext.Parent); var context = (HydraulicBoundaryDatabaseContext) objects[2]; @@ -206,64 +165,69 @@ Assert.AreSame(assessmentSection, commentContext.WrappedData); var pipingFailureMechanismContext = (PipingFailureMechanismContext) objects[4]; - Assert.AreSame(failureMechanisms[0], pipingFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection.PipingFailureMechanism, pipingFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, pipingFailureMechanismContext.Parent); var grassCoverErosionInwardsFailureMechanismContext = (GrassCoverErosionInwardsFailureMechanismContext) objects[5]; - Assert.AreSame(failureMechanisms[1], grassCoverErosionInwardsFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection.GrassCoverErosionInwards, grassCoverErosionInwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverErosionInwardsFailureMechanismContext.Parent); - var heightStructuresFailureMechanismContext = (HeightStructuresFailureMechanismContext) objects[6]; - Assert.AreSame(failureMechanisms[2], heightStructuresFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, heightStructuresFailureMechanismContext.Parent); - - var duneErosionFailureMechanismContext = (FailureMechanismContext) objects[7]; - Assert.AreSame(failureMechanisms[3], duneErosionFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, duneErosionFailureMechanismContext.Parent); - var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext) objects[8]; - Assert.AreSame(failureMechanisms[4], grassCoverErosionOutwardsFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, grassCoverErosionOutwardsFailureMechanismContext.Parent); - var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext) objects[9]; - Assert.AreSame(failureMechanisms[5], grassCoverSlipOffInwardsFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent); - var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext) objects[10]; - Assert.AreSame(failureMechanisms[6], grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent); - var microstabilityFailureMechanismContext = (FailureMechanismContext) objects[11]; - Assert.AreSame(failureMechanisms[7], microstabilityFailureMechanismContext.WrappedData); + var macrostabilityInwardsFailureMechanismContext = (FailureMechanismContext)objects[6]; + Assert.AreSame(assessmentSection.MacrostabilityInwards, macrostabilityInwardsFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, macrostabilityInwardsFailureMechanismContext.Parent); + var macrostabilityOutwardsFailureMechanismContext = (FailureMechanismContext)objects[7]; + Assert.AreSame(assessmentSection.MacrostabilityOutwards, macrostabilityOutwardsFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, macrostabilityOutwardsFailureMechanismContext.Parent); + var microstabilityFailureMechanismContext = (FailureMechanismContext)objects[8]; + Assert.AreSame(assessmentSection.Microstability, microstabilityFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, microstabilityFailureMechanismContext.Parent); - var pipingStructureFailureMechanismContext = (FailureMechanismContext) objects[12]; - Assert.AreSame(failureMechanisms[8], pipingStructureFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, pipingStructureFailureMechanismContext.Parent); - var stabilityStoneCoverFailureMechanismContext = (StabilityStoneCoverFailureMechanismContext) objects[13]; - Assert.AreSame(failureMechanisms[9], stabilityStoneCoverFailureMechanismContext.WrappedData); + + var stabilityStoneCoverFailureMechanismContext = (StabilityStoneCoverFailureMechanismContext)objects[9]; + Assert.AreSame(assessmentSection.StabilityStoneCover, stabilityStoneCoverFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, stabilityStoneCoverFailureMechanismContext.Parent); - var technicalInnovationFailureMechanismContext = (FailureMechanismContext) objects[14]; - Assert.AreSame(failureMechanisms[10], technicalInnovationFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent); - var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext) objects[15]; - Assert.AreSame(failureMechanisms[11], strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent); - var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext) objects[16]; - Assert.AreSame(failureMechanisms[12], waterPressureAsphaltCoverFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, waterPressureAsphaltCoverFailureMechanismContext.Parent); - var waveImpactAsphaltCoverFailureMechanismContext = (WaveImpactAsphaltCoverFailureMechanismContext)objects[17]; - Assert.AreSame(failureMechanisms[13], waveImpactAsphaltCoverFailureMechanismContext.WrappedData); + + var waveImpactAsphaltCoverFailureMechanismContext = (WaveImpactAsphaltCoverFailureMechanismContext)objects[10]; + Assert.AreSame(assessmentSection.WaveImpactAsphaltCover, waveImpactAsphaltCoverFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, waveImpactAsphaltCoverFailureMechanismContext.Parent); - var closingStructureFailureMechnaismContext = (FailureMechanismContext) objects[18]; - Assert.AreSame(failureMechanisms[14], closingStructureFailureMechnaismContext.WrappedData); + + var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext)objects[11]; + Assert.AreSame(assessmentSection.WaterPressureAsphaltCover, waterPressureAsphaltCoverFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, waterPressureAsphaltCoverFailureMechanismContext.Parent); + + var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext)objects[12]; + Assert.AreSame(assessmentSection.GrassCoverErosionOutwards, grassCoverErosionOutwardsFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, grassCoverErosionOutwardsFailureMechanismContext.Parent); + + var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext)objects[13]; + Assert.AreSame(assessmentSection.GrassCoverSlipOffOutwards, grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent); + var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext)objects[14]; + Assert.AreSame(assessmentSection.GrassCoverSlipOffInwards, grassCoverSlipOffInwardsFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent); + + var heightStructuresFailureMechanismContext = (HeightStructuresFailureMechanismContext) objects[15]; + Assert.AreSame(assessmentSection.HeightStructures, heightStructuresFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, heightStructuresFailureMechanismContext.Parent); + + var closingStructureFailureMechnaismContext = (FailureMechanismContext)objects[16]; + Assert.AreSame(assessmentSection.ClosingStructure, closingStructureFailureMechnaismContext.WrappedData); Assert.AreSame(assessmentSection, closingStructureFailureMechnaismContext.Parent); - var macrostabilityInwardsFailureMechanismContext = (FailureMechanismContext) objects[19]; - Assert.AreSame(failureMechanisms[15], macrostabilityInwardsFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, macrostabilityInwardsFailureMechanismContext.Parent); - var macrostabilityOutwardsFailureMechanismContext = (FailureMechanismContext) objects[20]; - Assert.AreSame(failureMechanisms[16], macrostabilityOutwardsFailureMechanismContext.WrappedData); - Assert.AreSame(assessmentSection, macrostabilityOutwardsFailureMechanismContext.Parent); - var strengthStabilityPointConstructionFailureMechanismContext = (FailureMechanismContext) objects[21]; - Assert.AreSame(failureMechanisms[17], strengthStabilityPointConstructionFailureMechanismContext.WrappedData); + var pipingStructureFailureMechanismContext = (FailureMechanismContext)objects[17]; + Assert.AreSame(assessmentSection.PipingStructure, pipingStructureFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, pipingStructureFailureMechanismContext.Parent); + var strengthStabilityPointConstructionFailureMechanismContext = (FailureMechanismContext)objects[18]; + Assert.AreSame(assessmentSection.StrengthStabilityPointConstruction, strengthStabilityPointConstructionFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, strengthStabilityPointConstructionFailureMechanismContext.Parent); + var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext)objects[19]; + Assert.AreSame(assessmentSection.StrengthStabilityLengthwiseConstruction, strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent); + var duneErosionFailureMechanismContext = (FailureMechanismContext) objects[20]; + Assert.AreSame(assessmentSection.DuneErosion, duneErosionFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, duneErosionFailureMechanismContext.Parent); + var technicalInnovationFailureMechanismContext = (FailureMechanismContext) objects[21]; + Assert.AreSame(assessmentSection.TechnicalInnovation, technicalInnovationFailureMechanismContext.WrappedData); + Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent); } - mocks.VerifyAll(); } [Test] @@ -326,11 +290,13 @@ public void OnNodeRenamed_WithData_SetProjectNameWithNotification() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.Expect(section => section.NotifyObservers()); - + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); + assessmentSection.Attach(observer); + using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); @@ -392,7 +358,7 @@ private TreeNodeInfo GetInfo(RingtoetsPlugin plugin) { - return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(IAssessmentSection)); + return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(AssessmentSection)); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -89,10 +89,9 @@ { // Setup const string name = "Hydraulische randvoorwaarden"; - var assessmentSectionMock = mocks.StrictMock(); - mocks.ReplayAll(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - var context = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); using (var plugin = new RingtoetsPlugin()) { @@ -104,7 +103,6 @@ // Assert Assert.AreEqual(name, text); } - mocks.VerifyAll(); } [Test] @@ -127,12 +125,10 @@ public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods() { // Setup - var guiMock = mocks.StrictMock(); - var menuBuilderMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.Stub(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); + var nodeData = new HydraulicBoundaryDatabaseContext(assessmentSection); - var nodeData = new HydraulicBoundaryDatabaseContext(assessmentSectionMock); - + var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); @@ -141,11 +137,12 @@ menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); using (var treeViewControl = new TreeViewControl()) { + var guiMock = mocks.StrictMock(); + guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -168,9 +165,7 @@ public void ForeColor_ContextHasNoReferenceLine_ReturnDisabledColor() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); using (var plugin = new RingtoetsPlugin()) @@ -182,16 +177,16 @@ // Assert Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color); } - mocks.VerifyAll(); } [Test] public void ForeColor_ContextHasReferenceLineData_ReturnControlText() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - mocks.ReplayAll(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + { + HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() + }; var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); @@ -205,16 +200,13 @@ // Assert Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color); } - mocks.VerifyAll(); } [Test] public void ChildNodeObjects_NoHydraulicBoundaryDatabaseSet_ReturnsEmpty() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); using (var plugin = new RingtoetsPlugin()) @@ -227,16 +219,16 @@ // Assert Assert.AreEqual(0, objects.Length); } - mocks.VerifyAll(); } [Test] public void ChildNodeObjects_HydraulicBoundaryDatabaseSet_ReturnsChildrenOfData() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - mocks.ReplayAll(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + { + HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() + }; var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSection); @@ -255,7 +247,6 @@ var waveHeightLocationsContext = (WaveHeightLocationsContext) objects[1]; Assert.AreSame(assessmentSection, waveHeightLocationsContext.WrappedData); } - mocks.VerifyAll(); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -rff8a088931e6af2e46f6f4f09b633bcdd0b84ecd -rde11965509b522ad5f7446e621a95737ed25da67 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision ff8a088931e6af2e46f6f4f09b633bcdd0b84ecd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision de11965509b522ad5f7446e621a95737ed25da67) @@ -401,7 +401,7 @@ // Assert Assert.AreEqual(25, treeNodeInfos.Length); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(IAssessmentSection))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ReferenceLineContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CategoryTreeFolder)));