Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs =================================================================== diff -u -r5785cc13c0454eaabed7ede4dad8e885db7efd50 -rd6f110ecb32392f3ff1983a5e3e2b1f4603ae917 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 5785cc13c0454eaabed7ede4dad8e885db7efd50) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision d6f110ecb32392f3ff1983a5e3e2b1f4603ae917) @@ -45,7 +45,6 @@ private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationOutputObserver; private readonly RecursiveObserver calculationGroupObserver; - private readonly Observer failureMechanismObserver; private readonly IAssessmentSection assessmentSection; /// @@ -64,11 +63,6 @@ throw new ArgumentNullException(nameof(assessmentSection)); } - failureMechanismObserver = new Observer(UpdateDataGridViewDataSource) - { - Observable = failureMechanism - }; - this.assessmentSection = assessmentSection; // The concat is needed to observe the input of calculations in child groups. @@ -101,7 +95,6 @@ calculationInputObserver.Dispose(); calculationOutputObserver.Dispose(); calculationGroupObserver.Dispose(); - failureMechanismObserver.Dispose(); base.Dispose(disposing); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r44420c717ac32101ba0da4739d259c622f47976e -rd6f110ecb32392f3ff1983a5e3e2b1f4603ae917 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 44420c717ac32101ba0da4739d259c622f47976e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision d6f110ecb32392f3ff1983a5e3e2b1f4603ae917) @@ -480,46 +480,6 @@ } } - [Test] - public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated() - { - // Given - MacroStabilityInwardsFailureMechanism failureMechanism = CreateFullyConfiguredFailureMechanism(); - MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario( - 0.1, - failureMechanism.Sections.First()); - calculationScenario1.Contribution = (RoundedDouble) 0.6; - MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario( - 0.2, - failureMechanism.Sections.First()); - calculationScenario2.Contribution = (RoundedDouble) 0.4; - failureMechanism.CalculationsGroup.Children.Add(calculationScenario1); - failureMechanism.CalculationsGroup.Children.Add(calculationScenario2); - - using (ShowFailureMechanismResultsView(failureMechanism, failureMechanism.SectionResults)) - { - var gridTester = new ControlTester("dataGridView"); - var dataGridView = (DataGridView) gridTester.TheObject; - - MacroStabilityInwardsFailureMechanismSectionResultRow[] sectionResultRows = dataGridView.Rows.Cast() - .Select(r => r.DataBoundItem) - .Cast() - .ToArray(); - - // When - failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.A = 0.01; - failureMechanism.NotifyObservers(); - - // Then - MacroStabilityInwardsFailureMechanismSectionResultRow[] updatedRows = dataGridView.Rows.Cast() - .Select(r => r.DataBoundItem) - .Cast() - .ToArray(); - - CollectionAssert.AreNotEquivalent(sectionResultRows, updatedRows); - } - } - private static MacroStabilityInwardsFailureMechanism CreateFullyConfiguredFailureMechanism() { var failureMechanism = new MacroStabilityInwardsFailureMechanism(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -r884ba6ca60d8d9b50081e847a44e18c02b470138 -rd6f110ecb32392f3ff1983a5e3e2b1f4603ae917 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 884ba6ca60d8d9b50081e847a44e18c02b470138) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision d6f110ecb32392f3ff1983a5e3e2b1f4603ae917) @@ -52,7 +52,6 @@ private readonly RecursiveObserver calculationOutputObserver; private readonly RecursiveObserver calculationGroupObserver; private readonly IAssessmentSection assessmentSection; - private readonly Observer failureMechanismObserver; /// /// @@ -71,11 +70,6 @@ this.assessmentSection = assessmentSection; - failureMechanismObserver = new Observer(UpdateDataGridViewDataSource) - { - Observable = failureMechanism - }; - // The concat is needed to observe the input of calculations in child groups. calculationInputObserver = new RecursiveObserver( UpdateDataGridViewDataSource, @@ -102,7 +96,6 @@ calculationInputObserver.Dispose(); calculationOutputObserver.Dispose(); calculationGroupObserver.Dispose(); - failureMechanismObserver.Dispose(); base.Dispose(disposing); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -rd6f110ecb32392f3ff1983a5e3e2b1f4603ae917 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision d6f110ecb32392f3ff1983a5e3e2b1f4603ae917) @@ -20,22 +20,17 @@ // All rights reserved. using System; -using System.Collections.Generic; -using System.Linq; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Geometry; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Views; using Ringtoets.Common.Primitives; using Ringtoets.Piping.Data; -using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.Views; namespace Ringtoets.Piping.Forms.Test.Views @@ -204,53 +199,6 @@ } } - [Test] - public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated() - { - // Given - var pipingFailureMechanism = new PipingFailureMechanism(); - pipingFailureMechanism.AddSection(new FailureMechanismSection("Section 1", new List - { - new Point2D(0.0, 0.0), - new Point2D(5.0, 0.0) - })); - - pipingFailureMechanism.AddSection(new FailureMechanismSection("Section 2", new List - { - new Point2D(5.0, 0.0), - new Point2D(10.0, 0.0) - })); - PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario( - pipingFailureMechanism.Sections.First()); - PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario( - pipingFailureMechanism.Sections.First()); - pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario1); - pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario2); - - using (ShowFailureMechanismResultsView(pipingFailureMechanism, pipingFailureMechanism.SectionResults)) - { - var gridTester = new ControlTester("dataGridView"); - var dataGridView = (DataGridView) gridTester.TheObject; - - PipingFailureMechanismSectionResultRow[] sectionResultRows = dataGridView.Rows.Cast() - .Select(r => r.DataBoundItem) - .Cast() - .ToArray(); - - // When - pipingFailureMechanism.PipingProbabilityAssessmentInput.A = 0.01; - pipingFailureMechanism.NotifyObservers(); - - // Then - PipingFailureMechanismSectionResultRow[] updatedRows = dataGridView.Rows.Cast() - .Select(r => r.DataBoundItem) - .Cast() - .ToArray(); - - CollectionAssert.AreNotEquivalent(sectionResultRows, updatedRows); - } - } - private PipingFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults) { return ShowFailureMechanismResultsView(new PipingFailureMechanism(), sectionResults);