Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -190,13 +190,13 @@ Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(context.Calculation, - context.AssessmentSection, - () => context.FailureMechanism.GetHydraulicBoundaryLocationCalculation( - context.AssessmentSection, - context.Calculation.InputParameters.HydraulicBoundaryLocation, - context.Calculation.InputParameters.CategoryType), - new GrassCoverErosionOutwardsWaveConditionsInputViewStyle()) + CreateInstance = context => new WaveConditionsInputView( + context.Calculation, + () => context.FailureMechanism.GetHydraulicBoundaryLocationCalculation( + context.AssessmentSection, + context.Calculation.InputParameters.HydraulicBoundaryLocation, + context.Calculation.InputParameters.CategoryType), + new GrassCoverErosionOutwardsWaveConditionsInputViewStyle()) }; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -171,7 +171,6 @@ protected override IView GetView(ICalculation data) { return new WaveConditionsInputView((ICalculation) data, - new AssessmentSectionStub(), () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()), new GrassCoverErosionOutwardsWaveConditionsInputViewStyle()); } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -26,7 +26,6 @@ using Core.Common.Util.Extensions; using Core.Components.Chart.Data; using Core.Components.Chart.Forms; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Forms.Factories; @@ -46,7 +45,6 @@ private readonly Observer calculationObserver; private readonly Observer calculationInputObserver; private readonly Observer hydraulicBoundaryLocationCalculationObserver; - private readonly Observer assessmentSectionObserver; private readonly ChartDataCollection chartDataCollection; private readonly ChartLineData foreshoreChartData; @@ -65,12 +63,10 @@ /// Creates a new instance of . /// /// The calculation to show in the view. - /// The assessment section the calculation belongs to. - /// for obtaining the . + /// The for obtaining the . /// The style which should be applied to the . /// Thrown when any input parameter is null. public WaveConditionsInputView(ICalculation calculation, - IAssessmentSection assessmentSection, Func getHydraulicBoundaryLocationCalculationFunc, IWaveConditionsInputViewStyle inputViewStyle) { @@ -79,11 +75,6 @@ throw new ArgumentNullException(nameof(calculation)); } - if (assessmentSection == null) - { - throw new ArgumentNullException(nameof(assessmentSection)); - } - if (getHydraulicBoundaryLocationCalculationFunc == null) { throw new ArgumentNullException(nameof(getHydraulicBoundaryLocationCalculationFunc)); @@ -100,15 +91,13 @@ calculationObserver = new Observer(UpdateChartTitle); calculationInputObserver = new Observer(UpdateCalculationInput); - assessmentSectionObserver = new Observer(UpdateCalculationInput); hydraulicBoundaryLocationCalculationObserver = new Observer(UpdateChartData); this.calculation = calculation; calculationObserver.Observable = calculation; calculationInputObserver.Observable = calculation.InputParameters; hydraulicBoundaryLocationCalculationObserver.Observable = getHydraulicBoundaryLocationCalculationFunc(); - assessmentSectionObserver.Observable = assessmentSection; chartDataCollection = new ChartDataCollection(RingtoetsCommonFormsResources.Calculation_Input); foreshoreChartData = RingtoetsChartDataFactory.CreateForeshoreGeometryChartData(); @@ -158,7 +147,6 @@ { calculationObserver.Dispose(); calculationInputObserver.Dispose(); - assessmentSectionObserver.Dispose(); if (disposing) { @@ -177,7 +165,6 @@ private void UpdateChartData() { SetChartData(); - chartDataCollection.Collection.ForEachElementDo(cd => cd.NotifyObservers()); } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -31,7 +31,6 @@ using Core.Components.Chart.Forms; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; @@ -81,89 +80,48 @@ [Test] public void Constructor_InputViewStyleNull_ThrowArgumentNullException() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call TestDelegate test = () => new WaveConditionsInputView(CreateTestCalculation(), - assessmentSection, GetHydraulicBoundaryLocationCalculation, null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("inputViewStyle", exception.ParamName); - mocks.VerifyAll(); } [Test] public void Constructor_GetHydraulicBoundaryLocationCalculationFuncNull_ThrowArgumentNullException() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call TestDelegate test = () => new WaveConditionsInputView(CreateTestCalculation(), - assessmentSection, null, new TestWaveConditionsInputViewStyle()); // Assert var exception = Assert.Throws(test); Assert.AreEqual("getHydraulicBoundaryLocationCalculationFunc", exception.ParamName); - mocks.VerifyAll(); } [Test] public void Constructor_CalculationNull_ThrowArgumentNullException() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call TestDelegate test = () => new WaveConditionsInputView(null, - assessmentSection, GetHydraulicBoundaryLocationCalculation, new TestWaveConditionsInputViewStyle()); // Assert var exception = Assert.Throws(test); Assert.AreEqual("calculation", exception.ParamName); - mocks.VerifyAll(); } [Test] - public void Constructor_AssessmentSectionNull_ThrowArgumentNullException() - { - // Call - TestDelegate test = () => new WaveConditionsInputView(CreateTestCalculation(), - null, - GetHydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle()); - - // Assert - var exception = Assert.Throws(test); - Assert.AreEqual("assessmentSection", exception.ParamName); - } - - [Test] public void Constructor_ExpectedValues() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call TestWaveConditionsCalculation calculation = CreateTestCalculation(); using (var view = new WaveConditionsInputView(calculation, - assessmentSection, GetHydraulicBoundaryLocationCalculation, new TestWaveConditionsInputViewStyle())) { @@ -174,8 +132,6 @@ Assert.AreSame(calculation, view.Data); Assert.AreEqual(1, view.Controls.Count); } - - mocks.VerifyAll(); } [Test] @@ -202,13 +158,8 @@ } }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call using (var view = new WaveConditionsInputView(calculation, - assessmentSection, () => GetHydraulicBoundaryLocationCalculation(assessmentLevel), new TestWaveConditionsInputViewStyle())) { @@ -253,8 +204,6 @@ calculation.InputParameters.UpperBoundaryRevetment, chartData.Collection.ElementAt(revetmentChartDataIndex)); } - - mocks.VerifyAll(); } [Test] @@ -269,12 +218,7 @@ Name = initialName }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - using (var view = new WaveConditionsInputView(calculation, - assessmentSection, GetHydraulicBoundaryLocationCalculation, new TestWaveConditionsInputViewStyle())) { @@ -289,16 +233,13 @@ // Assert Assert.AreEqual(updatedName, view.Chart.ChartTitle); } - - mocks.VerifyAll(); } [Test] public void UpdateObserver_ForeshoreProfileUpdated_ChartDataUpdatedAndObserversNotified() { // Setup var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChartDataLayers); mocks.ReplayAll(); @@ -322,7 +263,6 @@ }; using (var view = new WaveConditionsInputView(calculation, - assessmentSection, () => GetHydraulicBoundaryLocationCalculation(assessmentLevel), new TestWaveConditionsInputViewStyle())) { @@ -424,12 +364,7 @@ var assessmentLevel = (RoundedDouble) 6; HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = GetHydraulicBoundaryLocationCalculation(assessmentLevel); - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - using (var view = new WaveConditionsInputView(calculation, - assessmentSection, () => hydraulicBoundaryLocationCalculation, new TestWaveConditionsInputViewStyle())) { @@ -511,12 +446,7 @@ }; HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = GetHydraulicBoundaryLocationCalculation(new Random(39).NextRoundedDouble()); - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - using (var view = new WaveConditionsInputView(calculation, - assessmentSection, () => hydraulicBoundaryLocationCalculation, new TestWaveConditionsInputViewStyle())) { @@ -595,13 +525,8 @@ } }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var assessmentLevel = (RoundedDouble) 6; using (var view = new WaveConditionsInputView(calculation, - assessmentSection, () => GetHydraulicBoundaryLocationCalculation(assessmentLevel), new TestWaveConditionsInputViewStyle())) { Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -111,11 +111,11 @@ Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(context.Calculation, - context.AssessmentSection, - () => context.AssessmentSection.GetHydraulicBoundaryLocationCalculation(context.Calculation.InputParameters.HydraulicBoundaryLocation, - context.Calculation.InputParameters.CategoryType), - new StabilityStoneCoverWaveConditionsInputViewStyle()) + CreateInstance = context => new WaveConditionsInputView( + context.Calculation, + () => context.AssessmentSection.GetHydraulicBoundaryLocationCalculation(context.Calculation.InputParameters.HydraulicBoundaryLocation, + context.Calculation.InputParameters.CategoryType), + new StabilityStoneCoverWaveConditionsInputViewStyle()) }; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -22,7 +22,6 @@ using System; using System.Drawing; using System.Linq; -using Core.Common.Base.Data; using Core.Common.Controls.Views; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; @@ -171,9 +170,8 @@ protected override IView GetView(ICalculation data) { - return new WaveConditionsInputView((ICalculation) data, - new AssessmentSectionStub(), - () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()), + return new WaveConditionsInputView((ICalculation) data, + () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()), new StabilityStoneCoverWaveConditionsInputViewStyle()); } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -111,11 +111,11 @@ Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(context.Calculation, - context.AssessmentSection, - () => context.AssessmentSection.GetHydraulicBoundaryLocationCalculation(context.Calculation.InputParameters.HydraulicBoundaryLocation, - context.Calculation.InputParameters.CategoryType), - new WaveImpactAsphaltCoverWaveConditionsInputViewStyle()) + CreateInstance = context => new WaveConditionsInputView( + context.Calculation, + () => context.AssessmentSection.GetHydraulicBoundaryLocationCalculation(context.Calculation.InputParameters.HydraulicBoundaryLocation, + context.Calculation.InputParameters.CategoryType), + new WaveImpactAsphaltCoverWaveConditionsInputViewStyle()) }; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -ra48939a116b21f3fec9bbf92e180818439aa7f89 -r5ef2f44bca31b92735dff724f97b717c7c55f912 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs) (revision a48939a116b21f3fec9bbf92e180818439aa7f89) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs) (revision 5ef2f44bca31b92735dff724f97b717c7c55f912) @@ -171,7 +171,6 @@ protected override IView GetView(ICalculation data) { return new WaveConditionsInputView((ICalculation) data, - new AssessmentSectionStub(), () => new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()), new WaveImpactAsphaltCoverWaveConditionsInputViewStyle()); }