Index: Core/Common/src/Core.Common.Controls/TextEditor/RichTextBoxControl.cs =================================================================== diff -u -r091761507d94a388b18fefebd38a5d106b9b89c4 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Core/Common/src/Core.Common.Controls/TextEditor/RichTextBoxControl.cs (.../RichTextBoxControl.cs) (revision 091761507d94a388b18fefebd38a5d106b9b89c4) +++ Core/Common/src/Core.Common.Controls/TextEditor/RichTextBoxControl.cs (.../RichTextBoxControl.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -61,6 +61,8 @@ if (!string.IsNullOrEmpty(rtfToSetAfterLoad)) { richTextBox.Rtf = rtfToSetAfterLoad; + + var r = richTextBox.ProductVersion; } } Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculation.cs =================================================================== diff -u -r28d7428ed418504296e2c686958a4500b910cc32 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculation.cs (.../ICalculation.cs) (revision 28d7428ed418504296e2c686958a4500b910cc32) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculation.cs (.../ICalculation.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -44,8 +44,8 @@ void ClearHydraulicBoundaryLocation(); /// - /// Gets the input of the calculation. + /// Gets the input of the calculation to observe. /// - ICalculationInput Input { get; } + ICalculationInput GetObservableInput(); } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/OtherFailureMechanism.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/OtherFailureMechanism.cs (.../OtherFailureMechanism.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/OtherFailureMechanism.cs (.../OtherFailureMechanism.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -44,7 +44,5 @@ yield break; } } - - public override CalculationGroup CalculationsGroup { get; protected set; } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -101,11 +101,6 @@ public bool IsRelevant { get; set; } - /// - /// Gets all available piping calculations. - /// - public abstract CalculationGroup CalculationsGroup { get; protected set; } - public void AddSection(FailureMechanismSection section) { if (section == null) Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -0,0 +1,36 @@ +// 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 Ringtoets.Common.Data.Calculation; + +namespace Ringtoets.Common.Data.FailureMechanism +{ + /// + /// Interface describing a failure mechanism that contains calculation groups. + /// + public interface ICalculatableFailureMechanism + { + /// + /// Gets all available piping calculation groups. + /// + CalculationGroup CalculationsGroup { get; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -71,11 +71,6 @@ IEnumerable SectionResults { get; } /// - /// Gets all available piping calculations. - /// - CalculationGroup CalculationsGroup { get; } - - /// /// Adds a to . /// /// The new section. Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -49,6 +49,7 @@ + Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -63,7 +63,7 @@ failureMechanismObserver = new Observer(UpdataDataGridViewDataSource); failureMechanismSectionResultObserver = new RecursiveObserver(RefreshDataGridView, mechanism => mechanism.SectionResults); // The concat is needed to observe the input of calculations in child groups. - calculationInputObserver = new RecursiveObserver(UpdataDataGridViewDataSource, cg => cg.Children.Concat(cg.Children.OfType().Select(c => c.Input))); + calculationInputObserver = new RecursiveObserver(UpdataDataGridViewDataSource, cg => cg.Children.Concat(cg.Children.OfType().Select(c => c.GetObservableInput()))); calculationGroupObserver = new RecursiveObserver(UpdataDataGridViewDataSource, c => c.Children); Load += OnLoad; } @@ -83,8 +83,12 @@ failureMechanismObserver.Observable = failureMechanism; failureMechanismSectionResultObserver.Observable = failureMechanism; - calculationInputObserver.Observable = failureMechanism != null ? failureMechanism.CalculationsGroup : null; - calculationGroupObserver.Observable = failureMechanism != null ? failureMechanism.CalculationsGroup : null; + + var calculatableFailureMechanism = failureMechanism as ICalculatableFailureMechanism; + CalculationGroup observableGroup = calculatableFailureMechanism != null ? calculatableFailureMechanism.CalculationsGroup : null; + + calculationInputObserver.Observable = observableGroup; + calculationGroupObserver.Observable = observableGroup; } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -0,0 +1,227 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.Base; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.Calculation; + +namespace Ringtoets.Common.Data.Test.Calculation +{ + [TestFixture] + public class CalculationGroupTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call + var group = new CalculationGroup(); + + // Assert + Assert.IsInstanceOf(group); + Assert.IsInstanceOf(group); + Assert.IsTrue(group.IsNameEditable); + Assert.AreEqual("Nieuwe map", group.Name); + CollectionAssert.IsEmpty(group.Children); + } + + [Test] + [TestCase(true)] + [TestCase(false)] + public void ParameterdConstructor_ExpectedValues(bool isNameEditable) + { + // Setup + const string newName = "new Name"; + + // Call + var group = new CalculationGroup(newName, isNameEditable); + + // Assert + Assert.IsInstanceOf(group); + Assert.IsInstanceOf(group); + Assert.AreEqual(isNameEditable, group.IsNameEditable); + Assert.AreEqual(newName, group.Name); + CollectionAssert.IsEmpty(group.Children); + } + + [Test] + public void Name_SettingValueWhileNameEditable_ChangeName() + { + // Setup + var group = new CalculationGroup("a", true); + + // Precondition + Assert.IsTrue(group.IsNameEditable); + + // Call + const string newName = "new Name"; + group.Name = newName; + + // Assert + Assert.AreEqual(newName, group.Name); + } + + [Test] + public void Name_SettingValueWhileNameNotEditable_ThrowInvalidOperationException() + { + // Setup + const string originalName = "a"; + var group = new CalculationGroup(originalName, false); + + // Precondition + Assert.IsFalse(group.IsNameEditable); + + // Call + const string newName = "new Name"; + TestDelegate call = () => group.Name = newName; + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("Kan de naam van deze groep niet aanpassen, omdat 'IsNameEditable' op 'false' staat.", exception.Message); + Assert.AreEqual(originalName, group.Name); + } + + [Test] + public void Children_AddCalculation_CalculationAddedToCollection() + { + // Setup + var mockingRepository = new MockRepository(); + var calculationMock = mockingRepository.StrictMock(); + mockingRepository.ReplayAll(); + + var group = new CalculationGroup(); + + // Call + group.Children.Add(calculationMock); + + // Assert + Assert.AreEqual(1, group.Children.Count); + CollectionAssert.Contains(group.Children, calculationMock); + mockingRepository.VerifyAll(); + } + + [Test] + public void Children_RemoveCalculation_CalculationRemovedFromCollection() + { + // Setup + var mockingRepository = new MockRepository(); + var calculationMock = mockingRepository.StrictMock(); + mockingRepository.ReplayAll(); + + var group = new CalculationGroup(); + group.Children.Add(calculationMock); + + // Call + group.Children.Remove(calculationMock); + + // Assert + Assert.AreEqual(0, group.Children.Count); + CollectionAssert.DoesNotContain(group.Children, calculationMock); + mockingRepository.VerifyAll(); + } + + [Test] + [TestCase(0)] + [TestCase(1)] + public void Children_AddCalculationAtIndex_CalculationAddedToCollectionAtIndex(int index) + { + // Setup + var mockingRepository = new MockRepository(); + var calculationMock = mockingRepository.StrictMock(); + var calculationMockToInsert = mockingRepository.StrictMock(); + mockingRepository.ReplayAll(); + + var group = new CalculationGroup(); + group.Children.Add(calculationMock); + + // Call + group.Children.Insert(index, calculationMockToInsert); + + // Assert + Assert.AreEqual(2, group.Children.Count); + Assert.AreSame(calculationMockToInsert, group.Children[index]); + CollectionAssert.AreEquivalent(new[] + { + calculationMockToInsert, + calculationMock + }, group.Children, "Already existing items should have remained in collection and new item should be added."); + mockingRepository.VerifyAll(); + } + + [Test] + public void Children_AddCalculationGroup_GroupAddedToCollection() + { + // Setup + var childGroup = new CalculationGroup(); + + var group = new CalculationGroup(); + + // Call + group.Children.Add(childGroup); + + // Assert + CollectionAssert.Contains(group.Children, childGroup); + } + + [Test] + public void Children_RemoveCalculationGroup_GroupRemovedFromCollection() + { + // Setup + var childGroup = new CalculationGroup(); + + var group = new CalculationGroup(); + group.Children.Add(childGroup); + + // Call + group.Children.Remove(childGroup); + + // Assert + CollectionAssert.DoesNotContain(group.Children, childGroup); + } + + [Test] + [TestCase(0)] + [TestCase(1)] + public void Children_RemoveCalculationGroup_CalculationRemovedFromCollection(int index) + { + // Setup + var existingGroup = new CalculationGroup(); + var groupToInsert = new CalculationGroup(); + + var group = new CalculationGroup(); + group.Children.Add(existingGroup); + + // Call + group.Children.Insert(index, groupToInsert); + + // Assert + Assert.AreEqual(2, group.Children.Count); + Assert.AreSame(groupToInsert, group.Children[index]); + CollectionAssert.AreEquivalent(new[] + { + groupToInsert, + existingGroup + }, group.Children, + "Already existing items should have remained in collection and new item should be added."); + } + } +} \ No newline at end of file Fisheye: Tag f5e1194ee412e86277cee388a75c39db189f2b3e refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/PipingCalculationGroupTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs (.../FailureMechanismBaseTest.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs (.../FailureMechanismBaseTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -316,8 +316,6 @@ throw new NotImplementedException(); } } - - public override CalculationGroup CalculationsGroup { get; protected set; } } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj =================================================================== diff -u -r887b289acf19a81f62d78f371ab70c3f82812b95 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 887b289acf19a81f62d78f371ab70c3f82812b95) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -58,7 +58,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -609,8 +609,6 @@ throw new NotImplementedException(); } } - - public override CalculationGroup CalculationsGroup { get; protected set; } } private FailureMechanismResultView ShowFailureMechanismResultsView() Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs =================================================================== diff -u -rd2de88a141d3ba20d1f3b301a3c38723b682b206 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision d2de88a141d3ba20d1f3b301a3c38723b682b206) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -54,14 +54,6 @@ /// public GrassCoverErosionInwardsOutput Output { get; set; } - public ICalculationInput Input - { - get - { - return InputParameters; - } - } - public string Comments { get; set; } public string Name { get; set; } @@ -84,6 +76,11 @@ InputParameters.HydraulicBoundaryLocation = null; } + public ICalculationInput GetObservableInput() + { + return InputParameters; + } + private void AddDemoInput() { // BreakWater Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -29,7 +29,7 @@ /// /// Model for performing grass cover erosion inwards calculations. /// - public class GrassCoverErosionInwardsFailureMechanism : FailureMechanismBase + public class GrassCoverErosionInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism { /// /// Initializes a new instance of the class. @@ -49,7 +49,7 @@ } } - public override CalculationGroup CalculationsGroup { get; protected set; } + public CalculationGroup CalculationsGroup { get; private set; } /// /// Length-effect parameters. Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -r79f417a64ad7845136da14dc776b14503797347e -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 79f417a64ad7845136da14dc776b14503797347e) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -277,7 +277,7 @@ .Build(); } - private static void AddCalculationGroup(IFailureMechanism failureMechanism) + private static void AddCalculationGroup(ICalculatableFailureMechanism failureMechanism) { var calculation = new CalculationGroup { @@ -287,7 +287,7 @@ failureMechanism.CalculationsGroup.NotifyObservers(); } - private static void AddCalculation(IFailureMechanism failureMechanism) + private static void AddCalculation(ICalculatableFailureMechanism failureMechanism) { var calculation = new GrassCoverErosionInwardsCalculation { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs (.../GrassCoverErosionInwardsCalculationTest.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs (.../GrassCoverErosionInwardsCalculationTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -237,14 +237,14 @@ } [Test] - public void Input_Always_ReturnsInputParamaters() + public void GetObservableInput_Always_ReturnsInputParamaters() { // Setup var calculation = new GrassCoverErosionInwardsCalculation(); - GrassCoverErosionInwardsInput inputParameters = calculation.InputParameters; + var inputParameters = calculation.InputParameters; // Call - var input = calculation.Input; + ICalculationInput input = calculation.GetObservableInput(); // Assert Assert.AreEqual(inputParameters, input); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs =================================================================== diff -u -rfec99b77571cc0cf37b60f5ca257394714fde1d7 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision fec99b77571cc0cf37b60f5ca257394714fde1d7) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -47,6 +47,7 @@ // assert Assert.IsInstanceOf(grassCoverErosionInwardsFailureMechanism); + Assert.IsInstanceOf(grassCoverErosionInwardsFailureMechanism); Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayName, grassCoverErosionInwardsFailureMechanism.Name); Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode, grassCoverErosionInwardsFailureMechanism.Code); CollectionAssert.IsEmpty(grassCoverErosionInwardsFailureMechanism.Calculations); Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs (.../FailureMechanismPlaceholder.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs (.../FailureMechanismPlaceholder.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -52,8 +52,6 @@ } } - public override CalculationGroup CalculationsGroup { get; protected set; } - /// /// Gets the locations relevant for evaluating this failure mechanism. /// Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -644,8 +644,6 @@ throw new NotImplementedException(); } } - - public override CalculationGroup CalculationsGroup { get; protected set; } } private class ProgressNotification Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismResultViewInfoTest.cs (.../FailureMechanismResultViewInfoTest.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismResultViewInfoTest.cs (.../FailureMechanismResultViewInfoTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -232,8 +232,6 @@ throw new NotImplementedException(); } } - - public override CalculationGroup CalculationsGroup { get; protected set; } } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -76,14 +76,6 @@ /// public PipingSemiProbabilisticOutput SemiProbabilisticOutput { get; set; } - public ICalculationInput Input - { - get - { - return InputParameters; - } - } - /// /// Gets or sets the name of this calculation. /// @@ -111,5 +103,10 @@ { InputParameters.HydraulicBoundaryLocation = null; } + + public ICalculationInput GetObservableInput() + { + return InputParameters; + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -33,7 +33,7 @@ /// /// Model for performing piping calculations. /// - public class PipingFailureMechanism : FailureMechanismBase + public class PipingFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism { /// /// Initializes a new instance of the class. @@ -68,10 +68,7 @@ } } - /// - /// Gets all available piping calculation groups. - /// - public override CalculationGroup CalculationsGroup { get; protected set; } + public CalculationGroup CalculationsGroup { get; private set; } /// /// Gets the available within the scope of the piping failure mechanism. Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -256,14 +256,14 @@ } [Test] - public void Input_Always_ReturnsInputParamaters() + public void GetObservableInput_Always_ReturnsInputParamaters() { // Setup var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var inputParameters = calculation.InputParameters; // Call - var input = calculation.Input; + ICalculationInput input = calculation.GetObservableInput(); // Assert Assert.AreEqual(inputParameters, input); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -49,6 +49,7 @@ // Assert Assert.IsInstanceOf(piping); + Assert.IsInstanceOf(piping); Assert.AreEqual(Resources.PipingFailureMechanism_DisplayName, piping.Name); Assert.AreEqual(Resources.PipingFailureMechanism_DisplayCode, piping.Code); Assert.IsInstanceOf(piping.GeneralInput); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rf5e1194ee412e86277cee388a75c39db189f2b3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision f5e1194ee412e86277cee388a75c39db189f2b3e) @@ -197,28 +197,24 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Twice(); } - var dataMock = mocks.StrictMock(); - dataMock.Stub(dm => dm.Calculations).Return(new ICalculation[] - { - pipingCalculation1, - pipingCalculation2 - }); - dataMock.Stub(dm => dm.CalculationsGroup).Return(new CalculationGroup()); + var failureMechanism = new PipingFailureMechanism(); + failureMechanism.CalculationsGroup.Children.Add(pipingCalculation1); + failureMechanism.CalculationsGroup.Children.Add(pipingCalculation2); var assessmentSection = mocks.Stub(); - var failureMechanismContext = new PipingFailureMechanismContext(dataMock, assessmentSection); + var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); gui.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; - dataMock.CalculationsGroup.Children.Clear(); - dataMock.CalculationsGroup.Children.Add(pipingCalculation1); - dataMock.CalculationsGroup.Children.Add(pipingCalculation2); - dataMock.CalculationsGroup.Children.ElementAt(0).Attach(observer); - dataMock.CalculationsGroup.Children.ElementAt(1).Attach(observer); + failureMechanism.CalculationsGroup.Children.Clear(); + failureMechanism.CalculationsGroup.Children.Add(pipingCalculation1); + failureMechanism.CalculationsGroup.Children.Add(pipingCalculation2); + failureMechanism.CalculationsGroup.Children.ElementAt(0).Attach(observer); + failureMechanism.CalculationsGroup.Children.ElementAt(1).Attach(observer); ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -244,7 +240,7 @@ contextMenuAdapter.Items[contextMenuClearIndex].PerformClick(); // Then - foreach (var calc in dataMock.CalculationsGroup.Children.OfType()) + foreach (var calc in failureMechanism.CalculationsGroup.Children.OfType()) { Assert.AreNotEqual(confirm, calc.HasOutput); } @@ -357,15 +353,11 @@ Output = new TestPipingOutput() }; - var dataMock = mocks.StrictMock(); - dataMock.Stub(dm => dm.Calculations).Return(new ICalculation[] - { - pipingCalculation - }); - dataMock.Stub(dm => dm.CalculationsGroup).Return(new CalculationGroup()); + var failureMechanism = new PipingFailureMechanism(); + failureMechanism.CalculationsGroup.Children.Add(pipingCalculation); var assessmentSection = mocks.Stub(); - var failureMechanismContext = new PipingFailureMechanismContext(dataMock, assessmentSection); + var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); var gui = mocks.StrictMock(); gui.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); @@ -374,7 +366,7 @@ plugin.Gui = gui; - dataMock.CalculationsGroup.Children.Add(pipingCalculation); + failureMechanism.CalculationsGroup.Children.Add(pipingCalculation); // Call ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);